Rename cypher suite modules consistently

neo4j · Jun 17, 2016 · 4aa2a57 · 4aa2a57
1 parent eeb04c3
commit 4aa2a57
Show file tree

Hide file tree

Showing 74 changed files with 1,884 additions and 18 deletions.
diff --git a/community/cypher/acceptance/pom.xml → ...nity/cypher/acceptance-spec-suite/pom.xml b/community/cypher/acceptance/pom.xml → ...nity/cypher/acceptance-spec-suite/pom.xml
@@ -11,11 +11,11 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>neo4j-cypher-acceptance</artifactId>
+  <artifactId>neo4j-cypher-acceptance-spec-suite</artifactId>
   <packaging>jar</packaging>
   <version>3.1.0-SNAPSHOT</version>
   <name>Neo4j - Cypher Acceptance</name>
-  <description>Neo4j query language acceptance tests</description>
+  <description>Neo4j - Cypher Acceptance Specification Suite</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
 
   <scm>

diff --git a/...cceptance/AggregationAcceptanceTest.scala → ...cceptance/AggregationAcceptanceTest.scala b/...cceptance/AggregationAcceptanceTest.scala → ...cceptance/AggregationAcceptanceTest.scala
diff --git a/...ptance/CaseExpressionAcceptanceTest.scala → ...ptance/CaseExpressionAcceptanceTest.scala b/...ptance/CaseExpressionAcceptanceTest.scala → ...ptance/CaseExpressionAcceptanceTest.scala
diff --git a/...acceptance/ColumnNameAcceptanceTest.scala → ...acceptance/ColumnNameAcceptanceTest.scala b/...acceptance/ColumnNameAcceptanceTest.scala → ...acceptance/ColumnNameAcceptanceTest.scala
diff --git a/...ce/ComparisonOperatorAcceptanceTest.scala → ...ce/ComparisonOperatorAcceptanceTest.scala b/...ce/ComparisonOperatorAcceptanceTest.scala → ...ce/ComparisonOperatorAcceptanceTest.scala
diff --git a/...her/acceptance/CreateAcceptanceTest.scala → ...her/acceptance/CreateAcceptanceTest.scala b/...her/acceptance/CreateAcceptanceTest.scala → ...her/acceptance/CreateAcceptanceTest.scala
diff --git a/...ceptance/CreateUniqueAcceptanceTest.scala → ...ceptance/CreateUniqueAcceptanceTest.scala b/...ceptance/CreateUniqueAcceptanceTest.scala → ...ceptance/CreateUniqueAcceptanceTest.scala
diff --git a/...her/acceptance/DeleteAcceptanceTest.scala → ...her/acceptance/DeleteAcceptanceTest.scala b/...her/acceptance/DeleteAcceptanceTest.scala → ...her/acceptance/DeleteAcceptanceTest.scala
diff --git a/...her/acceptance/EqualsAcceptanceTest.scala → ...her/acceptance/EqualsAcceptanceTest.scala b/...her/acceptance/EqualsAcceptanceTest.scala → ...her/acceptance/EqualsAcceptanceTest.scala
diff --git a/...acceptance/ExpressionAcceptanceTest.scala → ...acceptance/ExpressionAcceptanceTest.scala b/...acceptance/ExpressionAcceptanceTest.scala → ...acceptance/ExpressionAcceptanceTest.scala
diff --git a/.../acceptance/FunctionsAcceptanceTest.scala → .../acceptance/FunctionsAcceptanceTest.scala b/.../acceptance/FunctionsAcceptanceTest.scala → .../acceptance/FunctionsAcceptanceTest.scala
diff --git a/.../InQueryProcedureCallAcceptanceTest.scala → .../InQueryProcedureCallAcceptanceTest.scala b/.../InQueryProcedureCallAcceptanceTest.scala → .../InQueryProcedureCallAcceptanceTest.scala
diff --git a/...e/IndexNestedLoopJoinAcceptanceTest.scala → ...e/IndexNestedLoopJoinAcceptanceTest.scala b/...e/IndexNestedLoopJoinAcceptanceTest.scala → ...e/IndexNestedLoopJoinAcceptanceTest.scala
diff --git a/...her/acceptance/LabelsAcceptanceTest.scala → ...her/acceptance/LabelsAcceptanceTest.scala b/...her/acceptance/LabelsAcceptanceTest.scala → ...her/acceptance/LabelsAcceptanceTest.scala
diff --git a/...er/acceptance/LoadCsvAcceptanceTest.scala → ...er/acceptance/LoadCsvAcceptanceTest.scala b/...er/acceptance/LoadCsvAcceptanceTest.scala → ...er/acceptance/LoadCsvAcceptanceTest.scala
diff --git a/...ance/LoadCsvAcceptanceUserAgentTest.scala → ...ance/LoadCsvAcceptanceUserAgentTest.scala b/...ance/LoadCsvAcceptanceUserAgentTest.scala → ...ance/LoadCsvAcceptanceUserAgentTest.scala
diff --git a/...pher/acceptance/MatchAcceptanceTest.scala → ...pher/acceptance/MatchAcceptanceTest.scala b/...pher/acceptance/MatchAcceptanceTest.scala → ...pher/acceptance/MatchAcceptanceTest.scala
diff --git a/...onsBackedByCountStoreAcceptanceTest.scala → ...onsBackedByCountStoreAcceptanceTest.scala b/...onsBackedByCountStoreAcceptanceTest.scala → ...onsBackedByCountStoreAcceptanceTest.scala
diff --git a/...ance/MatchLongPatternAcceptanceTest.scala → ...ance/MatchLongPatternAcceptanceTest.scala b/...ance/MatchLongPatternAcceptanceTest.scala → ...ance/MatchLongPatternAcceptanceTest.scala
diff --git a/...nce/MergeIntoPlanningAcceptanceTest.scala → ...nce/MergeIntoPlanningAcceptanceTest.scala b/...nce/MergeIntoPlanningAcceptanceTest.scala → ...nce/MergeIntoPlanningAcceptanceTest.scala
diff --git a/.../acceptance/MergeNodeAcceptanceTest.scala → .../acceptance/MergeNodeAcceptanceTest.scala b/.../acceptance/MergeNodeAcceptanceTest.scala → .../acceptance/MergeNodeAcceptanceTest.scala
diff --git a/...nce/MergeRelationshipAcceptanceTest.scala → ...nce/MergeRelationshipAcceptanceTest.scala b/...nce/MergeRelationshipAcceptanceTest.scala → ...nce/MergeRelationshipAcceptanceTest.scala
diff --git a/...ypher/acceptance/NullAcceptanceTest.scala → ...ypher/acceptance/NullAcceptanceTest.scala b/...ypher/acceptance/NullAcceptanceTest.scala → ...ypher/acceptance/NullAcceptanceTest.scala
diff --git a/...eptance/OptionalMatchAcceptanceTest.scala → ...eptance/OptionalMatchAcceptanceTest.scala b/...eptance/OptionalMatchAcceptanceTest.scala → ...eptance/OptionalMatchAcceptanceTest.scala
diff --git a/...er/acceptance/OrderByAcceptanceTest.scala → ...er/acceptance/OrderByAcceptanceTest.scala b/...er/acceptance/OrderByAcceptanceTest.scala → ...er/acceptance/OrderByAcceptanceTest.scala
diff --git a/...ceptance/OrderByLimitAcceptanceTest.scala → ...ceptance/OrderByLimitAcceptanceTest.scala b/...ceptance/OrderByLimitAcceptanceTest.scala → ...ceptance/OrderByLimitAcceptanceTest.scala
diff --git a/.../PatternComprehensionAcceptanceTest.scala → .../PatternComprehensionAcceptanceTest.scala b/.../PatternComprehensionAcceptanceTest.scala → .../PatternComprehensionAcceptanceTest.scala
diff --git a/...ressionImplementationAcceptanceTest.scala → ...ressionImplementationAcceptanceTest.scala b/...ressionImplementationAcceptanceTest.scala → ...ressionImplementationAcceptanceTest.scala
diff --git a/...ptance/PeriodicCommitAcceptanceTest.scala → ...ptance/PeriodicCommitAcceptanceTest.scala b/...ptance/PeriodicCommitAcceptanceTest.scala → ...ptance/PeriodicCommitAcceptanceTest.scala
diff --git a/...acceptance/PreParsingAcceptanceTest.scala → ...acceptance/PreParsingAcceptanceTest.scala b/...acceptance/PreParsingAcceptanceTest.scala → ...acceptance/PreParsingAcceptanceTest.scala
diff --git a/...eptance/ProcedureCallAcceptanceTest.scala → ...eptance/ProcedureCallAcceptanceTest.scala b/...eptance/ProcedureCallAcceptanceTest.scala → ...eptance/ProcedureCallAcceptanceTest.scala
diff --git a/...e/QueryPlanCompactionAcceptanceTest.scala → ...e/QueryPlanCompactionAcceptanceTest.scala b/...e/QueryPlanCompactionAcceptanceTest.scala → ...e/QueryPlanCompactionAcceptanceTest.scala
diff --git a/...her/acceptance/RemoveAcceptanceTest.scala → ...her/acceptance/RemoveAcceptanceTest.scala b/...her/acceptance/RemoveAcceptanceTest.scala → ...her/acceptance/RemoveAcceptanceTest.scala
diff --git a/...her/acceptance/ReturnAcceptanceTest.scala → ...her/acceptance/ReturnAcceptanceTest.scala b/...her/acceptance/ReturnAcceptanceTest.scala → ...her/acceptance/ReturnAcceptanceTest.scala
diff --git a/...eptance/SemanticErrorAcceptanceTest.scala → ...eptance/SemanticErrorAcceptanceTest.scala b/...eptance/SemanticErrorAcceptanceTest.scala → ...eptance/SemanticErrorAcceptanceTest.scala
diff --git a/...eptance/SerializationAcceptanceTest.scala → ...eptance/SerializationAcceptanceTest.scala b/...eptance/SerializationAcceptanceTest.scala → ...eptance/SerializationAcceptanceTest.scala
diff --git a/...cypher/acceptance/SetAcceptanceTest.scala → ...cypher/acceptance/SetAcceptanceTest.scala b/...cypher/acceptance/SetAcceptanceTest.scala → ...cypher/acceptance/SetAcceptanceTest.scala
diff --git a/...ceptance/ShortestPathAcceptanceTest.scala → ...ceptance/ShortestPathAcceptanceTest.scala b/...ceptance/ShortestPathAcceptanceTest.scala → ...ceptance/ShortestPathAcceptanceTest.scala
diff --git a/...thExhaustiveForbiddenAcceptanceTest.scala → ...thExhaustiveForbiddenAcceptanceTest.scala b/...thExhaustiveForbiddenAcceptanceTest.scala → ...thExhaustiveForbiddenAcceptanceTest.scala
diff --git a/...ce/ShortestPathLongerAcceptanceTest.scala → ...ce/ShortestPathLongerAcceptanceTest.scala b/...ce/ShortestPathLongerAcceptanceTest.scala → ...ce/ShortestPathLongerAcceptanceTest.scala
diff --git a/...ance/SpatialFunctionsAcceptanceTest.scala → ...ance/SpatialFunctionsAcceptanceTest.scala b/...ance/SpatialFunctionsAcceptanceTest.scala → ...ance/SpatialFunctionsAcceptanceTest.scala
diff --git a/...andaloneProcedureCallAcceptanceTest.scala → ...andaloneProcedureCallAcceptanceTest.scala b/...andaloneProcedureCallAcceptanceTest.scala → ...andaloneProcedureCallAcceptanceTest.scala
diff --git a/...pher/acceptance/StartAcceptanceTest.scala → ...pher/acceptance/StartAcceptanceTest.scala b/...pher/acceptance/StartAcceptanceTest.scala → ...pher/acceptance/StartAcceptanceTest.scala
diff --git a/...nce/StartPointFindingAcceptanceTest.scala → ...nce/StartPointFindingAcceptanceTest.scala b/...nce/StartPointFindingAcceptanceTest.scala → ...nce/StartPointFindingAcceptanceTest.scala
diff --git a/...rtsWithImplementationAcceptanceTest.scala → ...rtsWithImplementationAcceptanceTest.scala b/...rtsWithImplementationAcceptanceTest.scala → ...rtsWithImplementationAcceptanceTest.scala
diff --git a/...ce/StatisticsPlanningAcceptanceTest.scala → ...ce/StatisticsPlanningAcceptanceTest.scala b/...ce/StatisticsPlanningAcceptanceTest.scala → ...ce/StatisticsPlanningAcceptanceTest.scala
diff --git a/...tance/SyntaxExceptionAcceptanceTest.scala → ...tance/SyntaxExceptionAcceptanceTest.scala b/...tance/SyntaxExceptionAcceptanceTest.scala → ...tance/SyntaxExceptionAcceptanceTest.scala
diff --git a/...ance/TriadicSelectionAcceptanceTest.scala → ...ance/TriadicSelectionAcceptanceTest.scala b/...ance/TriadicSelectionAcceptanceTest.scala → ...ance/TriadicSelectionAcceptanceTest.scala
diff --git a/...pher/acceptance/UnionAcceptanceTest.scala → ...pher/acceptance/UnionAcceptanceTest.scala b/...pher/acceptance/UnionAcceptanceTest.scala → ...pher/acceptance/UnionAcceptanceTest.scala
diff --git a/...cceptance/UniqueIndexAcceptanceTest.scala → ...cceptance/UniqueIndexAcceptanceTest.scala b/...cceptance/UniqueIndexAcceptanceTest.scala → ...cceptance/UniqueIndexAcceptanceTest.scala
diff --git a/...acceptance/UniquenessAcceptanceTest.scala → ...acceptance/UniquenessAcceptanceTest.scala b/...acceptance/UniquenessAcceptanceTest.scala → ...acceptance/UniquenessAcceptanceTest.scala
diff --git a/...her/acceptance/UnwindAcceptanceTest.scala → ...her/acceptance/UnwindAcceptanceTest.scala b/...her/acceptance/UnwindAcceptanceTest.scala → ...her/acceptance/UnwindAcceptanceTest.scala
diff --git a/...pher/acceptance/UsingAcceptanceTest.scala → ...pher/acceptance/UsingAcceptanceTest.scala b/...pher/acceptance/UsingAcceptanceTest.scala → ...pher/acceptance/UsingAcceptanceTest.scala
diff --git a/...ashJoinImplementationAcceptanceTest.scala → ...ashJoinImplementationAcceptanceTest.scala b/...ashJoinImplementationAcceptanceTest.scala → ...ashJoinImplementationAcceptanceTest.scala
diff --git a/...pher/acceptance/WhereAcceptanceTest.scala → ...pher/acceptance/WhereAcceptanceTest.scala b/...pher/acceptance/WhereAcceptanceTest.scala → ...pher/acceptance/WhereAcceptanceTest.scala
diff --git a/...ypher/acceptance/WithAcceptanceTest.scala → ...ypher/acceptance/WithAcceptanceTest.scala b/...ypher/acceptance/WithAcceptanceTest.scala → ...ypher/acceptance/WithAcceptanceTest.scala
diff --git a/...ty/cypher/compatibility-suite/LICENSE.txt → ...pher/compatibility-spec-suite/LICENSE.txt b/...ty/cypher/compatibility-suite/LICENSE.txt → ...pher/compatibility-spec-suite/LICENSE.txt
diff --git a/...y/cypher/compatibility-suite/LICENSES.txt → ...her/compatibility-spec-suite/LICENSES.txt b/...y/cypher/compatibility-suite/LICENSES.txt → ...her/compatibility-spec-suite/LICENSES.txt
diff --git a/...ity/cypher/compatibility-suite/NOTICE.txt → ...ypher/compatibility-spec-suite/NOTICE.txt b/...ity/cypher/compatibility-suite/NOTICE.txt → ...ypher/compatibility-spec-suite/NOTICE.txt
diff --git a/...ity/cypher/compatibility-suite/README.txt → ...ypher/compatibility-spec-suite/README.txt b/...ity/cypher/compatibility-suite/README.txt → ...ypher/compatibility-spec-suite/README.txt
diff --git a/community/cypher/compatibility-suite/pom.xml → ...y/cypher/compatibility-spec-suite/pom.xml b/community/cypher/compatibility-suite/pom.xml → ...y/cypher/compatibility-spec-suite/pom.xml
@@ -11,10 +11,10 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>neo4j-cypher-compatibility-suite</artifactId>
+  <artifactId>neo4j-cypher-compatibility-spec-suite</artifactId>
   <packaging>jar</packaging>
   <version>3.1.0-SNAPSHOT</version>
