Factor tck suite tooling into separate module

o Remove old DatabaseConfigProvider cucumber plugin o Restructure directory layout of db-config provisioning
neo4j · Jun 17, 2016 · eeb04c3 · eeb04c3
1 parent a3a64d9
commit eeb04c3
Show file tree

Hide file tree

Showing 65 changed files with 252 additions and 98 deletions.
diff --git a/community/cypher/compatibility-suite/pom.xml b/community/cypher/compatibility-suite/pom.xml
@@ -87,46 +87,6 @@
 
     <!-- shared versions are defined in the parent pom -->
 
-    <dependency>
-      <groupId>org.opencypher</groupId>
-      <artifactId>tck</artifactId>
-      <version>${opencypher.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opencypher</groupId>
-      <artifactId>grammar</artifactId>
-      <version>${opencypher.version}</version>
-    </dependency>
-
-    <!-- JSON -->
-
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Visualization -->
-
-    <dependency>
-      <groupId>org.jfree</groupId>
-      <artifactId>jfreechart</artifactId>
-      <version>1.0.19</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.xmlgraphics</groupId>
-      <artifactId>batik-svggen</artifactId>
-      <version>1.8</version>
-    </dependency>
-
     <!-- scala -->
 
     <dependency>
@@ -148,7 +108,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.scalautils</groupId>
       <artifactId>scalautils_2.11</artifactId>
@@ -160,7 +119,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.scalacheck</groupId>
       <artifactId>scalacheck_2.11</artifactId>
@@ -169,51 +127,35 @@
 
     <!-- neo4j -->
 
-    <dependency>
-      <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-kernel</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher-spec-suite-tools</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- neo4j testing -->
 
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-kernel</artifactId>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-io</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher</artifactId>
-      <type>test-jar</type>
       <version>${project.version}</version>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
@@ -224,20 +166,5 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
-    <!-- other -->
-
-    <dependency>
-      <groupId>com.novus</groupId>
-      <artifactId>salat-core_2.11</artifactId>
-      <version>1.9.9</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
   </dependencies>
 </project>
diff --git a/community/cypher/compatibility-suite/src/test/java/cypher/UnpackedResources.java b/community/cypher/compatibility-suite/src/test/java/cypher/UnpackedResources.java
@@ -105,7 +105,7 @@ public static File targetDirectory( String suffix )
 
     private static File obtainTargetDirectory( boolean create, String suffix )
     {
-        File directory = new File( new File( "target" ), suffix );
+        File directory = new File( new File( "target" ), suffix ).getAbsoluteFile();
         if ( !directory.exists() )
         {
             if ( !(create && directory.mkdirs()) )

diff --git a/...cypher/feature/steps/CypherTCKSteps.scala → ...ature/steps/CompatibilitySuiteSteps.scala b/...cypher/feature/steps/CypherTCKSteps.scala → ...ature/steps/CompatibilitySuiteSteps.scala
@@ -24,7 +24,7 @@ import cypher.{CompatibilitySuiteTest, UnpackedResources}
 
 import scala.reflect.io.Path
 
-class CypherTCKSteps extends SpecSuiteSteps {
+class CompatibilitySuiteSteps extends SpecSuiteSteps {
 
   override val requiredScenarioName: String = CompatibilitySuiteTest.SCENARIO_NAME_REQUIRED.trim.toLowerCase
 
@@ -51,14 +51,14 @@ class CypherTCKSteps extends SpecSuiteSteps {
     "Fail when using property access on primitive type", // change error detail
     "Fail when comparing nodes to relationships",
     "Many CREATE clauses", // stack overflow
-    "Null-setting one property with ON CREATE", // wrong ouput format (?)
-    "Copying properties from node with ON CREATE", // wrong ouput format (?)
-    "Copying properties from node with ON MATCH", // wrong ouput format (?)
-    "Copying properties from literal map with ON CREATE", // wrong ouput format (?)
+    "Null-setting one property with ON CREATE", // wrong output format (?)
+    "Copying properties from node with ON CREATE", // wrong output format (?)
+    "Copying properties from node with ON MATCH", // wrong output format (?)
+    "Copying properties from literal map with ON CREATE", // wrong output format (?)
     "Copying properties from literal map with ON MATCH" // wrong output format (?)
   )
 
-  override val graphArchiveLibrary = new GraphArchiveLibrary(new GraphFileRepository(Path(UnpackedResources.targetDirectory("graphs").getAbsoluteFile)))
+  override val graphArchiveLibrary = new GraphArchiveLibrary(new GraphFileRepository(Path(UnpackedResources.targetDirectory("graphs"))))
 }
 
 
diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml
@@ -36,6 +36,7 @@
     <module>frontend-3.1</module>
     <module>cypher-compiler-3.1</module>
     <module>cypher</module>
+    <module>spec-suite-tools</module>
     <module>acceptance</module>
     <module>compatibility-suite</module>
   </modules>

diff --git a/...feature/parser/CypherMatchersCreator.java → ...feature/parser/CypherMatchersCreator.java b/...feature/parser/CypherMatchersCreator.java → ...feature/parser/CypherMatchersCreator.java
diff --git a/...ature/parser/CypherParametersCreator.java → ...ature/parser/CypherParametersCreator.java b/...ature/parser/CypherParametersCreator.java → ...ature/parser/CypherParametersCreator.java
diff --git a/.../feature/parser/ParsingErrorListener.java → .../feature/parser/ParsingErrorListener.java b/.../feature/parser/ParsingErrorListener.java → .../feature/parser/ParsingErrorListener.java
diff --git a/.../cypher/feature/parser/ResultsParser.java → .../cypher/feature/parser/ResultsParser.java b/.../cypher/feature/parser/ResultsParser.java → .../cypher/feature/parser/ResultsParser.java
diff --git a/...ature/parser/matchers/BooleanMatcher.java → ...ature/parser/matchers/BooleanMatcher.java b/...ature/parser/matchers/BooleanMatcher.java → ...ature/parser/matchers/BooleanMatcher.java
diff --git a/...feature/parser/matchers/FloatMatcher.java → ...feature/parser/matchers/FloatMatcher.java b/...feature/parser/matchers/FloatMatcher.java → ...feature/parser/matchers/FloatMatcher.java
diff --git a/...ature/parser/matchers/IntegerMatcher.java → ...ature/parser/matchers/IntegerMatcher.java b/...ature/parser/matchers/IntegerMatcher.java → ...ature/parser/matchers/IntegerMatcher.java
diff --git a/.../feature/parser/matchers/ListMatcher.java → .../feature/parser/matchers/ListMatcher.java b/.../feature/parser/matchers/ListMatcher.java → .../feature/parser/matchers/ListMatcher.java
diff --git a/...r/feature/parser/matchers/MapMatcher.java → ...r/feature/parser/matchers/MapMatcher.java b/...r/feature/parser/matchers/MapMatcher.java → ...r/feature/parser/matchers/MapMatcher.java
diff --git a/...pher/feature/parser/matchers/Matcher.java → ...pher/feature/parser/matchers/Matcher.java b/...pher/feature/parser/matchers/Matcher.java → ...pher/feature/parser/matchers/Matcher.java
diff --git a/.../feature/parser/matchers/NodeMatcher.java → .../feature/parser/matchers/NodeMatcher.java b/.../feature/parser/matchers/NodeMatcher.java → .../feature/parser/matchers/NodeMatcher.java
diff --git a/...ture/parser/matchers/PathLinkMatcher.java → ...ture/parser/matchers/PathLinkMatcher.java b/...ture/parser/matchers/PathLinkMatcher.java → ...ture/parser/matchers/PathLinkMatcher.java
diff --git a/.../feature/parser/matchers/PathMatcher.java → .../feature/parser/matchers/PathMatcher.java b/.../feature/parser/matchers/PathMatcher.java → .../feature/parser/matchers/PathMatcher.java
diff --git a/...rser/matchers/QueryStatisticsMatcher.java → ...rser/matchers/QueryStatisticsMatcher.java b/...rser/matchers/QueryStatisticsMatcher.java → ...rser/matchers/QueryStatisticsMatcher.java
diff --git a/.../parser/matchers/RelationshipMatcher.java → .../parser/matchers/RelationshipMatcher.java b/.../parser/matchers/RelationshipMatcher.java → .../parser/matchers/RelationshipMatcher.java
diff --git a/...eature/parser/matchers/ResultMatcher.java → ...eature/parser/matchers/ResultMatcher.java b/...eature/parser/matchers/ResultMatcher.java → ...eature/parser/matchers/ResultMatcher.java
diff --git a/...eature/parser/matchers/ResultWrapper.java → ...eature/parser/matchers/ResultWrapper.java b/...eature/parser/matchers/ResultWrapper.java → ...eature/parser/matchers/ResultWrapper.java
diff --git a/...r/feature/parser/matchers/RowMatcher.java → ...r/feature/parser/matchers/RowMatcher.java b/...r/feature/parser/matchers/RowMatcher.java → ...r/feature/parser/matchers/RowMatcher.java
diff --git a/...eature/parser/matchers/StringMatcher.java → ...eature/parser/matchers/StringMatcher.java b/...eature/parser/matchers/StringMatcher.java → ...eature/parser/matchers/StringMatcher.java
diff --git a/...eature/parser/matchers/TckSerializer.java → ...eature/parser/matchers/TckSerializer.java b/...eature/parser/matchers/TckSerializer.java → ...eature/parser/matchers/TckSerializer.java
diff --git a/...parser/matchers/UnorderedListMatcher.java → ...parser/matchers/UnorderedListMatcher.java b/...parser/matchers/UnorderedListMatcher.java → ...parser/matchers/UnorderedListMatcher.java
diff --git a/...feature/parser/matchers/ValueMatcher.java → ...feature/parser/matchers/ValueMatcher.java b/...feature/parser/matchers/ValueMatcher.java → ...feature/parser/matchers/ValueMatcher.java
diff --git a/...ser/reporting/CombinationChartWriter.java → ...ser/reporting/CombinationChartWriter.java b/...ser/reporting/CombinationChartWriter.java → ...ser/reporting/CombinationChartWriter.java
diff --git a/...parser/reporting/CoverageChartWriter.java → ...parser/reporting/CoverageChartWriter.java b/...parser/reporting/CoverageChartWriter.java → ...parser/reporting/CoverageChartWriter.java
diff --git a/...ala/cypher/cucumber/CucumberAdapter.scala → ...ala/cypher/cucumber/CucumberAdapter.scala b/...ala/cypher/cucumber/CucumberAdapter.scala → ...ala/cypher/cucumber/CucumberAdapter.scala
diff --git a/.../cypher/cucumber/db/DatabaseArchive.scala → .../cypher/cucumber/db/DatabaseArchive.scala b/.../cypher/cucumber/db/DatabaseArchive.scala → .../cypher/cucumber/db/DatabaseArchive.scala
diff --git a/.../cucumber/db/DatabaseConfigProvider.scala → .../cucumber/db/DatabaseConfigProvider.scala b/.../cucumber/db/DatabaseConfigProvider.scala → .../cucumber/db/DatabaseConfigProvider.scala
diff --git a/.../cypher/cucumber/db/DeleteDirectory.scala → .../cypher/cucumber/db/DeleteDirectory.scala b/.../cypher/cucumber/db/DeleteDirectory.scala → .../cypher/cucumber/db/DeleteDirectory.scala
diff --git a/...ala/cypher/cucumber/db/GraphArchive.scala → ...ala/cypher/cucumber/db/GraphArchive.scala b/...ala/cypher/cucumber/db/GraphArchive.scala → ...ala/cypher/cucumber/db/GraphArchive.scala
diff --git a/...er/cucumber/db/GraphArchiveImporter.scala → ...er/cucumber/db/GraphArchiveImporter.scala b/...er/cucumber/db/GraphArchiveImporter.scala → ...er/cucumber/db/GraphArchiveImporter.scala
diff --git a/...her/cucumber/db/GraphArchiveLibrary.scala → ...her/cucumber/db/GraphArchiveLibrary.scala b/...her/cucumber/db/GraphArchiveLibrary.scala → ...her/cucumber/db/GraphArchiveLibrary.scala
@@ -23,10 +23,6 @@ import java.nio.file.Files
 
 import scala.reflect.io.Path
 
-object GraphArchiveLibrary {
-  val default = new GraphArchiveLibrary(GraphFileRepository.default)
-}
-
 class GraphArchiveLibrary(val repository: GraphFileRepository) {
 
   def recipe(name: String) = repository.graphRecipeLoader(name)

diff --git a/...her/cucumber/db/GraphFileRepository.scala → ...her/cucumber/db/GraphFileRepository.scala b/...her/cucumber/db/GraphFileRepository.scala → ...her/cucumber/db/GraphFileRepository.scala
@@ -21,24 +21,18 @@ package cypher.cucumber.db
 
 import java.util.UUID
 
-import cypher.UnpackedResources
-
 import scala.reflect.io.{File, Path}
 
-object GraphFileRepository {
-  val default = new GraphFileRepository(Path(UnpackedResources.targetDirectory("graphs").getAbsoluteFile))
-}
-
-class GraphFileRepository(graphs: Path) {
+class GraphFileRepository(root: Path) {
   self =>
 
   val graphRecipeLoader = GraphRecipeLoader.forRepository(self)
 
-  def graphImportFile(name: String) = graphs / File(s"$name.json")
-  def graphScriptFile(name: String) = graphs / File(s"$name.cypher")
-  def graphArchivePath(descriptor: GraphArchive.Descriptor) = graphs / Path(descriptor.toString)
+  def graphImportFile(name: String) = root / File(s"$name.json")
+  def graphScriptFile(name: String) = root / File(s"$name.cypher")
+  def graphArchivePath(descriptor: GraphArchive.Descriptor) = root / Path(descriptor.toString)
   def graphArchiveImportStatusFile(descriptor: GraphArchive.Descriptor) = graphArchivePath(descriptor) / "IMPORTED"
-  def temporarySnapshotPath = DeleteDirectory.onExit(graphs / Path(UUID.randomUUID().toString))
+  def temporarySnapshotPath = DeleteDirectory.onExit(root / Path(UUID.randomUUID().toString))
 }
 
 
diff --git a/...ypher/cucumber/db/GraphRecipeLoader.scala → ...ypher/cucumber/db/GraphRecipeLoader.scala b/...ypher/cucumber/db/GraphRecipeLoader.scala → ...ypher/cucumber/db/GraphRecipeLoader.scala
diff --git a/...st/scala/cypher/cucumber/db/package.scala → ...in/scala/cypher/cucumber/db/package.scala b/...st/scala/cypher/cucumber/db/package.scala → ...in/scala/cypher/cucumber/db/package.scala
diff --git a/...her/feature/parser/ParsingFunctions.scala → ...her/feature/parser/ParsingFunctions.scala b/...her/feature/parser/ParsingFunctions.scala → ...her/feature/parser/ParsingFunctions.scala
diff --git a/...ture/reporting/CypherResultReporter.scala → ...ture/reporting/CypherResultReporter.scala b/...ture/reporting/CypherResultReporter.scala → ...ture/reporting/CypherResultReporter.scala
diff --git a/...cypher/feature/reporting/JsonResult.scala → ...cypher/feature/reporting/JsonResult.scala b/...cypher/feature/reporting/JsonResult.scala → ...cypher/feature/reporting/JsonResult.scala
diff --git a/...er/feature/reporting/OutputProducer.scala → ...er/feature/reporting/OutputProducer.scala b/...er/feature/reporting/OutputProducer.scala → ...er/feature/reporting/OutputProducer.scala
diff --git a/...ty-suite/src/test/java/cypher/MapRow.java → ...te-tools/src/test/java/cypher/MapRow.java b/...ty-suite/src/test/java/cypher/MapRow.java → ...te-tools/src/test/java/cypher/MapRow.java
diff --git a/...r/feature/parser/ParsingTestSupport.scala → ...r/feature/parser/ParsingTestSupport.scala b/...r/feature/parser/ParsingTestSupport.scala → ...r/feature/parser/ParsingTestSupport.scala
diff --git a/...re/parser/expectedResultsParserTest.scala → ...re/parser/expectedResultsParserTest.scala b/...re/parser/expectedResultsParserTest.scala → ...re/parser/expectedResultsParserTest.scala
diff --git a/.../parser/matchers/BooleanMatcherTest.scala → .../parser/matchers/BooleanMatcherTest.scala b/.../parser/matchers/BooleanMatcherTest.scala → .../parser/matchers/BooleanMatcherTest.scala
diff --git a/...re/parser/matchers/FloatMatcherTest.scala → ...re/parser/matchers/FloatMatcherTest.scala b/...re/parser/matchers/FloatMatcherTest.scala → ...re/parser/matchers/FloatMatcherTest.scala
diff --git a/.../parser/matchers/IntegerMatcherTest.scala → .../parser/matchers/IntegerMatcherTest.scala b/.../parser/matchers/IntegerMatcherTest.scala → .../parser/matchers/IntegerMatcherTest.scala
diff --git a/...ure/parser/matchers/ListMatcherTest.scala → ...ure/parser/matchers/ListMatcherTest.scala b/...ure/parser/matchers/ListMatcherTest.scala → ...ure/parser/matchers/ListMatcherTest.scala
diff --git a/...ture/parser/matchers/MapMatcherTest.scala → ...ture/parser/matchers/MapMatcherTest.scala b/...ture/parser/matchers/MapMatcherTest.scala → ...ture/parser/matchers/MapMatcherTest.scala
diff --git a/...ure/parser/matchers/NodeMatcherTest.scala → ...ure/parser/matchers/NodeMatcherTest.scala b/...ure/parser/matchers/NodeMatcherTest.scala → ...ure/parser/matchers/NodeMatcherTest.scala
diff --git a/...parser/matchers/PathLinkMatcherTest.scala → ...parser/matchers/PathLinkMatcherTest.scala b/...parser/matchers/PathLinkMatcherTest.scala → ...parser/matchers/PathLinkMatcherTest.scala
diff --git a/...ure/parser/matchers/PathMatcherTest.scala → ...ure/parser/matchers/PathMatcherTest.scala b/...ure/parser/matchers/PathMatcherTest.scala → ...ure/parser/matchers/PathMatcherTest.scala
diff --git a/...er/matchers/RelationshipMatcherTest.scala → ...er/matchers/RelationshipMatcherTest.scala b/...er/matchers/RelationshipMatcherTest.scala → ...er/matchers/RelationshipMatcherTest.scala
diff --git a/...e/parser/matchers/ResultMatcherTest.scala → ...e/parser/matchers/ResultMatcherTest.scala b/...e/parser/matchers/ResultMatcherTest.scala → ...e/parser/matchers/ResultMatcherTest.scala
diff --git a/...ture/parser/matchers/RowMatcherTest.scala → ...ture/parser/matchers/RowMatcherTest.scala b/...ture/parser/matchers/RowMatcherTest.scala → ...ture/parser/matchers/RowMatcherTest.scala
diff --git a/...e/parser/matchers/StringMatcherTest.scala → ...e/parser/matchers/StringMatcherTest.scala b/...e/parser/matchers/StringMatcherTest.scala → ...e/parser/matchers/StringMatcherTest.scala
diff --git a/...e/parser/matchers/TckSerializerTest.scala → ...e/parser/matchers/TckSerializerTest.scala b/...e/parser/matchers/TckSerializerTest.scala → ...e/parser/matchers/TckSerializerTest.scala
diff --git a/...r/matchers/UnorderedListMatcherTest.scala → ...r/matchers/UnorderedListMatcherTest.scala b/...r/matchers/UnorderedListMatcherTest.scala → ...r/matchers/UnorderedListMatcherTest.scala
diff --git a/...re/parser/matchers/ValueMatcherTest.scala → ...re/parser/matchers/ValueMatcherTest.scala b/...re/parser/matchers/ValueMatcherTest.scala → ...re/parser/matchers/ValueMatcherTest.scala
diff --git a/...her/feature/parser/paramsParserTest.scala → ...her/feature/parser/paramsParserTest.scala b/...her/feature/parser/paramsParserTest.scala → ...her/feature/parser/paramsParserTest.scala
diff --git a/...eporting/CombinationChartWriterTest.scala → ...eporting/CombinationChartWriterTest.scala b/...eporting/CombinationChartWriterTest.scala → ...eporting/CombinationChartWriterTest.scala
diff --git a/...feature/parser/statisticsParserTest.scala → ...feature/parser/statisticsParserTest.scala b/...feature/parser/statisticsParserTest.scala → ...feature/parser/statisticsParserTest.scala