From 6bc2305062e147d61ad62cf4f87e7673cbace8c8 Mon Sep 17 00:00:00 2001 From: Andreas Berger Date: Thu, 19 Dec 2024 13:44:09 +0100 Subject: [PATCH] Restructure test files - fixes `demo` package - rename *TestSuite to *Factory (since it generate tests) --- core/src/test/kotlin/SchemaTest.kt | 33 ------------------- .../{ => demo}/DataFetcherInterceptorDemo.kt | 0 .../test/kotlin/{ => demo}/GraphQLServer.kt | 0 .../org/neo4j/graphql/AugmentationTests.kt | 10 +++--- .../kotlin/org/neo4j/graphql/CypherTests.kt | 32 +++++++++--------- .../neo4j/graphql/TranslatorExceptionTests.kt | 8 ++--- .../{utils => }/asciidoc/AsciiDocParser.kt | 4 +-- .../graphql/{utils => }/asciidoc/ast/Block.kt | 2 +- .../{utils => }/asciidoc/ast/CodeBlock.kt | 2 +- .../{utils => }/asciidoc/ast/Document.kt | 2 +- .../{utils => }/asciidoc/ast/Section.kt | 2 +- .../asciidoc/ast/StructuralNode.kt | 2 +- .../graphql/asciidoc/ast/ThematicBreak.kt | 3 ++ .../AsciiDocTestFactory.kt} | 14 ++++---- .../CypherTestFactory.kt} | 8 ++--- .../GraphQLSchemaTestFactory.kt} | 8 ++--- .../org/neo4j/graphql/utils/TestUtils.kt | 2 +- .../utils/asciidoc/ast/ThematicBreak.kt | 3 -- readme.adoc | 2 +- 19 files changed, 52 insertions(+), 85 deletions(-) delete mode 100644 core/src/test/kotlin/SchemaTest.kt rename core/src/test/kotlin/{ => demo}/DataFetcherInterceptorDemo.kt (100%) rename core/src/test/kotlin/{ => demo}/GraphQLServer.kt (100%) rename core/src/test/kotlin/org/neo4j/graphql/{utils => }/asciidoc/AsciiDocParser.kt (97%) rename core/src/test/kotlin/org/neo4j/graphql/{utils => }/asciidoc/ast/Block.kt (78%) rename core/src/test/kotlin/org/neo4j/graphql/{utils => }/asciidoc/ast/CodeBlock.kt (95%) rename core/src/test/kotlin/org/neo4j/graphql/{utils => }/asciidoc/ast/Document.kt (74%) rename core/src/test/kotlin/org/neo4j/graphql/{utils => }/asciidoc/ast/Section.kt (82%) rename core/src/test/kotlin/org/neo4j/graphql/{utils => }/asciidoc/ast/StructuralNode.kt (70%) create mode 100644 core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt rename core/src/test/kotlin/org/neo4j/graphql/{utils/AsciiDocTestSuite.kt => factories/AsciiDocTestFactory.kt} (96%) rename core/src/test/kotlin/org/neo4j/graphql/{utils/CypherTestSuite.kt => factories/CypherTestFactory.kt} (98%) rename core/src/test/kotlin/org/neo4j/graphql/{utils/GraphQLSchemaTestSuite.kt => factories/GraphQLSchemaTestFactory.kt} (95%) delete mode 100644 core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/ThematicBreak.kt diff --git a/core/src/test/kotlin/SchemaTest.kt b/core/src/test/kotlin/SchemaTest.kt deleted file mode 100644 index f2b95443..00000000 --- a/core/src/test/kotlin/SchemaTest.kt +++ /dev/null @@ -1,33 +0,0 @@ -package demo - -import graphql.GraphQL -import graphql.schema.idl.RuntimeWiring.newRuntimeWiring -import graphql.schema.idl.SchemaGenerator -import graphql.schema.idl.SchemaParser -import kotlin.test.assertEquals - -fun main() { - val schema = """type Query { - hello(what:String = "World"): String - }""" - - val schemaParser = SchemaParser() - val typeDefinitionRegistry = schemaParser.parse(schema) - - val runtimeWiring = newRuntimeWiring() - .type("Query") - { it.dataFetcher("hello") { env -> "Hello ${env.getArgument("what")}!" } } - .build() - - val schemaGenerator = SchemaGenerator() - val graphQLSchema = schemaGenerator.makeExecutableSchema(typeDefinitionRegistry, runtimeWiring) - - val build = GraphQL.newGraphQL(graphQLSchema).build() - val executionResult = build.execute("""{ hello (what:"Kotlin") } """) - - val data = executionResult.getData() - println(data) - assertEquals(mapOf("hello" to "Hello Kotlin!"), data) - // Prints: {hello=Hello Kotlin!} -} - diff --git a/core/src/test/kotlin/DataFetcherInterceptorDemo.kt b/core/src/test/kotlin/demo/DataFetcherInterceptorDemo.kt similarity index 100% rename from core/src/test/kotlin/DataFetcherInterceptorDemo.kt rename to core/src/test/kotlin/demo/DataFetcherInterceptorDemo.kt diff --git a/core/src/test/kotlin/GraphQLServer.kt b/core/src/test/kotlin/demo/GraphQLServer.kt similarity index 100% rename from core/src/test/kotlin/GraphQLServer.kt rename to core/src/test/kotlin/demo/GraphQLServer.kt diff --git a/core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt b/core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt index b966c750..583699ea 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt +++ b/core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt @@ -1,18 +1,18 @@ package org.neo4j.graphql -import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath 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 { @TestFactory - fun `augmentation-tests`() = GraphQLSchemaTestSuite("augmentation-tests.adoc").generateTests() + fun `augmentation-tests`() = GraphQLSchemaTestFactory("augmentation-tests.adoc").generateTests() @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`() = - createTestsInPath("tck-test-files/schema", { GraphQLSchemaTestSuite(it).generateTests() }) + createTestsInPath("tck-test-files/schema", { 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 index 319d2c0a..f1e51ddd 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt +++ b/core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt @@ -2,12 +2,12 @@ package org.neo4j.graphql import apoc.coll.Coll import apoc.cypher.CypherFunctions -import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.TestFactory import org.junit.jupiter.api.TestInstance -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 @@ -36,48 +36,48 @@ class CypherTests { } @TestFactory - fun `cypher-directive-tests`() = CypherTestSuite("cypher-directive-tests.adoc", neo4j).generateTests() + fun `cypher-directive-tests`() = CypherTestFactory("cypher-directive-tests.adoc", neo4j).generateTests() @TestFactory - fun `dynamic-property-tests`() = CypherTestSuite("dynamic-property-tests.adoc", neo4j).generateTests() + fun `dynamic-property-tests`() = CypherTestFactory("dynamic-property-tests.adoc", neo4j).generateTests() @TestFactory - fun `filter-tests`() = CypherTestSuite("filter-tests.adoc", neo4j).generateTests() + fun `filter-tests`() = CypherTestFactory("filter-tests.adoc", neo4j).generateTests() @TestFactory - fun `relationship-tests`() = CypherTestSuite("relationship-tests.adoc", neo4j).generateTests() + fun `relationship-tests`() = CypherTestFactory("relationship-tests.adoc", neo4j).generateTests() @TestFactory - fun `movie-tests`() = CypherTestSuite("movie-tests.adoc", neo4j).generateTests() + fun `movie-tests`() = CypherTestFactory("movie-tests.adoc", neo4j).generateTests() @TestFactory - fun `property-tests`() = CypherTestSuite("property-tests.adoc", neo4j).generateTests() + fun `property-tests`() = CypherTestFactory("property-tests.adoc", neo4j).generateTests() @TestFactory - fun `translator-tests1`() = CypherTestSuite("translator-tests1.adoc", neo4j).generateTests() + fun `translator-tests1`() = CypherTestFactory("translator-tests1.adoc", neo4j).generateTests() @TestFactory - fun `translator-tests2`() = CypherTestSuite("translator-tests2.adoc", neo4j).generateTests() + fun `translator-tests2`() = CypherTestFactory("translator-tests2.adoc", neo4j).generateTests() @TestFactory - fun `translator-tests3`() = CypherTestSuite("translator-tests3.adoc", neo4j).generateTests() + fun `translator-tests3`() = CypherTestFactory("translator-tests3.adoc", neo4j).generateTests() @TestFactory fun `translator-tests-custom-scalars`() = - CypherTestSuite("translator-tests-custom-scalars.adoc", neo4j).generateTests() + CypherTestFactory("translator-tests-custom-scalars.adoc", neo4j).generateTests() @TestFactory - fun `optimized-query-for-filter`() = CypherTestSuite("optimized-query-for-filter.adoc", neo4j).generateTests() + fun `optimized-query-for-filter`() = CypherTestFactory("optimized-query-for-filter.adoc", neo4j).generateTests() @TestFactory - fun `custom-fields`() = CypherTestSuite("custom-fields.adoc", neo4j).generateTests() + fun `custom-fields`() = CypherTestFactory("custom-fields.adoc", neo4j).generateTests() @TestFactory - fun `test issues`() = createTestsInPath("issues", { CypherTestSuite(it, neo4j).generateTests() }) + fun `test issues`() = createTestsInPath("issues", { CypherTestFactory(it, neo4j).generateTests() }) @TestFactory fun `new cypher tck tests`() = - createTestsInPath("tck-test-files/cypher", { CypherTestSuite(it, neo4j).generateTests() }) + createTestsInPath("tck-test-files/cypher", { CypherTestFactory(it, neo4j).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/TranslatorExceptionTests.kt b/core/src/test/kotlin/org/neo4j/graphql/TranslatorExceptionTests.kt index 551b618a..335bdd8b 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/TranslatorExceptionTests.kt +++ b/core/src/test/kotlin/org/neo4j/graphql/TranslatorExceptionTests.kt @@ -1,15 +1,15 @@ package org.neo4j.graphql -import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock -import demo.org.neo4j.graphql.utils.asciidoc.ast.Section import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.DynamicNode import org.junit.jupiter.api.DynamicTest import org.junit.jupiter.api.TestFactory -import org.neo4j.graphql.utils.AsciiDocTestSuite +import org.neo4j.graphql.asciidoc.ast.CodeBlock +import org.neo4j.graphql.asciidoc.ast.Section +import org.neo4j.graphql.factories.AsciiDocTestFactory import java.util.stream.Stream -class TranslatorExceptionTests : AsciiDocTestSuite("translator-tests1.adoc", emptyList()) { +class TranslatorExceptionTests : AsciiDocTestFactory("translator-tests1.adoc", emptyList()) { override fun createTestCase(section: Section): CodeBlock? { return findSetupCodeBlocks(section, "graphql", mapOf("schema" to "true")).firstOrNull() ?: return null diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/AsciiDocParser.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt similarity index 97% rename from core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/AsciiDocParser.kt rename to core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt index 800362ec..2c2a2851 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/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 java.io.File import java.net.URI import java.util.regex.Pattern diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Block.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt similarity index 78% rename from core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Block.kt rename to core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt index ed7067d1..1139335b 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/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/utils/asciidoc/ast/CodeBlock.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt similarity index 95% rename from core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/CodeBlock.kt rename to core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt index d2253973..6fda3a02 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/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/utils/asciidoc/ast/Document.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt similarity index 74% rename from core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Document.kt rename to core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt index de9b67a2..5a5252a5 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/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/utils/asciidoc/ast/Section.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt similarity index 82% rename from core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Section.kt rename to core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt index 1e09e814..42ab2519 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/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/utils/asciidoc/ast/StructuralNode.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt similarity index 70% rename from core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/StructuralNode.kt rename to core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt index 61c89c28..26273b2d 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/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/ThematicBreak.kt b/core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt new file mode 100644 index 00000000..33572e33 --- /dev/null +++ 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/utils/AsciiDocTestSuite.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt similarity index 96% rename from core/src/test/kotlin/org/neo4j/graphql/utils/AsciiDocTestSuite.kt rename to core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt index 038bee9e..f4c9742a 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/AsciiDocTestSuite.kt +++ b/core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt @@ -1,13 +1,13 @@ -package org.neo4j.graphql.utils +package org.neo4j.graphql.factories import com.fasterxml.jackson.databind.ObjectMapper 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.util.* @@ -18,7 +18,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( +abstract class AsciiDocTestFactory( private val fileName: String, private val relevantBlocks: List>, ) { @@ -49,16 +49,16 @@ abstract class AsciiDocTestSuite( 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/utils/CypherTestSuite.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt similarity index 98% rename from core/src/test/kotlin/org/neo4j/graphql/utils/CypherTestSuite.kt rename to core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt index e79aa0cc..913b279c 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/CypherTestSuite.kt +++ b/core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.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.ExecutionInput import graphql.GraphQL import graphql.schema.DataFetcher @@ -19,6 +17,8 @@ import org.neo4j.cypherdsl.parser.Options import org.neo4j.driver.internal.InternalIsoDuration import org.neo4j.driver.types.IsoDuration import org.neo4j.graphql.* +import org.neo4j.graphql.asciidoc.ast.CodeBlock +import org.neo4j.graphql.asciidoc.ast.Section import org.neo4j.harness.Neo4j import org.opentest4j.AssertionFailedError import java.math.BigInteger @@ -34,7 +34,7 @@ import java.util.function.Consumer import java.util.regex.Matcher import java.util.regex.Pattern -class CypherTestSuite(fileName: String, val neo4j: Neo4j? = null) : AsciiDocTestSuite( +class CypherTestFactory(fileName: String, val neo4j: Neo4j? = null) : AsciiDocTestFactory( fileName, listOf( matcher("cypher", exactly = true) { t, c -> t.cypher.add(c) }, diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.kt b/core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt similarity index 95% rename from core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.kt rename to core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt index 13a6c780..ce786a94 100644 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.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( +class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory( fileName, listOf( matcher("graphql", exactly = true, setter = TestCase::augmentedSchema), diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt index 37abf222..c7f25dd2 100644 --- 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 deleted file mode 100644 index 7199db15..00000000 --- a/core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/ThematicBreak.kt +++ /dev/null @@ -1,3 +0,0 @@ -package demo.org.neo4j.graphql.utils.asciidoc.ast - -class ThematicBreak: StructuralNode(null) diff --git a/readme.adoc b/readme.adoc index 32ffb23f..c2bf9556 100644 --- a/readme.adoc +++ b/readme.adoc @@ -108,7 +108,7 @@ You find more usage examples in the: Here is a minimalistic example in Groovy using the Neo4j-Java driver and Spark-Java as webserver. It is running against a Neo4j instance at `bolt://localhost` (username: `neo4j`, password: `s3cr3t`) containing the `:play movies` graph. -(You can also use a link:core/src/test/kotlin/GraphQLServer.kt[Kotlin based server example].) +(You can also use a link:core/src/test/kotlin/demo/GraphQLServer.kt[Kotlin based server example].) In case you wand to bind the neo4j driver directly to the graphql schema you can link:core/src/test/kotlin/DataFetcherInterceptorDemo.kt[use the DataFetchingInterceptor to