From 976fed76b94ee522ee8730249f0d9d6ccb682bff Mon Sep 17 00:00:00 2001
From: Mark Shannon <mark@hotpy.org>
Date: Wed, 21 Nov 2018 14:18:46 +0000
Subject: [PATCH] Python tests: Remove some obsolete tests.

---
 .../explicitdisallow/ForbiddenDependency.expected |  1 -
 .../explicitdisallow/ForbiddenDependency.qlref    |  1 -
 .../ForbiddenDependency/explicitdisallow/a.py     |  4 ----
 .../ForbiddenDependency/explicitdisallow/b.py     |  4 ----
 .../ForbiddenDependency/explicitdisallow/c.py     |  5 -----
 .../explicitdisallow/specification.arcspec        | 11 -----------
 .../independent/ForbiddenDependency.expected      |  2 --
 .../independent/ForbiddenDependency.qlref         |  1 -
 .../ForbiddenDependency/independent/a.py          |  4 ----
 .../ForbiddenDependency/independent/b.py          |  4 ----
 .../ForbiddenDependency/independent/c.py          |  5 -----
 .../independent/specification.arcspec             | 11 -----------
 .../ordered/ForbiddenDependency.expected          |  2 --
 .../ordered/ForbiddenDependency.qlref             |  1 -
 .../query-tests/ForbiddenDependency/ordered/a.py  |  4 ----
 .../query-tests/ForbiddenDependency/ordered/b.py  |  4 ----
 .../query-tests/ForbiddenDependency/ordered/c.py  |  5 -----
 .../ordered/specification.arcspec                 | 10 ----------
 .../private/ForbiddenDependency.expected          |  1 -
 .../private/ForbiddenDependency.qlref             |  1 -
 .../query-tests/ForbiddenDependency/private/a.py  |  4 ----
 .../query-tests/ForbiddenDependency/private/b.py  |  4 ----
 .../query-tests/ForbiddenDependency/private/c.py  |  5 -----
 .../private/specification.arcspec                 | 15 ---------------
 24 files changed, 109 deletions(-)
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.expected
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.qlref
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/a.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/b.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/c.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/specification.arcspec
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.expected
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.qlref
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/independent/a.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/independent/b.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/independent/c.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/independent/specification.arcspec
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.expected
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.qlref
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/ordered/a.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/ordered/b.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/ordered/c.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/ordered/specification.arcspec
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.expected
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.qlref
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/private/a.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/private/b.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/private/c.py
 delete mode 100644 python/ql/test/query-tests/ForbiddenDependency/private/specification.arcspec

