8000 Merge remote-tracking branch 'origin/master' into master-v2 · neo4j-graphql/neo4j-graphql-java@cf743db · GitHub
[go: up one dir, main page]
Skip to content

Commit cf743db

Browse files
Andy2003Andy2003
committed
Merge remote-tracking branch 'origin/master' into master-v2
# 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
2 parents 8375e5f + acb8c0d commit cf743db

20 files changed

+60
-88
lines changed

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

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

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

File renamed without changes.

‎core/src/test/kotlin/Neo4jAdapterDemo.kt renamed to ‎core/src/test/kotlin/demo/Neo4jAdapterDemo.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,22 +1,22 @@
11
package org.neo4j.graphql
22

3-
import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath
43
import org.junit.jupiter.api.Disabled
54
import org.junit.jupiter.api.TestFactory
6-
import org.neo4j.graphql.utils.GraphQLSchemaTestSuite
5+
import org.neo4j.graphql.factories.GraphQLSchemaTestFactory
6+
import org.neo4j.graphql.utils.TestUtils.createTestsInPath
77

88
class AugmentationTests {
99

1010
@Disabled("This test is disabled because it is not yet migrated")
1111
@TestFactory
12-
fun `augmentation-tests`() = GraphQLSchemaTestSuite("augmentation-tests.adoc").generateTests()
12+
fun `augmentation-tests`() = GraphQLSchemaTestFactory("augmentation-tests.adoc").generateTests()
1313

1414
@Disabled("This test is disabled because it is not yet migrated")
1515
@TestFactory
16-
fun `schema-operations-tests`() = GraphQLSchemaTestSuite("schema-operations-tests.adoc").generateTests()
16+
fun `schema-operations-tests`( A3E2 ) = GraphQLSchemaTestFactory("schema-operations-tests.adoc").generateTests()
1717

1818

1919
@TestFactory
2020
fun `schema augmentation tests v2`() =
21-
createTestsInPath("tck-test-files/schema/v2", { GraphQLSchemaTestSuite(it).generateTests() })
21+
createTestsInPath("tck-test-files/schema/v2", { GraphQLSchemaTestFactory(it).generateTests() })
2222
}

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

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

