Merge pull request #11127 from SaschaPeukert/3.4-fix-and-enable-accep…

…tance-and-tck-tests Make (almost all) TCKTests and AcceptanceTests executable with maven
neo4j · Mar 1, 2018 · 9a3c928 · 9a3c928
2 parents 951bebd + b249103
commit 9a3c928
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 6 deletions.
diff --git a/enterprise/cypher/acceptance-spec-suite/pom.xml b/enterprise/cypher/acceptance-spec-suite/pom.xml
@@ -93,6 +93,27 @@
       <artifactId>scalacheck_2.11</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-runner</artifactId>
+      <version>${junit-plattform-runner.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- neo4j -->
 
     <dependency>

diff --git a/...e/cypher/acceptance-spec-suite/src/test/resources/cypher/features/IndexAcceptance.feature b/...e/cypher/acceptance-spec-suite/src/test/resources/cypher/features/IndexAcceptance.feature
@@ -317,7 +317,7 @@ Feature: IndexAcceptance
       RETURN p
       """
     Then the result should be:
-      | p                             |
+      | p |
     And no side effects
 
   Scenario: Index seek should handle null value

diff --git a/enterprise/cypher/acceptance-spec-suite/src/test/scala/cypher/features/AcceptanceTests.scala b/enterprise/cypher/acceptance-spec-suite/src/test/scala/cypher/features/AcceptanceTests.scala
@@ -21,13 +21,15 @@ package cypher.features
 
 import java.io.File
 import java.net.URI
-import java.util.Collection
+import java.util
 
 import cypher.features.ScenarioTestHelper._
-import org.junit.jupiter.api.Assertions.fail
-import org.junit.jupiter.api.{DynamicTest, Test, TestFactory}
+import org.junit.jupiter.api.{DynamicTest, TestFactory}
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.runner.RunWith
 import org.opencypher.tools.tck.api.{CypherTCK, Scenario}
 
+@RunWith(classOf[JUnitPlatform])
 class AcceptanceTests extends BaseFeatureTest {
 
   // these two should be empty on commit!
@@ -41,4 +43,14 @@ class AcceptanceTests extends BaseFeatureTest {
     val all = CypherTCK.parseFilesystemFeatures(new File(featuresURI)).flatMap(_.scenarios)
     filterScenarios(all)
   }
+
+  @TestFactory
+  override def runCompatibility23(): util.Collection[DynamicTest] = {
+    //TODO: Investigate flakiness, it should not work in 2.3
+    def isFlakyOn23(scenario: Scenario): Boolean = {
+      scenario.name.equals("STARTS WITH should handle null prefix") && scenario.featureName.equals("IndexAcceptance")
+    }
+
+    createTests(scenarios.filterNot(isFlakyOn23), Compatibility23TestConfig)
+  }
 }
diff --git a/enterprise/cypher/compatibility-spec-suite/pom.xml b/enterprise/cypher/compatibility-spec-suite/pom.xml
@@ -93,6 +93,27 @@
       <artifactId>scalap</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-runner</artifactId>
+      <version>${junit-plattform-runner.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- neo4j -->
 
     <dependency>

diff --git a/enterprise/cypher/compatibility-spec-suite/src/test/resources/blacklists/cost-compiled.txt b/enterprise/cypher/compatibility-spec-suite/src/test/resources/blacklists/cost-compiled.txt
@@ -379,6 +379,9 @@ Feature "MatchAcceptance": Scenario "Return relationships by fetching them from
 Feature "MatchAcceptance": Scenario "Return relationships by collecting them as a list - wrong way"
 Feature "MatchAcceptance": Scenario "Return relationships by collecting them as a list - undirected"
 Feature "MatchAcceptance": Scenario "Return relationships by collecting them as a list"
+Feature "MatchAcceptance": Scenario "Return relationships by collecting them as a list - directed, one way"
+Feature "MatchAcceptance": Scenario "Return relationships by collecting them as a list - undirected, starting from two extremes"
+Feature "MatchAcceptance": Scenario "Return relationships by collecting them as a list - undirected, starting from one extreme"
 Feature "MatchAcceptance": Scenario "Return a var length path"
 Feature "MatchAcceptance": Scenario "Return a var length path of length zero"
 Feature "MatchAcceptance": Scenario "Return a named var length path of length zero"

diff --git a/enterprise/cypher/compatibility-spec-suite/src/test/scala/cypher/features/TCKTests.scala b/enterprise/cypher/compatibility-spec-suite/src/test/scala/cypher/features/TCKTests.scala
@@ -21,20 +21,30 @@ package cypher.features
 
 import java.nio.file.FileSystems
 
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.runner.RunWith
 import org.junit.jupiter.api.AfterEach
 import org.opencypher.tools.tck.api.{CypherTCK, Scenario}
 
+@RunWith(classOf[JUnitPlatform])
 class TCKTests extends BaseFeatureTest {
 
   // these two should be empty on commit!
   override val featureToRun = ""
   override val scenarioToRun = ""
 
   override val scenarios: Seq[Scenario] = {
-    val allScenarios: Seq[Scenario] = CypherTCK.allTckScenarios
+    val allScenarios: Seq[Scenario] = CypherTCK.allTckScenarios.filterNot(testsWithEncodingProblems)
     filterScenarios(allScenarios)
   }
 
+  // those tests run into some utf-8 encoding problems on some of our machines at the moment - fix for that is on the way on TCK side
+  // TODO: Remove this filter when new version of TCK (1.0.0-M10) is released
+  def testsWithEncodingProblems(scenario: Scenario): Boolean = {
+    (scenario.name.equals("Fail for invalid Unicode hyphen in subtraction") && scenario.featureName.equals("SemanticErrorAcceptance"))  ||
+      (scenario.name.equals("Accept valid Unicode literal") && scenario.featureName.equals("ReturnAcceptance2"))
+  }
+
   @AfterEach
   def tearDown(): Unit = {
     //TODO: This method can be removed with new release of TCK (1.0.0-M10)

diff --git a/enterprise/cypher/pom.xml b/enterprise/cypher/pom.xml
@@ -21,6 +21,8 @@
     <licensing.prepend.text>notice-agpl-prefix.txt</licensing.prepend.text>
     <license-text.header>AGPL-3-header.txt</license-text.header>
     <opencypher.version>1.0.0-M09</opencypher.version>
+    <junit-plattform-runner.version>1.1.0</junit-plattform-runner.version>
+    <junit-jupiter.version>5.1.0</junit-jupiter.version>
   </properties>
 
   <scm>

diff --git a/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/ScenarioTestHelper.scala b/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/ScenarioTestHelper.scala
@@ -56,7 +56,7 @@ object ScenarioTestHelper {
             scenario(Neo4jAdapter(config.executionPrefix)).execute()
           } match {
             case Success(_) => throw new IllegalStateException("Unexpectedly succeeded in the following blacklisted scenario:\n" + name)
-            case Failure(e) => println("Failed as expected with\n  " + e.getMessage)
+            case Failure(e) => // failed as expected
           }
         }
       }