diff --git a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.expected b/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.expected
deleted file mode 100644
index d60f4a5832d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.expected
+++ /dev/null
@@ -1 +0,0 @@
-| a.py:1:1:1:8 | Import | $@ imports $@. This violates the explicit rule against dependencies from  "G2" to "G3". | a.py:0:0:0:0 | Module a | a | b.py:0:0:0:0 | Module b | b |
diff --git a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.qlref b/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.qlref
deleted file mode 100644
index 6470516326d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/ForbiddenDependency.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Architect/ForbiddenDependency.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/a.py b/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/a.py
deleted file mode 100644
index 0f9577fbb6f..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/a.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import b
-
-class A(B):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/b.py b/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/b.py
deleted file mode 100644
index f67f07f628d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/b.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import c
-
-class B(C):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/c.py b/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/c.py
deleted file mode 100644
index e6086862614..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/c.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import b
-
-class C:
-    def foo(self):
-        b = B()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/specification.arcspec b/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/specification.arcspec
deleted file mode 100644
index 086f01368ec..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/explicitdisallow/specification.arcspec
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<architecture>
-	<patternMode>regex</patternMode>
-	<group name="G1" groupRule="unrestricted">
-		<unit name="G2" filePattern="${source_location}.*/a.py" />
-		<unit name="G3" filePattern="${source_location}.*/b.py" />
-		<unit name="G4" filePattern="${source_location}.*/c.py" />
-	</group>
-	<!-- Only G2 to G3 dependency should be disallowed -->
-	<disallow originContainers="G2" targetContainers="G3" />
-</architecture>
diff --git a/python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.expected b/python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.expected
deleted file mode 100644
index a4d81517ae0..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| b.py:1:1:1:8 | Import | $@ imports $@. This violates the "independent" group rule on "G1", which disallows dependencies from "G3" to "G4. | b.py:0:0:0:0 | Module b | b | c.py:0:0:0:0 | Module c | c |
-| c.py:1:1:1:8 | Import | $@ imports $@. This violates the "independent" group rule on "G1", which disallows dependencies from "G4" to "G3. | c.py:0:0:0:0 | Module c | c | b.py:0:0:0:0 | Module b | b |
diff --git a/python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.qlref b/python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.qlref
deleted file mode 100644
index 6470516326d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/independent/ForbiddenDependency.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Architect/ForbiddenDependency.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/independent/a.py b/python/ql/test/query-tests/ForbiddenDependency/independent/a.py
deleted file mode 100644
index 0f9577fbb6f..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/independent/a.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import b
-
-class A(B):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/independent/b.py b/python/ql/test/query-tests/ForbiddenDependency/independent/b.py
deleted file mode 100644
index f67f07f628d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/independent/b.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import c
-
-class B(C):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/independent/c.py b/python/ql/test/query-tests/ForbiddenDependency/independent/c.py
deleted file mode 100644
index e6086862614..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/independent/c.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import b
-
-class C:
-    def foo(self):
-        b = B()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/independent/specification.arcspec b/python/ql/test/query-tests/ForbiddenDependency/independent/specification.arcspec
deleted file mode 100644
index a8c0fc14713..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/independent/specification.arcspec
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<architecture>
-	<patternMode>regex</patternMode>
-	<group name="G1" groupRule="independent">
-		<unit name="G2" filePattern="${source_location}.*/a.py" />
-		<unit name="G3" filePattern="${source_location}.*/b.py" />
-		<unit name="G4" filePattern="${source_location}.*/c.py" />
-	</group>
-	<!-- Explicitly allow the G2 to G3 dependency -->
-	<allow originContainers="G2" targetContainers="G3" />
-</architecture>
diff --git a/python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.expected b/python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.expected
deleted file mode 100644
index 44b3baad942..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| a.py:1:1:1:8 | Import | $@ imports $@. This violates the explicit rule against dependencies from  "G2" to "G3". | a.py:0:0:0:0 | Module a | a | b.py:0:0:0:0 | Module b | b |
-| c.py:1:1:1:8 | Import | $@ imports $@. This violates the "ordered" group rule on "G1", which disallows dependencies from "G4" to "G3. | c.py:0:0:0:0 | Module c | c | b.py:0:0:0:0 | Module b | b |
diff --git a/python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.qlref b/python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.qlref
deleted file mode 100644
index 6470516326d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/ordered/ForbiddenDependency.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Architect/ForbiddenDependency.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/ordered/a.py b/python/ql/test/query-tests/ForbiddenDependency/ordered/a.py
deleted file mode 100644
index 0f9577fbb6f..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/ordered/a.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import b
-
-class A(B):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/ordered/b.py b/python/ql/test/query-tests/ForbiddenDependency/ordered/b.py
deleted file mode 100644
index f67f07f628d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/ordered/b.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import c
-
-class B(C):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/ordered/c.py b/python/ql/test/query-tests/ForbiddenDependency/ordered/c.py
deleted file mode 100644
index e6086862614..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/ordered/c.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import b
-
-class C:
-    def foo(self):
-        b = B()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/ordered/specification.arcspec b/python/ql/test/query-tests/ForbiddenDependency/ordered/specification.arcspec
deleted file mode 100644
index db867cf446a..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/ordered/specification.arcspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<architecture>
-	<patternMode>regex</patternMode>
-	<group name="G1" groupRule="layered">
-		<unit name="G2" filePattern="${source_location}.*/a.py" />
-		<unit name="G3" filePattern="${source_location}.*/b.py" />
-		<unit name="G4" filePattern="${source_location}.*/c.py" />
-	</group>
-	<disallow originContainers="G2" targetContainers="G3" />
-</architecture>
diff --git a/python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.expected b/python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.expected
deleted file mode 100644
index 4c804cbe72f..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.expected
+++ /dev/null
@@ -1 +0,0 @@
-| a.py:1:1:1:8 | Import | $@ imports $@. This violates the "private" group rule on "G5", which disallows dependencies from "G2" to "G5. | a.py:0:0:0:0 | Module a | a | b.py:0:0:0:0 | Module b | b |
diff --git a/python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.qlref b/python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.qlref
deleted file mode 100644
index 6470516326d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/private/ForbiddenDependency.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Architect/ForbiddenDependency.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/private/a.py b/python/ql/test/query-tests/ForbiddenDependency/private/a.py
deleted file mode 100644
index 0f9577fbb6f..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/private/a.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import b
-
-class A(B):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/private/b.py b/python/ql/test/query-tests/ForbiddenDependency/private/b.py
deleted file mode 100644
index f67f07f628d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/private/b.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import c
-
-class B(C):
-    pass
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/private/c.py b/python/ql/test/query-tests/ForbiddenDependency/private/c.py
deleted file mode 100644
index e6086862614..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/private/c.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import b
-
-class C:
-    def foo(self):
-        b = B()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/ForbiddenDependency/private/specification.arcspec b/python/ql/test/query-tests/ForbiddenDependency/private/specification.arcspec
deleted file mode 100644
index 2cd2699f89d..00000000000
--- a/python/ql/test/query-tests/ForbiddenDependency/private/specification.arcspec
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<architecture>
-	<patternMode>regex</patternMode>
-	<group name="G1" groupRule="unrestricted">
-		<!-- G2 to G3 dependency should not be allowed, because G2 is not a sibling of G5 -->
-		<unit name="G2" filePattern="${source_location}.*/a.py" />
-		<group name="G5" groupRule="unrestricted">
-			<group name="G5" groupRule="private">
-				<unit name="G3" filePattern="${source_location}.*/b.py" />
-			</group>
-			<!-- G4 to G3 dependency should be allowed, because G4 and G5 are siblings -->
-			<unit name="G4" filePattern="${source_location}.*/c.py" />
-		</group>
-	</group>
-</architecture>