33
import apoc.date.Date
4-
import demo.org.neo4j.graphql.utils.TestUtils.createTestsInPath
54
import org.junit.jupiter.api.*
65
import org.neo4j.driver.AuthTokens
76
import org.neo4j.driver.Driver
87
import org.neo4j.driver.GraphDatabase
9-
import org.neo4j.graphql.utils.CypherTestSuite
8+
import org.neo4j.graphql.factories.CypherTestFactory
9+
import org.neo4j.graphql.utils.TestUtils.createTestsInPath
1010
import org.neo4j.harness.Neo4j
1111
import org.neo4j.harness.Neo4jBuilders
1212
import java.nio.file.Path
@@ -37,66 +37,66 @@ class CypherTests {
3737

3838
@Disabled("This test is disabled because it is not yet migrated")
3939
@TestFactory
40-
fun `cypher-directive-tests`() = CypherTestSuite("cypher-directive-tests.adoc", driver).generateTests()
40+
fun `cypher-directive-tests`() = CypherTestFactory("cypher-directive-tests.adoc", driver).generateTests()
4141

4242
@Disabled("This test is disabled because it is not yet migrated")
4343
@TestFactory
44-
fun `dynamic-property-tests`() = CypherTestSuite("dynamic-property-tests.adoc", driver).generateTests()
44+
fun `dynamic-property-tests`() = CypherTestFactory("dynamic-property-tests.adoc", driver).generateTests()
4545

4646
@Disabled("This test is disabled because it is not yet migrated")
4747
@TestFactory
48-
fun `filter-tests`() = CypherTestSuite("filter-tests.adoc", driver).generateTests()
48+
fun `filter-tests`() = CypherTestFactory("filter-tests.adoc", driver).generateTests()
4949

5050
@Disabled("This test is disabled because it is not yet migrated")
5151
@TestFactory
52-
fun `relationship-tests`() = CypherTestSuite("relationship-tests.adoc", driver).generateTests()
52+
fun `relationship-tests`() = CypherTestFactory("relationship-tests.adoc", driver).generateTests()
5353

5454
@Disabled("This test is disabled because it is not yet migrated")
5555
@TestFactory
56-
fun `movie-tests`() = CypherTestSuite("movie-tests.adoc", driver).generateTests()
56+
fun `movie-tests`() = CypherTestFactory("movie-tests.adoc", driver).generateTests()
5757

5858
@Disabled("This test is disabled because it is not yet migrated")
5959
@TestFactory
60-
fun `property-tests`() = CypherTestSuite("property-tests.adoc", driver).generateTests()
60+
fun `property-tests`() = CypherTestFactory("property-tests.adoc", driver).generateTests()
6161

6262
@Disabled("This test is disabled because it is not yet migrated")
6363
@TestFactory
64-
fun `translator-tests1`() = CypherTestSuite("translator-tests1.adoc", driver).generateTests()
64+
fun `translator-tests1`() = CypherTestFactory("translator-tests1.adoc", driver).generateTests()
6565

6666
@Disabled("This test is disabled because it is not yet migrated")
6767
@TestFactory
68-
fun `translator-tests2`() = CypherTestSuite("translator-tests2.adoc", driver).generateTests()
68+
fun `translator-tests2`() = CypherTestFactory("translator-tests2.adoc", driver).generateTests()
6969

7070
@Disabled("This test is disabled because it is not yet migrated")
7171
@TestFactory
72-
fun `translator-tests3`() = CypherTestSuite("translator-tests3.adoc", driver).generateTests()
72+
fun `translator-tests3`() = CypherTestFactory("translator-tests3.adoc", driver).generateTests()
10000 7373

7474
@Disabled("This test is disabled because it is not yet migrated")
7575
@TestFactory
7676
fun `translator-tests-custom-scalars`() =
77-
CypherTestSuite("translator-tests-custom-scalars.adoc", driver).generateTests()
77+
CypherTestFactory("translator-tests-custom-scalars.adoc", driver).generateTests()
7878

7979
@Disabled("This test is disabled because it is not yet migrated")
8080
@TestFactory
81-
fun `optimized-query-for-filter`() = CypherTestSuite("optimized-query-for-filter.adoc", driver).generateTests()
81+
fun `optimized-query-for-filter`() = CypherTestFactory("optimized-query-for-filter.adoc", driver).generateTests()
8282

8383
@Disabled("This test is disabled because it is not yet migrated")
8484
@TestFactory
85-
fun `custom-fields`() = CypherTestSuite("custom-fields.adoc", driver).generateTests()
85+
fun `custom-fields`() = CypherTestFactory("custom-fields.adoc", driver).generateTests()
8686

8787
@Disabled("This test is disabled because it is not yet migrated")
8888
@TestFactory
89-
fun `test issues`() = createTestsInPath("issues", { CypherTestSuite(it, driver).generateTests() })
89+
fun `test issues`() = createTestsInPath("issues", { CypherTestFactory(it, driver).generateTests() })
9090

9191
@TestFactory
9292
fun `new cypher tck tests v2`() =
93-
createTestsInPath("tck-test-files/cypher/v2", { CypherTestSuite(it, driver).generateTests() })
93+
createTestsInPath("tck-test-files/cypher/v2", { CypherTestFactory(it, driver).generateTests() })
9494

9595
@TestFactory
9696
fun `integration-tests`() =
9797
createTestsInPath(
9898
"integration-test-files",
99-
{ CypherTestSuite(it, driver, createMissingBlocks = false).generateTests() })
99+
{ CypherTestFactory(it, driver, createMissingBlocks = false).generateTests() })
100100

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

‎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 org.apache.commons.csv.CSVFormat
55
import java.io.File
66
import java.net.URI

‎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/utils/asciidoc/ast/Table.kt renamed to ‎core/src/test/kotlin/org/neo4j/graphql/asciidoc/ast/Table.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 org.apache.commons.csv.CSVRecord
44
import java.net.URI

‎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: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.neo4j.graphql.utils
1+
package org.neo4j.graphql.factories
22

