Explicitly use utf8 instead of system default for parsing feature files

This problem is already fixed in the TCK which is not released yet. Thus this commit fixes the problem in Neo4j for now. All of the parsing overhead introduced here can be removed once Neo4j is updated to M12 of the TCK

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/AggregationAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: AggregationAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/BuiltInProcedureAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: BuiltInProcedureAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/CaseExpression.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: CaseExpression
 
   Scenario: Case should handle mixed number types

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/ConstraintAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: ConstraintAcceptance
 
   Scenario: Merge node with prop and label and unique index

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/DeleteAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: DeleteAcceptance
 
   Scenario: Return properties from deleted node

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/ExplainAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: ExplainAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/ForeachAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: ForeachAcceptance
 
   Scenario: Add labels inside FOREACH

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/IndexAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: IndexAcceptance
 
   Scenario: Handling numerical literal on the left when using an index

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/MatchAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: MatchAcceptance
 
   Scenario: Filter on path nodes

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/MergeLegacyAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: MergeLegacyAcceptance
 
   Scenario: Using a single bound node

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/OperatorChaining.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: OperatorChaining
 
   Scenario: Long chains of integer comparisons

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/OptionalMatchAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: OptionalMatchAcceptance
 
   Scenario: Id on null

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/OrderByAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: OrderByAcceptance
 
   Scenario: ORDER BY nodes should return null results last in ascending order

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/PatternExpressionAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: PatternExpressionAcceptance
 
   Scenario: Returning an `extract()` expression

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/PatternPredicates.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: PatternPredicates
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/ProcedureCallAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: ProcedureCallAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/ReturnAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: ReturnAcceptance
 
   Scenario: Filter should work

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/ShortestPathAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: ShortestPathAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/SkipLimitAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: SkipLimitAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/UnwindAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: UnwindAcceptance
 
   Scenario: Flat type support in list literal

public/enterprise/cypher/acceptance-spec-suite/src/test/resources/cypher/features/VarLengthAcceptance.feature

@@ -21,6 +21,8 @@
 # https://neo4j.com/licensing/
 #
 
+#encoding: utf-8
+
 Feature: VarLengthAcceptance
 
   Background:

public/enterprise/cypher/acceptance-spec-suite/src/test/scala/cypher/features/BaseAcceptanceTest.scala

@@ -29,7 +29,7 @@ import org.junit.Assert.fail
 import org.junit.jupiter.api.Test
 import org.junit.platform.runner.JUnitPlatform
 import org.junit.runner.RunWith
-import org.opencypher.tools.tck.api.{CypherTCK, Scenario}
+import org.opencypher.tools.tck.api.Scenario
 
 @RunWith(classOf[JUnitPlatform])
 abstract class BaseAcceptanceTest extends BaseFeatureTest {
@@ -42,7 +42,8 @@ abstract class BaseAcceptanceTest extends BaseFeatureTest {
   val featuresURI: URI = getClass.getResource("/cypher/features").toURI
 
   val scenarios: Seq[Scenario] = {
-    val all = CypherTCK.parseFilesystemFeatures(new File(featuresURI)).flatMap(_.scenarios)
+    val all = parseFilesystemFeatures(new File(featuresURI)).flatMap(_.scenarios) //TODO: Change this back to the following line when TCK M12 is released
+    //val all = CypherTCK.parseFilesystemFeatures(new File(featuresURI)).flatMap(_.scenarios)
     filterScenarios(all, featureToRun, scenarioToRun)
   }
 

public/enterprise/cypher/compatibility-spec-suite/src/test/scala/cypher/features/BaseTCKTests.scala

@@ -26,7 +26,7 @@ import org.junit.Assert.fail
 import org.junit.jupiter.api.Test
 import org.junit.platform.runner.JUnitPlatform
 import org.junit.runner.RunWith
-import org.opencypher.tools.tck.api.{CypherTCK, Scenario}
+import org.opencypher.tools.tck.api.Scenario
 
 @RunWith(classOf[JUnitPlatform])
 abstract class BaseTCKTests extends BaseFeatureTest {
@@ -35,8 +35,8 @@ abstract class BaseTCKTests extends BaseFeatureTest {
   val featureToRun = ""
   val scenarioToRun = ""
 
-  val scenarios: Seq[Scenario] =
-    filterScenarios(CypherTCK.allTckScenarios, featureToRun, scenarioToRun)
+  val scenarios: Seq[Scenario] = filterScenarios(allTckScenarios, featureToRun, scenarioToRun) //TODO: Change this back to the following line when TCK M12 is released
+    // filterScenarios(CypherTCK.allTckScenarios, featureToRun, scenarioToRun)
 
   @Test
   def debugTokensNeedToBeEmpty(): Unit = {

public/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/BaseFeatureTest.scala

@@ -22,10 +22,53 @@
  */
 package cypher.features
 
-import org.opencypher.tools.tck.api.Scenario
+import java.io.File
+import java.net.URL
+import java.nio.file.{FileSystems, Files, Paths}
+import java.util
+
+import org.opencypher.tools.tck.api.CypherTCK.{featureSuffix, featuresPath, parseFeature}
+import org.opencypher.tools.tck.api.{Feature, Scenario}
+
+import scala.collection.JavaConverters._
+import scala.io.{Codec, Source}
 
 abstract class BaseFeatureTest {
 
+  //  ---- TCK methods
+  // TODO: Remove those when M12 is released
+
+  def parseFilesystemFeatures(directory: File): Seq[Feature] = {
+    require(directory.isDirectory)
+    val featureFileNames = directory.listFiles.filter(_.getName.endsWith(featureSuffix))
+    featureFileNames.map(parseFilesystemFeature)
+  }
+
+  def parseFilesystemFeature(file: File): Feature = {
+    parseFeature(file.getAbsolutePath, Source.fromFile(file)(Codec.UTF8).mkString)
+  }
+
+  def parseClasspathFeature(pathUrl: URL): Feature = {
+    parseFeature(pathUrl.toString, Source.fromURL(pathUrl)(Codec.UTF8).mkString)
+  }
+
+  def allTckScenarios: Seq[Scenario] = parseClasspathFeatures(featuresPath).flatMap(_.scenarios)
+
+  def parseClasspathFeatures(path: String): Seq[Feature] = {
+    val resource = getClass.getResource(path).toURI
+    val fs = FileSystems.newFileSystem(resource, new util.HashMap[String, String]) // Needed to support `Paths.get` below
+    try {
+      val directoryPath = Paths.get(resource)
+      val paths = Files.newDirectoryStream(directoryPath).asScala.toSeq
+      val featurePathStrings = paths.map(path => path.toString).filter(_.endsWith(featureSuffix))
+      val featureUrls = featurePathStrings.map(getClass.getResource(_))
+      featureUrls.map(parseClasspathFeature)
+    } finally {
+      fs.close()
+    }
+  }
+  // ---- TCK methods end
+
   def filterScenarios(allScenarios: Seq[Scenario], featureToRun: String, scenarioToRun: String): Seq[Scenario] = {
     if (featureToRun.nonEmpty) {
       val filteredFeature = allScenarios.filter(s => s.featureName.contains(featureToRun))