Skip to content

Commit e28121b

Browse files
committed
adapt tests
1 parent 7398414 commit e28121b

15 files changed

+27
-3
lines changed

integration-tests/schemas/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ generateDomainClasses := Def.taskDyn {
1919
}
2020
} else {
2121
Def.task {
22-
val invoked = (Compile/runMain).toTask(s" CodegenForAllSchemas").value
22+
val invoked = (Compile/runMain).toTask(s" overflowdb.integrationtests.CodegenForAllSchemas").value
2323
lastSchemaMd5(currentSchemaMd5)
2424
FileUtils.listFilesRecursively(outputRoot)
2525
}

integration-tests/schemas/src/main/scala/CodegenForAllSchemas.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/CodegenForAllSchemas.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.codegen.CodeGen
24

35
import java.io.File

integration-tests/schemas/src/main/scala/TestSchema.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.schema.SchemaBuilder
24

35
trait TestSchema {

integration-tests/schemas/src/main/scala/TestSchema01.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema01.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.schema.Property.ValueType
24
import overflowdb.schema._
35

integration-tests/schemas/src/main/scala/TestSchema02.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema02.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.schema.Property.ValueType
24
import overflowdb.schema._
35

integration-tests/schemas/src/main/scala/TestSchema03.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema03.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
/** complex scenario with multiple layers of base nodes
24
* similar to what we use in docker-ext schema extension
35
*/

integration-tests/schemas/src/main/scala/TestSchema04.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema04.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.schema.Property._
24

35
/** For testing default values on properties with Cardinality.One: we have type-dependent defaults,

integration-tests/schemas/src/main/scala/TestSchema05.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema05.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.schema.Property._
24

35
/** testing all property types with Cardinality.ZeroOrOne */

integration-tests/schemas/src/main/scala/TestSchema06.scala renamed to integration-tests/schemas/src/main/scala/overflowdb/integrationtests/TestSchema06.scala

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package overflowdb.integrationtests
2+
13
import overflowdb.schema.Property.ValueType
24
import overflowdb.schema._
35

integration-tests/tests/src/test/scala/Schema01Test.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import org.scalatest.matchers.should.Matchers
22
import org.scalatest.wordspec.AnyWordSpec
33
import overflowdb.{BatchedUpdate, Config, Graph}
4+
import overflowdb.integrationtests.testschema01
45
import testschema01._
56
import testschema01.nodes._
67
import testschema01.edges._
78
import testschema01.traversal._
89
import scala.jdk.CollectionConverters.IteratorHasAsScala
910

1011
class Schema01Test extends AnyWordSpec with Matchers {
11-
import testschema01.traversal._
12+
import overflowdb.integrationtests.testschema01.traversal._
1213
"constants" in {
1314
PropertyNames.NAME shouldBe "NAME"
1415
Properties.Order.name shouldBe "ORDER"
@@ -109,7 +110,7 @@ class Schema01Test extends AnyWordSpec with Matchers {
109110
}
110111
}
111112
"work around scala bug 4762, ie generate no extraneous fields" in {
112-
Class.forName("testschema01.nodes.Node1").getDeclaredFields.length shouldBe 0
113+
Class.forName("overflowdb.integrationtests.testschema01.nodes.Node1").getDeclaredFields.length shouldBe 0
113114
}
114115

115116
}

integration-tests/tests/src/test/scala/Schema02Test.scala

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.scalatest.matchers.should.Matchers
22
import org.scalatest.wordspec.AnyWordSpec
33
import overflowdb.SchemaViolationException
4+
import overflowdb.integrationtests.testschema02
45
import testschema02._
56
import testschema02.edges._
67
import testschema02.nodes._

integration-tests/tests/src/test/scala/Schema03Test.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import overflowdb.traversal._
2+
import overflowdb.integrationtests.testschema03a
3+
import overflowdb.integrationtests.testschema03b
4+
import overflowdb.integrationtests.testschema03c
25

36
class Schema03aTest {
47
import testschema03a._

integration-tests/tests/src/test/scala/Schema04Test.scala

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.scalatest.matchers.should.Matchers
22
import org.scalatest.wordspec.AnyWordSpec
33
import overflowdb.Graph
4+
import overflowdb.integrationtests.testschema04
45
import testschema04._
56
import testschema04.edges._
67
import testschema04.nodes._

integration-tests/tests/src/test/scala/Schema05Test.scala

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.scalatest.matchers.should.Matchers
22
import org.scalatest.wordspec.AnyWordSpec
33
import overflowdb.{Config, Graph}
4+
import overflowdb.integrationtests.testschema05
45
import testschema05._
56
import testschema05.edges._
67
import testschema05.nodes._

integration-tests/tests/src/test/scala/Schema06Test.scala

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.scalatest.matchers.should.Matchers
22
import org.scalatest.wordspec.AnyWordSpec
33
import overflowdb.{BatchedUpdate, Config, Graph}
4+
import overflowdb.integrationtests.testschema06
45
import testschema06._
56
import testschema06.nodes._
67
import testschema06.edges._

0 commit comments

Comments
 (0)