refactor tests to not hard code the path tinkerpop-modern.kryo

pietermartin · Sep 21, 2016 · c99589d · c99589d
1 parent af54aae
commit c99589d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,5 @@ release.properties
 /.idea
 *.iml
 src/test/db/
-/sqlg-hsqldb/src/test/db/
+/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/db/
 /sqlg-benchmark-hsqldb/src/test/db/
diff --git a/sqlg-test/src/main/java/org/umlg/sqlg/test/gremlincompile/TestRepeatStepGraphOut.java b/sqlg-test/src/main/java/org/umlg/sqlg/test/gremlincompile/TestRepeatStepGraphOut.java
@@ -10,7 +10,6 @@
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
 import org.junit.Test;
 import org.umlg.sqlg.test.BaseTest;
 
@@ -735,8 +734,8 @@ public void testRepeatWithEmitLastWithTimesFirst() {
     @Test
     public void g_V_repeatXoutX_timesX2X() throws IOException {
         final List<Traversal<Vertex, Vertex>> traversals = new ArrayList<>();
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         assertModernGraph(graph, true, false);
 
         Traversal t = graph.traversal().V().repeat(out()).times(2);
@@ -756,8 +755,8 @@ public void g_V_repeatXoutX_timesX2X() throws IOException {
 
     @Test
     public void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() throws IOException {
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         assertModernGraph(graph, true, false);
         final Traversal<Vertex, Path> traversal = graph.traversal().V().repeat(out()).times(2).path().by().by("name").by("lang");
         printTraversalForm(traversal);
@@ -775,8 +774,8 @@ public void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() throws IOEx
 
     @Test
     public void g_V_repeatXoutX_timesX2X_emit_path() throws IOException {
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         assertModernGraph(graph, true, false);
         GraphTraversalSource g = graph.traversal();
         final List<Traversal<Vertex, Path>> traversals = new ArrayList<>();
@@ -900,8 +899,8 @@ public void testTimesAfterEmitBeforeToSelf() {
 
     @Test
     public void g_V_emit_timesX2X_repeatXoutX_path() throws IOException {
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         GraphTraversalSource g = graph.traversal();
         final List<Traversal<Vertex, Path>> traversals = Arrays.asList(
                 g.V().emit().times(2).repeat(out()).path(),

diff --git a/...ain/java/org/umlg/sqlg/test/vertexstep/localvertexstep/TestLocalVertexStepRepeatStep.java b/...ain/java/org/umlg/sqlg/test/vertexstep/localvertexstep/TestLocalVertexStepRepeatStep.java
@@ -8,7 +8,6 @@
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
 import org.junit.Test;
 import org.umlg.sqlg.test.BaseTest;
 
@@ -649,11 +648,11 @@ public void testRepeatWithEmitLastWithTimesFirst() {
     @Test
     public void g_V_repeatXoutX_timesX2X() throws IOException {
         final List<Traversal<Vertex, Vertex>> traversals = new ArrayList<>();
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         assertModernGraph(graph, true, false);
 
-        Traversal t = graph.traversal().V().local(repeat(__.out()).times(2));
+        Traversal<Vertex, Vertex> t = graph.traversal().V().local(repeat(__.out()).times(2));
         traversals.add(t);
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);
@@ -670,8 +669,8 @@ public void g_V_repeatXoutX_timesX2X() throws IOException {
 
     @Test
     public void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() throws IOException {
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         assertModernGraph(graph, true, false);
         final Traversal<Vertex, Path> traversal = graph.traversal().V().local(repeat(__.out()).times(2).path().by().by("name").by("lang"));
         printTraversalForm(traversal);
@@ -689,8 +688,8 @@ public void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() throws IOEx
 
     @Test
     public void g_V_repeatXoutX_timesX2X_emit_path() throws IOException {
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         assertModernGraph(graph, true, false);
         GraphTraversalSource g = graph.traversal();
         final List<Traversal<Vertex, Path>> traversals = new ArrayList<>();
@@ -814,8 +813,8 @@ public void testTimesAfterEmitBeforeToSelf() {
 
     @Test
     public void g_V_emit_timesX2X_repeatXoutX_path() throws IOException {
+        loadModern();
         Graph graph = this.sqlgGraph;
-        graph.io(GryoIo.build()).readGraph("../sqlg-test/src/main/resources/tinkerpop-modern.kryo");
         GraphTraversalSource g = graph.traversal();
         final List<Traversal<Vertex, Path>> traversals = Arrays.asList(
                 g.V().local(__.<Vertex>emit().times(2).repeat(out()).path()),