Merge remote-tracking branch 'origin/master' into master-v2

Andy2003 · Andy2003 · commit cf743db0f74d · 2024-12-19T14:08:20.000+01:00
# Conflicts:
#	.github/workflows/changelog-configuration.json
#	core/src/test/kotlin/demo/DataFetcherInterceptorDemo.kt
#	core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt
#	core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt
#	core/src/test/kotlin/org/neo4j/graphql/TranslatorExceptionTests.kt
#	core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt
#	core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt
#	core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt
#	core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt
#	readme.adoc
diff --git a/core/src/test/kotlin/SchemaTest.kt b/core/src/test/kotlin/SchemaTest.kt
diff --git a/core/src/test/kotlin/demo/GraphQLServer.kt b/core/src/test/kotlin/demo/GraphQLServer.kt
diff --git a/core/src/test/kotlin/demo/Neo4jAdapterDemo.kt b/core/src/test/kotlin/demo/Neo4jAdapterDemo.kt
diff --git a/core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt b/core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt
@@ -1,22 +1,22 @@
 package org.neo4j.graphql
 
-import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.TestFactory
-import org.neo4j.graphql.utils.GraphQLSchemaTestSuite
+import org.neo4j.graphql.factories.GraphQLSchemaTestFactory
+import org.neo4j.graphql.utils.TestUtils.createTestsInPath
 
 class AugmentationTests {
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `augmentation-tests`() = GraphQLSchemaTestSuite("augmentation-tests.adoc").generateTests()
+    fun `augmentation-tests`() = GraphQLSchemaTestFactory("augmentation-tests.adoc").generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `schema-operations-tests`() = GraphQLSchemaTestSuite("schema-operations-tests.adoc").generateTests()
+    fun `schema-operations-tests`() = GraphQLSchemaTestFactory("schema-operations-tests.adoc").generateTests()
 
 
     @TestFactory
     fun `schema augmentation tests v2`() =
-        createTestsInPath("tck-test-files/schema/v2", { GraphQLSchemaTestSuite(it).generateTests() })
+        createTestsInPath("tck-test-files/schema/v2", { GraphQLSchemaTestFactory(it).generateTests() })
 }
diff --git a/core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt b/core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt
@@ -1,12 +1,12 @@
 package org.neo4j.graphql
 
 import apoc.date.Date
-import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath
 import org.junit.jupiter.api.*
 import org.neo4j.driver.AuthTokens
 import org.neo4j.driver.Driver
 import org.neo4j.driver.GraphDatabase
-import org.neo4j.graphql.utils.CypherTestSuite
+import org.neo4j.graphql.factories.CypherTestFactory
+import org.neo4j.graphql.utils.TestUtils.createTestsInPath
 import org.neo4j.harness.Neo4j
 import org.neo4j.harness.Neo4jBuilders
 import java.nio.file.Path