-  <name>Neo4j - Cypher Compatibility Suite</name>
+  <name>Neo4j - Cypher Compatibility Specification Suite</name>
   <description>Neo4j query language compatibility suite</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
 

diff --git a/...c/test/java/cypher/UnpackedResources.java → ...pher/CompatibilitySpecSuiteResources.java b/...c/test/java/cypher/UnpackedResources.java → ...pher/CompatibilitySpecSuiteResources.java
@@ -36,9 +36,9 @@
 import org.junit.runners.model.RunnerBuilder;
 import org.opencypher.tools.tck.TCKCucumberTemplate;
 
-public class UnpackedResources extends Enclosed
+public class CompatibilitySpecSuiteResources extends Enclosed
 {
-    public UnpackedResources( Class<?> klass, RunnerBuilder builder ) throws Throwable
+    public CompatibilitySpecSuiteResources( Class<?> klass, RunnerBuilder builder ) throws Throwable
     {
         super( klass, download( builder ) );
     }
@@ -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 ).getAbsoluteFile();
+        File directory = new File( new File ( new File( "target" ), "compatibility-spec-suite" ), suffix ).getAbsoluteFile();
         if ( !directory.exists() )
         {
             if ( !(create && directory.mkdirs()) )

diff --git a/...t/java/cypher/CompatibilitySuiteTest.java → ...va/cypher/CompatibilitySpecSuiteTest.java b/...t/java/cypher/CompatibilitySuiteTest.java → ...va/cypher/CompatibilitySpecSuiteTest.java
@@ -23,8 +23,8 @@
 import cucumber.api.junit.Cucumber;
 import org.junit.runner.RunWith;
 
-@RunWith( UnpackedResources.class )
-public class CompatibilitySuiteTest
+@RunWith( CompatibilitySpecSuiteResources.class )
+public class CompatibilitySpecSuiteTest
 {
 
     // These two constants are only used to make testing and debugging easier.

diff --git a/.../CompatibilitySuiteTestConstantsTest.java → ...patibilitySpecSuiteTestConstantsTest.java b/.../CompatibilitySuiteTestConstantsTest.java → ...patibilitySpecSuiteTestConstantsTest.java
@@ -24,15 +24,15 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;
 
-public class CompatibilitySuiteTestConstantsTest
+public class CompatibilitySpecSuiteTestConstantsTest
 {
     @Test
     public void runsAllFeatures() {
-        assertThat( CompatibilitySuiteTest.FEATURE_TO_RUN, isEmptyString());
+        assertThat( CompatibilitySpecSuiteTest.FEATURE_TO_RUN, isEmptyString());
     }
 
     @Test
     public void runsAllScenarios() {
-        assertThat( CompatibilitySuiteTest.SCENARIO_NAME_REQUIRED, isEmptyString());
+        assertThat( CompatibilitySpecSuiteTest.SCENARIO_NAME_REQUIRED, isEmptyString());
     }
 }
diff --git a/...st/resources/db-config/cost-compiled.json → ...st/resources/db-config/cost-compiled.json b/...st/resources/db-config/cost-compiled.json → ...st/resources/db-config/cost-compiled.json
diff --git a/...te/src/test/resources/db-config/cost.json → ...te/src/test/resources/db-config/cost.json b/...te/src/test/resources/db-config/cost.json → ...te/src/test/resources/db-config/cost.json
diff --git a/...te/src/test/resources/db-config/rule.json → ...te/src/test/resources/db-config/rule.json b/...te/src/test/resources/db-config/rule.json → ...te/src/test/resources/db-config/rule.json
diff --git a/...ature/steps/CompatibilitySuiteSteps.scala → ...e/steps/CompatibilitySpecSuiteSteps.scala b/...ature/steps/CompatibilitySuiteSteps.scala → ...e/steps/CompatibilitySpecSuiteSteps.scala
@@ -20,13 +20,13 @@
 package cypher.feature.steps
 
 import cypher.cucumber.db.{GraphArchiveLibrary, GraphFileRepository}
-import cypher.{CompatibilitySuiteTest, UnpackedResources}
+import cypher.{CompatibilitySpecSuiteTest, CompatibilitySpecSuiteResources}
 
 import scala.reflect.io.Path
 
-class CompatibilitySuiteSteps extends SpecSuiteSteps {
+class CompatibilitySpecSuiteSteps extends SpecSuiteSteps {
 
-  override val requiredScenarioName: String = CompatibilitySuiteTest.SCENARIO_NAME_REQUIRED.trim.toLowerCase
+  override val requiredScenarioName: String = CompatibilitySpecSuiteTest.SCENARIO_NAME_REQUIRED.trim.toLowerCase
 
   override val unsupportedScenarios = Set("Fail when adding new label predicate on already bound node 5",
     "Fail when trying to compare strings and numbers",
@@ -58,7 +58,7 @@ class CompatibilitySuiteSteps extends SpecSuiteSteps {
     "Copying properties from literal map with ON MATCH" // wrong output format (?)
   )
 
-  override val graphArchiveLibrary = new GraphArchiveLibrary(new GraphFileRepository(Path(UnpackedResources.targetDirectory("graphs"))))
+  override val graphArchiveLibrary = new GraphArchiveLibrary(new GraphFileRepository(Path(CompatibilitySpecSuiteResources.targetDirectory("graphs"))))
 }
 
 
diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml
@@ -37,8 +37,8 @@
     <module>cypher-compiler-3.1</module>
     <module>cypher</module>
     <module>spec-suite-tools</module>
-    <module>acceptance</module>
-    <module>compatibility-suite</module>
+    <module>acceptance-spec-suite</module>
+    <module>compatibility-spec-suite</module>
   </modules>
 
   <build>