You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/05 20:46:54 UTC
[24/26] incubator-tinkerpop git commit: GraphsTest unignored as it
now works on my local machine.
GraphsTest unignored as it now works on my local machine.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a7966d18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a7966d18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a7966d18
Branch: refs/heads/preprocessor
Commit: a7966d180487bdf2694e72d7a84672f3150d19ba
Parents: 3858e37
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jun 5 12:22:38 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jun 5 12:22:38 2015 -0600
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/server/GraphsTest.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a7966d18/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
index 6400d2a..c4bafaa 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.server;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.Ignore;
import org.junit.Test;
import java.util.Map;
@@ -34,15 +33,13 @@ import static org.junit.Assert.assertTrue;
public class GraphsTest {
@Test
- @Ignore("Does not work on marko's local machine for some reason -- good for stephen and travis-ci")
public void shouldReturnGraphs() {
- // todo: why doesn't this test work?
final Settings settings = Settings.read(GraphsTest.class.getResourceAsStream("gremlin-server-integration.yaml"));
final Graphs graphs = new Graphs(settings);
final Map<String, Graph> m = graphs.getGraphs();
assertNotNull(m);
- assertTrue(m.containsKey("g"));
- assertTrue(m.get("g") instanceof TinkerGraph);
+ assertTrue(m.containsKey("graph"));
+ assertTrue(m.get("graph") instanceof TinkerGraph);
}
}