Fixing some more titan-test compile errors

thinkaurelius · Apr 10, 2015 · d22fbd4 · d22fbd4
1 parent 261d00b
commit d22fbd4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphIterativeBenchmark.java b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphIterativeBenchmark.java
@@ -16,6 +16,7 @@
 import com.thinkaurelius.titan.diskstorage.util.StandardBaseTransactionConfig;
 import com.thinkaurelius.titan.diskstorage.util.time.Timestamps;
 import com.thinkaurelius.titan.graphdb.types.StandardEdgeLabelMaker;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 
 import java.util.Random;
 import java.util.concurrent.*;

diff --git a/...n-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphPerformanceMemoryTest.java b/...n-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanGraphPerformanceMemoryTest.java
@@ -7,9 +7,11 @@
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -121,7 +123,7 @@ public void run() {
                         TitanVertex v = getVertex(tx,"uid", random.nextInt(maxUID) + 1);
                         assertCount(2, v.properties());
                         int count = 0;
-                        for (Edge e : v.bothE().toList()) {
+                        for (TitanEdge e : v.query().direction(Direction.BOTH).edges()) {
                             count++;
                             assertTrue(e.<Integer>value("time") >= 0);
                         }

diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanOperationCountingTest.java b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanOperationCountingTest.java
@@ -33,6 +33,7 @@
 import com.thinkaurelius.titan.graphdb.types.IndexType;
 import com.thinkaurelius.titan.testcategory.SerialTests;
 import com.thinkaurelius.titan.util.stats.MetricManager;
+import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
@@ -185,7 +186,7 @@ public void testReadOperations(boolean cache) {
             tx = graph.buildTransaction().groupName(metricsPrefix).start();
             v = getOnlyElement(tx.query().has("uid",1).vertices());
             assertEquals(1,v.<Integer>value("uid").intValue());
-            u = getOnlyElement(v.both("knows"));
+            u = getOnlyElement(v.query().direction(Direction.BOTH).labels("knows").vertices());
             e = getOnlyElement(u.query().direction(Direction.IN).labels("knows").edges());
             assertEquals("juju",u.value("name"));
             assertEquals("edge",e.value("name"));
@@ -382,7 +383,7 @@ public void checkFastPropertyAndLocking(boolean fastProperty) {
         //Check no further locks on read all
         tx = graph.buildTransaction().groupName(metricsPrefix).start();
         v = getV(tx,v);
-        for (VertexProperty p : v.properties().toList()) {
+        for (TitanVertexProperty p : v.query().properties()) {
             assertNotNull(p.value());
             assertNotNull(p.key());
         }