@@ -37,66 +37,66 @@ class CypherTests {
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `cypher-directive-tests`() = CypherTestSuite("cypher-directive-tests.adoc", driver).generateTests()
+    fun `cypher-directive-tests`() = CypherTestFactory("cypher-directive-tests.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `dynamic-property-tests`() = CypherTestSuite("dynamic-property-tests.adoc", driver).generateTests()
+    fun `dynamic-property-tests`() = CypherTestFactory("dynamic-property-tests.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `filter-tests`() = CypherTestSuite("filter-tests.adoc", driver).generateTests()
+    fun `filter-tests`() = CypherTestFactory("filter-tests.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `relationship-tests`() = CypherTestSuite("relationship-tests.adoc", driver).generateTests()
+    fun `relationship-tests`() = CypherTestFactory("relationship-tests.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `movie-tests`() = CypherTestSuite("movie-tests.adoc", driver).generateTests()
+    fun `movie-tests`() = CypherTestFactory("movie-tests.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `property-tests`() = CypherTestSuite("property-tests.adoc", driver).generateTests()
+    fun `property-tests`() = CypherTestFactory("property-tests.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `translator-tests1`() = CypherTestSuite("translator-tests1.adoc", driver).generateTests()
+    fun `translator-tests1`() = CypherTestFactory("translator-tests1.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `translator-tests2`() = CypherTestSuite("translator-tests2.adoc", driver).generateTests()
+    fun `translator-tests2`() = CypherTestFactory("translator-tests2.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `translator-tests3`() = CypherTestSuite("translator-tests3.adoc", driver).generateTests()
+    fun `translator-tests3`() = CypherTestFactory("translator-tests3.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
     fun `translator-tests-custom-scalars`() =
-        CypherTestSuite("translator-tests-custom-scalars.adoc", driver).generateTests()
+        CypherTestFactory("translator-tests-custom-scalars.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `optimized-query-for-filter`() = CypherTestSuite("optimized-query-for-filter.adoc", driver).generateTests()
+    fun `optimized-query-for-filter`() = CypherTestFactory("optimized-query-for-filter.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `custom-fields`() = CypherTestSuite("custom-fields.adoc", driver).generateTests()
+    fun `custom-fields`() = CypherTestFactory("custom-fields.adoc", driver).generateTests()
 
     @Disabled("This test is disabled because it is not yet migrated")
     @TestFactory
-    fun `test issues`() = createTestsInPath("issues", { CypherTestSuite(it, driver).generateTests() })
+    fun `test issues`() = createTestsInPath("issues", { CypherTestFactory(it, driver).generateTests() })
 
     @TestFactory
     fun `new cypher tck tests v2`() =
-        createTestsInPath("tck-test-files/cypher/v2", { CypherTestSuite(it, driver).generateTests() })
+        createTestsInPath("tck-test-files/cypher/v2", { CypherTestFactory(it, driver).generateTests() })
 
     @TestFactory
     fun `integration-tests`() =
         createTestsInPath(
             "integration-test-files",
-            { CypherTestSuite(it, driver, createMissingBlocks = false).generateTests() })
+            { CypherTestFactory(it, driver, createMissingBlocks = false).generateTests() })
 
     companion object {
         private val INTEGRATION_TESTS = System.getProperty("neo4j-graphql-java.integration-tests", "false") == "true"
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt
@@ -1,6 +1,6 @@
-package demo.org.neo4j.graphql.utils.asciidoc
+package org.neo4j.graphql.asciidoc
 
-import demo.org.neo4j.graphql.utils.asciidoc.ast.*
+import org.neo4j.graphql.asciidoc.ast.*
 import org.apache.commons.csv.CSVFormat
 import java.io.File
 import java.net.URI
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils.asciidoc.ast
+package org.neo4j.graphql.asciidoc.ast
 
 class Block(
     parent: StructuralNode,
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils.asciidoc.ast
+package org.neo4j.graphql.asciidoc.ast
 
 import java.net.URI
 
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils.asciidoc.ast
+package org.neo4j.graphql.asciidoc.ast
 
 import java.net.URI
 
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils.asciidoc.ast
+package org.neo4j.graphql.asciidoc.ast
 
 import java.net.URI
 
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils.asciidoc.ast
+package org.neo4j.graphql.asciidoc.ast
 
 sealed class StructuralNode(
     open val parent: StructuralNode?
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils.asciidoc.ast
+package org.neo4j.graphql.asciidoc.ast
 
 import org.apache.commons.csv.CSVRecord
 import java.net.URI
diff --git a/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt
@@ -0,0 +1,3 @@
+package org.neo4j.graphql.asciidoc.ast
+
+class ThematicBreak: StructuralNode(null)
diff --git a/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt
@@ -1,4 +1,4 @@
-package org.neo4j.graphql.utils
+package org.neo4j.graphql.factories
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.JsonSerializer
@@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import com.intellij.rt.execution.junit.FileComparisonFailure
-import demo.org.neo4j.graphql.utils.asciidoc.AsciiDocParser
-import demo.org.neo4j.graphql.utils.asciidoc.ast.*
 import org.junit.jupiter.api.DynamicContainer
 import org.junit.jupiter.api.DynamicNode
 import org.junit.jupiter.api.DynamicTest
+import org.neo4j.graphql.asciidoc.AsciiDocParser
+import org.neo4j.graphql.asciidoc.ast.*
 import java.io.File
 import java.io.FileWriter
 import java.time.temporal.TemporalAmount
@@ -24,7 +24,7 @@ import kotlin.reflect.KMutableProperty1
  * @param fileName the name of the test file
  * @param relevantBlocks a list of pairs of filter functions and properties to set the found code blocks
  */
-abstract class AsciiDocTestSuite<T>(
+abstract class AsciiDocTestFactory<T>(
     protected val fileName: String,
     private val relevantBlocks: List<CodeBlockMatcher<T>>,
     private val createMissingBlocks: Boolean = true
@@ -56,16 +56,20 @@ abstract class AsciiDocTestSuite<T>(
             tests += DynamicTest.dynamicTest(
                 "Write updated Testfile",
                 srcLocation,
-                this@AsciiDocTestSuite::writeAdjustedTestFile
+                this@AsciiDocTestFactory::writeAdjustedTestFile
             )
         } else if (REFORMAT_TEST_FILE) {
-            tests += DynamicTest.dynamicTest("Reformat Testfile", srcLocation, this@AsciiDocTestSuite::reformatTestFile)
+            tests += DynamicTest.dynamicTest(
+                "Reformat Testfile",
+                srcLocation,
+                this@AsciiDocTestFactory::reformatTestFile
+            )
         } else if (GENERATE_TEST_FILE_DIFF) {
             // this test prints out the adjusted test file
             tests += DynamicTest.dynamicTest(
                 "Adjusted Tests",
                 srcLocation,
-                this@AsciiDocTestSuite::printAdjustedTestFile
+                this@AsciiDocTestFactory::printAdjustedTestFile
             )
         }
 
diff --git a/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt
@@ -1,11 +1,7 @@
-package org.neo4j.graphql.utils
+package org.neo4j.graphql.factories
 
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.jayway.jsonpath.JsonPath
-import demo.org.neo4j.graphql.utils.InvalidQueryException
-import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock
-import demo.org.neo4j.graphql.utils.asciidoc.ast.Section
-import demo.org.neo4j.graphql.utils.asciidoc.ast.Table
 import graphql.ExceptionWhileDataFetching
 import graphql.ExecutionInput
 import graphql.GraphQL
@@ -29,10 +25,14 @@ import org.neo4j.driver.Driver
 import org.neo4j.graphql.QueryContext
 import org.neo4j.graphql.SchemaBuilder
 import org.neo4j.graphql.SchemaConfig
+import org.neo4j.graphql.asciidoc.ast.CodeBlock
+import org.neo4j.graphql.asciidoc.ast.Section
+import org.neo4j.graphql.asciidoc.ast.Table
 import org.neo4j.graphql.custom_resolver.TestDataFetcher
 import org.neo4j.graphql.driver.adapter.Neo4jAdapter
 import org.neo4j.graphql.driver.adapter.Neo4jDriverAdapter
 import org.neo4j.graphql.scalars.TemporalScalar
+import org.neo4j.graphql.utils.InvalidQueryException
 import org.opentest4j.AssertionFailedError
 import org.threeten.extra.PeriodDuration
 import java.io.File
@@ -47,8 +47,8 @@ import java.util.concurrent.FutureTask
 import java.util.function.Consumer
 import kotlin.reflect.full.findAnnotation
 
-class CypherTestSuite(fileName: String, val driver: Driver? = null, createMissingBlocks: Boolean = true) :
-    AsciiDocTestSuite<CypherTestSuite.TestCase>(
+class CypherTestFactory(fileName: String, val driver: Driver? = null, createMissingBlocks: Boolean = true) :
+    AsciiDocTestFactory<CypherTestFactory.TestCase>(
         fileName,
         listOf(
             matcher("cypher", exactly = true) { t, c -> t.cypher.add(c) },
diff --git a/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt
@@ -1,7 +1,5 @@
-package org.neo4j.graphql.utils
+package org.neo4j.graphql.factories
 
-import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock
-import demo.org.neo4j.graphql.utils.asciidoc.ast.Section
 import graphql.language.InterfaceTypeDefinition
 import graphql.language.UnionTypeDefinition
 import graphql.schema.GraphQLScalarType
@@ -19,10 +17,12 @@ import org.junit.jupiter.api.DynamicTest
 import org.neo4j.graphql.NoOpCoercing
 import org.neo4j.graphql.SchemaBuilder
 import org.neo4j.graphql.SchemaConfig
+import org.neo4j.graphql.asciidoc.ast.CodeBlock
+import org.neo4j.graphql.asciidoc.ast.Section
 import org.opentest4j.AssertionFailedError
 import java.util.*
 
-class GraphQLSchemaTestSuite(fileName: String) : AsciiDocTestSuite<GraphQLSchemaTestSuite.TestCase>(
+class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory<GraphQLSchemaTestFactory.TestCase>(
     fileName,
     listOf(
         matcher("graphql", exactly = true, setter = TestCase::augmentedSchema),
@@ -77,7 +77,8 @@ class GraphQLSchemaTestSuite(fileName: String) : AsciiDocTestSuite<GraphQLSchema
                     }
                     val actualSchema = SCHEMA_PRINTER.print(augmentedSchema)
                     targetSchemaBlock.generatedContent = actualSchema
-                    throw AssertionFailedError("augmented schema differs for '$title'",
+                    throw AssertionFailedError(
+                        "augmented schema differs for '$title'",
                         expectedSchema?.let { SCHEMA_PRINTER.print(it) } ?: targetSchema,
                         actualSchema,
                         e)
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils
+package org.neo4j.graphql.utils
 
 import graphql.GraphQLError
 
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt
@@ -1,4 +1,4 @@
-package demo.org.neo4j.graphql.utils
+package org.neo4j.graphql.utils
 
 import org.junit.jupiter.api.DynamicContainer
 import org.junit.jupiter.api.DynamicNode
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/ThematicBreak.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/ThematicBreak.kt
diff --git a/readme.adoc b/readme.adoc
@@ -92,7 +92,7 @@ You find more usage examples in the:
 
 == Demo
 
-You can use the link:core/src/test/kotlin/GraphQLServer.kt[GraphQL Demo Server] to play around with the library.
+You can use the link:core/src/test/kotlin/demo/GraphQLServer.kt[GraphQL Demo Server] to play around with the library.
 It is running against a Neo4j instance at `bolt://localhost` (username: `neo4j`, password: `test`) containing the `:play movies` graph.
 
 Use http://localhost:4567/graphql as your GraphQL URL.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package demo.org.neo4j.graphql.utils.asciidoc.ast`
	`1`	`+package org.neo4j.graphql.asciidoc.ast`
`2`	`2`
`3`	`3`	`class Block(`
`4`	`4`	`parent: StructuralNode,`