Skip to content

Commit acb8c0d

Browse files
Andy2003Andy2003
authored
Restructure test files (#327)
- fixes `demo` package - rename *TestSuite to *Factory (since it generate tests)
1 parent 0094d1d commit acb8c0d

19 files changed

+52
-85
lines changed

‎core/src/test/kotlin/SchemaTest.kt

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎core/src/test/kotlin/DataFetcherInterceptorDemo.kt renamed to ‎core/src/test/kotlin/demo/DataFetcherInterceptorDemo.kt

File renamed without changes.

‎core/src/test/kotlin/GraphQLServer.kt renamed to ‎core/src/test/kotlin/demo/GraphQLServer.kt

File renamed without changes.

‎core/src/test/kotlin/org/neo4j/graphql/AugmentationTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package org.neo4j.graphql
22

3-
import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath
43
import org.junit.jupiter.api.TestFactory
5-
import org.neo4j.graphql.utils.GraphQLSchemaTestSuite
4+
import org.neo4j.graphql.factories.GraphQLSchemaTestFactory
5+
import org.neo4j.graphql.utils.TestUtils.createTestsInPath
66

77
class AugmentationTests {
88

99
@TestFactory
10-
fun `augmentation-tests`() = GraphQLSchemaTestSuite("augmentation-tests.adoc").generateTests()
10+
fun `augmentation-tests`() = GraphQLSchemaTestFactory("augmentation-tests.adoc").generateTests()
1111

1212
@TestFactory
13-
fun `schema-operations-tests`() = GraphQLSchemaTestSuite("schema-operations-tests.adoc").generateTests()
13+
fun `schema-operations-tests`() = GraphQLSchemaTestFactory("schema-operations-tests.adoc").generateTests()
1414

1515
@TestFactory
1616
fun `schema augmentation tests`() =
17-
createTestsInPath("tck-test-files/schema", { GraphQLSchemaTestSuite(it).generateTests() })
17+
createTestsInPath("tck-test-files/schema", { GraphQLSchemaTestFactory(it).generateTests() })
1818
}

‎core/src/test/kotlin/org/neo4j/graphql/CypherTests.kt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package org.neo4j.graphql
22

33
import apoc.coll.Coll
44
import apoc.cypher.CypherFunctions
5-
import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath
65
import org.junit.jupiter.api.AfterAll
76
import org.junit.jupiter.api.BeforeAll
87
import org.junit.jupiter.api.TestFactory
98
import org.junit.jupiter.api.TestInstance
10-
import org.neo4j.graphql.utils.CypherTestSuite
9+
import org.neo4j.graphql.factories.CypherTestFactory
10+
import org.neo4j.graphql.utils.TestUtils.createTestsInPath
1111
import org.neo4j.harness.Neo4j
1212
import org.neo4j.harness.Neo4jBuilders
1313
import java.nio.file.Path
@@ -36,48 +36,48 @@ class CypherTests {
3636
}
3737

3838
@TestFactory
39-
fun `cypher-directive-tests`() = CypherTestSuite("cypher-directive-tests.adoc", neo4j).generateTests()
39+
fun `cypher-directive-tests`() = CypherTestFactory("cypher-directive-tests.adoc", neo4j).generateTests()
4040

4141
@TestFactory
42-
fun `dynamic-property-tests`() = CypherTestSuite("dynamic-property-tests.adoc", neo4j).generateTests()
42+
fun `dynamic-property-tests`() = CypherTestFactory("dynamic-property-tests.adoc", neo4j).generateTests()
4343

4444
@TestFactory
45-
fun `filter-tests`() = CypherTestSuite("filter-tests.adoc", neo4j).generateTests()
45+
fun `filter-tests`() = CypherTestFactory("filter-tests.adoc", neo4j).generateTests()
4646

4747
@TestFactory
48-
fun `relationship-tests`() = CypherTestSuite("relationship-tests.adoc", neo4j).generateTests()
48+
fun `relationship-tests`() = CypherTestFactory("relationship-tests.adoc", neo4j).generateTests()
4949

5050
@TestFactory
51-
fun `movie-tests`() = CypherTestSuite("movie-tests.adoc", neo4j).generateTests()
51+
fun `movie-tests`() = CypherTestFactory("movie-tests.adoc", neo4j).generateTests()
5252

5353
@TestFactory
54-
fun `property-tests`() = CypherTestSuite("property-tests.adoc", neo4j).generateTests()
54+
fun `property-tests`() = CypherTestFactory("property-tests.adoc", neo4j).generateTests()
5555

5656
@TestFactory
57-
fun `translator-tests1`() = CypherTestSuite("translator-tests1.adoc", neo4j).generateTests()
57+
fun `translator-tests1`() = CypherTestFactory("translator-tests1.adoc", neo4j).generateTests()
5858

5959
@TestFactory
60-
fun `translator-tests2`() = CypherTestSuite("translator-tests2.adoc", neo4j).generateTests()
60+
fun `translator-tests2`() = CypherTestFactory("translator-tests2.adoc", neo4j).generateTests()
6161

6262
@TestFactory
63-
fun `translator-tests3`() = CypherTestSuite("translator-tests3.adoc", neo4j).generateTests()
63+
fun `translator-tests3`() = CypherTestFactory("translator-tests3.adoc", neo4j).generateTests()
6464

6565
@TestFactory
6666
fun `translator-tests-custom-scalars`() =
67-
CypherTestSuite("translator-tests-custom-scalars.adoc", neo4j).generateTests()
67+
CypherTestFactory("translator-tests-custom-scalars.adoc", neo4j).generateTests()
6868

6969
@TestFactory
70-
fun `optimized-query-for-filter`() = CypherTestSuite("optimized-query-for-filter.adoc", neo4j).generateTests()
70+
fun `optimized-query-for-filter`() = CypherTestFactory("optimized-query-for-filter.adoc", neo4j).generateTests()
7171

7272
@TestFactory
73-
fun `custom-fields`() = CypherTestSuite("custom-fields.adoc", neo4j).generateTests()
73+
fun `custom-fields`() = CypherTestFactory("custom-fields.adoc", neo4j).generateTests()
7474

7575
@TestFactory
76-
fun `test issues`() = createTestsInPath("issues", { CypherTestSuite(it, neo4j).generateTests() })
76+
fun `test issues`() = createTestsInPath("issues", { CypherTestFactory(it, neo4j).generateTests() })
7777

7878
@TestFactory
7979
fun `new cypher tck tests`() =
80-
createTestsInPath("tck-test-files/cypher", { CypherTestSuite(it, neo4j).generateTests() })
80+
createTestsInPath("tck-test-files/cypher", { CypherTestFactory(it, neo4j).generateTests() })
8181

8282
companion object {
8383
private val INTEGRATION_TESTS = System.getProperty("neo4j-graphql-java.integration-tests", "false") == "true"

‎core/src/test/kotlin/org/neo4j/graphql/TranslatorExceptionTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.neo4j.graphql
22

3-
import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock
4-
import demo.org.neo4j.graphql.utils.asciidoc.ast.Section
53
import org.junit.jupiter.api.Assertions
64
import org.junit.jupiter.api.DynamicNode
75
import org.junit.jupiter.api.DynamicTest
86
import org.junit.jupiter.api.TestFactory
9-
import org.neo4j.graphql.utils.AsciiDocTestSuite
7+
import org.neo4j.graphql.asciidoc.ast.CodeBlock
8+
import org.neo4j.graphql.asciidoc.ast.Section
9+
import org.neo4j.graphql.factories.AsciiDocTestFactory
1010
import java.util.stream.Stream
1111

12-
class TranslatorExceptionTests : AsciiDocTestSuite<CodeBlock>("translator-tests1.adoc", emptyList()) {
12+
class TranslatorExceptionTests : AsciiDocTestFactory<CodeBlock>("translator-tests1.adoc", emptyList()) {
1313

1414
override fun createTestCase(section: Section): CodeBlock? {
1515
return findSetupCodeBlocks(section, "graphql", mapOf("schema" to "true")).firstOrNull() ?: return null

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/AsciiDocParser.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/AsciiDocParser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package demo.org.neo4j.graphql.utils.asciidoc
1+
package org.neo4j.graphql.asciidoc
22

3-
import demo.org.neo4j.graphql.utils.asciidoc.ast.*
3+
import org.neo4j.graphql.asciidoc.ast.*
44
import java.io.File
55
import java.net.URI
66
import java.util.regex.Pattern

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Block.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Block.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package demo.org.neo4j.graphql.utils.asciidoc.ast
1+
package org.neo4j.graphql.asciidoc.ast
22

33
class Block(
44
parent: StructuralNode,

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/CodeBlock.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/CodeBlock.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package demo.org.neo4j.graphql.utils.asciidoc.ast
1+
package org.neo4j.graphql.asciidoc.ast
22

33
import java.net.URI
44

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Document.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Document.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package demo.org.neo4j.graphql.utils.asciidoc.ast
1+
package org.neo4j.graphql.asciidoc.ast
22

33
import java.net.URI
44

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/Section.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Section.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package demo.org.neo4j.graphql.utils.asciidoc.ast
1+
package org.neo4j.graphql.asciidoc.ast
22

33
import java.net.URI
44

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/StructuralNode.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/StructuralNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package demo.org.neo4j.graphql.utils.asciidoc.ast
1+
package org.neo4j.graphql.asciidoc.ast
22

33
sealed class StructuralNode(
44
open val parent: StructuralNode?

‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/ThematicBreak.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.neo4j.graphql.asciidoc.ast
2+
3+
class ThematicBreak: StructuralNode(null)

‎core/src/test/kotlin/org/neo4j/graphql/utils/AsciiDocTestSuite.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/factories/AsciiDocTestFactory.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.neo4j.graphql.utils
1+
package org.neo4j.graphql.factories
22

33
import com.fasterxml.jackson.databind.ObjectMapper
44
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
55
import com.intellij.rt.execution.junit.FileComparisonFailure
6-
import demo.org.neo4j.graphql.utils.asciidoc.AsciiDocParser
7-
import demo.org.neo4j.graphql.utils.asciidoc.ast.*
86
import org.junit.jupiter.api.DynamicContainer
97
import org.junit.jupiter.api.DynamicNode
108
import org.junit.jupiter.api.DynamicTest
9+
import org.neo4j.graphql.asciidoc.AsciiDocParser
10+
import org.neo4j.graphql.asciidoc.ast.*
1111
import java.io.File
1212
import java.io.FileWriter
1313
import java.util.*
@@ -18,7 +18,7 @@ import kotlin.reflect.KMutableProperty1
1818
* @param fileName the name of the test file
1919
* @param relevantBlocks a list of pairs of filter functions and properties to set the found code blocks
2020
*/
21-
abstract class AsciiDocTestSuite<T>(
21+
abstract class AsciiDocTestFactory<T>(
2222
private val fileName: String,
2323
private val relevantBlocks: List<CodeBlockMatcher<T>>,
2424
) {
@@ -49,16 +49,16 @@ abstract class AsciiDocTestSuite<T>(
4949
tests += DynamicTest.dynamicTest(
5050
"Write updated Testfile",
5151
srcLocation,
52-
this@AsciiDocTestSuite::writeAdjustedTestFile
52+
this@AsciiDocTestFactory::writeAdjustedTestFile
5353
)
5454
} else if (REFORMAT_TEST_FILE) {
55-
tests += DynamicTest.dynamicTest("Reformat Testfile", srcLocation, this@AsciiDocTestSuite::reformatTestFile)
55+
tests += DynamicTest.dynamicTest("Reformat Testfile", srcLocation, this@AsciiDocTestFactory::reformatTestFile)
5656
} else if (GENERATE_TEST_FILE_DIFF) {
5757
// this test prints out the adjusted test file
5858
tests += DynamicTest.dynamicTest(
5959
"Adjusted Tests",
6060
srcLocation,
61-
this@AsciiDocTestSuite::printAdjustedTestFile
61+
this@AsciiDocTestFactory::printAdjustedTestFile
6262
)
6363
}
6464

‎core/src/test/kotlin/org/neo4j/graphql/utils/CypherTestSuite.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/factories/CypherTestFactory.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package org.neo4j.graphql.utils
1+
package org.neo4j.graphql.factories
22

3-
import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock
4-
import demo.org.neo4j.graphql.utils.asciidoc.ast.Section
53
import graphql.ExecutionInput
64
import graphql.GraphQL
75
import graphql.schema.DataFetcher
@@ -19,6 +17,8 @@ import org.neo4j.cypherdsl.parser.Options
1917
import org.neo4j.driver.internal.InternalIsoDuration
2018
import org.neo4j.driver.types.IsoDuration
2119
import org.neo4j.graphql.*
20+
import org.neo4j.graphql.asciidoc.ast.CodeBlock
21+
import org.neo4j.graphql.asciidoc.ast.Section
2222
import org.neo4j.harness.Neo4j
2323
import org.opentest4j.AssertionFailedError
2424
import java.math.BigInteger
@@ -34,7 +34,7 @@ import java.util.function.Consumer
3434
import java.util.regex.Matcher
3535
import java.util.regex.Pattern
3636

37-
class CypherTestSuite(fileName: String, val neo4j: Neo4j? = null) : AsciiDocTestSuite<CypherTestSuite.TestCase>(
37+
class CypherTestFactory(fileName: String, val neo4j: Neo4j? = null) : AsciiDocTestFactory<CypherTestFactory.TestCase>(
3838
fileName,
3939
listOf(
4040
matcher("cypher", exactly = true) { t, c -> t.cypher.add(c) },

‎core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/factories/GraphQLSchemaTestFactory.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package org.neo4j.graphql.utils
1+
package org.neo4j.graphql.factories
22

3-
import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock
4-
import demo.org.neo4j.graphql.utils.asciidoc.ast.Section
53
import graphql.language.InterfaceTypeDefinition
64
import graphql.language.UnionTypeDefinition
75
import graphql.schema.GraphQLScalarType
@@ -19,10 +17,12 @@ import org.junit.jupiter.api.DynamicTest
1917
import org.neo4j.graphql.NoOpCoercing
2018
import org.neo4j.graphql.SchemaBuilder
2119
import org.neo4j.graphql.SchemaConfig
20+
import org.neo4j.graphql.asciidoc.ast.CodeBlock
21+
import org.neo4j.graphql.asciidoc.ast.Section
2222
import org.opentest4j.AssertionFailedError
2323
import java.util.*
2424

25-
class GraphQLSchemaTestSuite(fileName: String) : AsciiDocTestSuite<GraphQLSchemaTestSuite.TestCase>(
25+
class GraphQLSchemaTestFactory(fileName: String) : AsciiDocTestFactory<GraphQLSchemaTestFactory.TestCase>(
2626
fileName,
2727
listOf(
2828
matcher("graphql", exactly = true, setter = TestCase::augmentedSchema),

‎core/src/test/kotlin/org/neo4j/graphql/utils/TestUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package demo.org.neo4j.graphql.utils
1+
package org.neo4j.graphql.utils
22

33
import org.junit.jupiter.api.DynamicContainer
44
import org.junit.jupiter.api.DynamicNode

‎core/src/test/kotlin/org/neo4j/graphql/utils/asciidoc/ast/ThematicBreak.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎readme.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ You find more usage examples in the:
108108
Here is a minimalistic example in Groovy using the Neo4j-Java driver and Spark-Java as webserver.
109109
It is running against a Neo4j instance at `bolt://localhost` (username: `neo4j`, password: `s3cr3t`) containing the `:play movies` graph.
110110

111-
(You can also use a link:core/src/test/kotlin/GraphQLServer.kt[Kotlin based server example].)
111+
(You can also use a link:core/src/test/kotlin/demo/GraphQLServer.kt[Kotlin based server example].)
112112

113113
In case you wand to bind the neo4j driver directly to the graphql schema you can
114114
link:core/src/test/kotlin/DataFetcherInterceptorDemo.kt[use the DataFetchingInterceptor to

0 commit comments

Comments
 (0)