33
import com.fasterxml.jackson.core.JsonGenerator
44
import com.fasterxml.jackson.databind.JsonSerializer
@@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.module.SimpleModule
88
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
99
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
1010
import com.intellij.rt.execution.junit.FileComparisonFailure
11-
import demo.org.neo4j.graphql.utils.asciidoc.AsciiDocParser
12-
import demo.org.neo4j.graphql.utils.asciidoc.ast.*
1311
import org.junit.jupiter.api.DynamicContainer
1412
import org.junit.jupiter.api.DynamicNode
1513
import org.junit.jupiter.api.DynamicTest
14+
import org.neo4j.graphql.asciidoc.AsciiDocParser
15+
import org.neo4j.graphql.asciidoc.ast.*
1616
import java.io.File
1717
import java.io.FileWriter
1818
import java.time.temporal.TemporalAmount
@@ -24,7 +24,7 @@ import kotlin.reflect.KMutableProperty1
2424
* @param fileName the name of the test file
2525
* @param relevantBlocks a list of pairs of filter functions and properties to set the found code blocks
2626
*/
27-
abstract class AsciiDocTestSuite<T>(
27+
abstract class AsciiDocTestFactory<T>(
2828
protected val fileName: String,
2929
private val relevantBlocks: List<CodeBlockMatcher<T>>,
3030
private val createMissingBlocks: Boolean = true
@@ -56,16 +56,20 @@ abstract class AsciiDocTestSuite<T>(
5656
tests += DynamicTest.dynamicTest(
5757
"Write updated Testfile",
5858
srcLocation,
59-
this@AsciiDocTestSuite::writeAdjustedTestFile
59+
this@AsciiDocTestFactory::writeAdjustedTestFile
6060
)
6161
} else if (REFORMAT_TEST_FILE) {
62-
tests += DynamicTest.dynamicTest("Reformat Testfile", srcLocation, this@AsciiDocTestSuite::reformatTestFile)
62+
tests += DynamicTest.dynamicTest(
63+
"Reformat Testfile",
64+
srcLocation,
65+
this@AsciiDocTestFactory::reformatTestFile
66+
)
6367
} else if (GENERATE_TEST_FILE_DIFF) {
6468
// this test prints out the adjusted test file
6569
tests += DynamicTest.dynamicTest(
6670
"Adjusted Tests",
6771
srcLocation,
68-
this@AsciiDocTestSuite::printAdjustedTestFile
72+
this@AsciiDocTestFactory::printAdjustedTestFile
6973
)
7074
}
7175

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

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

33
import com.fasterxml.jackson.module.kotlin.readValue
44
import com.jayway.jsonpath.JsonPath
5-
import demo.org.neo4j.graphql.utils.InvalidQueryException
6-
import demo.org.neo4j.graphql.utils.asciidoc.ast.CodeBlock
7-
import demo.org.neo4j.graphql.utils.asciidoc.ast.Section
8-
import demo.org.neo4j.graphql.utils.asciidoc.ast.Table
95
import graphql.ExceptionWhileDataFetching
106
import graphql.ExecutionInput
117
import graphql.GraphQL
@@ -29,10 +25,14 @@ import org.neo4j.driver.Driver
2925
import org.neo4j.graphql.QueryContext
3026
import org.neo4j.graphql.SchemaBuilder
3127
import org.neo4j.graphql.SchemaConfig
28+
import org.neo4j.graphql.asciidoc.ast.CodeBlock
29+
import org.neo4j.graphql.asciidoc.ast.Section
30+
import org.neo4j.graphql.asciidoc.ast.Table
3231
import org.neo4j.graphql.custom_resolver.TestDataFetcher
3332
import org.neo4j.graphql.driver.adapter.Neo4jAdapter
3433
import org.neo4j.graphql.driver.adapter.Neo4jDriverAdapter
3534
import org.neo4j.graphql.scalars.TemporalScalar
35+
import org.neo4j.graphql.utils.InvalidQueryException
3636
import org.opentest4j.AssertionFailedError
3737
import org.threeten.extra.PeriodDuration
3838
import java.io.File
@@ -47,8 +47,8 @@ import java.util.concurrent.FutureTask
4747
import java.util.function.Consumer
4848
import kotlin.reflect.full.findAnnotation
4949

50-
class CypherTestSuite(fileName: String, val driver: Driver? = null, createMissingBlocks: Boolean = true) :
51-
AsciiDocTestSuite<CypherTestSuite.TestCase>(
50+
class CypherTestFactory(fileName: String, val driver: Driver? = null, createMissingBlocks: Boolean = true) :
51+
AsciiDocTestFactory<CypherTestFactory.TestCase>(
5252
fileName,
5353
listOf(
5454
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: 6 additions & 5 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),
@@ -77,7 +77,8 @@ class GraphQLSchemaTestSuite(fileName: String) : AsciiDocTestSuite<GraphQLSchema
7777
}
7878
val actualSchema = SCHEMA_PRINTER.print(augmentedSchema)
7979
targetSchemaBlock.generatedContent = actualSchema
80-
throw AssertionFailedError("augmented schema differs for '$title'",
80+
throw AssertionFailedError(
81+
"augmented schema differs for '$title'",
8182
expectedSchema?.let { SCHEMA_PRINTER.print(it) } ?: targetSchema,
8283
actualSchema,
8384
e)

‎core/src/test/kotlin/org/neo4j/graphql/utils/InvalidQueryException.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 graphql.GraphQLError
44

‎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
@@ -92,7 +92,7 @@ You find more usage examples in the:
9292

9393
== Demo
9494

95-
You can use the link:core/src/test/kotlin/GraphQLServer.kt[GraphQL Demo Server] to play around with the library.
95+
You can use the link:core/src/test/kotlin/demo/GraphQLServer.kt[GraphQL Demo Server] to play around with the library.
9696
It is running against a Neo4j instance at `bolt://localhost` (username: `neo4j`, password: `test`) containing the `:play movies` graph.
9797

9898
Use http://localhost:4567/graphql as your GraphQL URL.

0 commit comments

Comments
 (0)
0