You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/12/12 02:40:16 UTC
[tinkerpop] 02/08: Refactored gremlin-server "remote" tests to run
latest versions of GraphSON and Gryo CTR
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 22c5485f2c3a0f06eefb188bb58f7b5346bb1d0a
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Dec 11 17:43:54 2018 -0500
Refactored gremlin-server "remote" tests to run latest versions of GraphSON and Gryo CTR
---
...vider.java => AbstractRemoteGraphProvider.java} | 45 +++++++++++++++++++---
...va => GraphSONRemoteGraphComputerProvider.java} | 26 ++++---------
.../driver/remote/GraphSONRemoteGraphProvider.java | 31 +++++++++++++++
...r.java => GryoRemoteGraphComputerProvider.java} | 24 ++++--------
.../driver/remote/GryoRemoteGraphProvider.java | 30 +++++++++++++++
...moteGraphGroovyTranslatorComputerProvider.java} | 7 ++--
...> GryoRemoteGraphGroovyTranslatorProvider.java} | 4 +-
...teGraphGroovyTranslatorProcessComputerTest.java | 2 +-
...teGraphGroovyTranslatorProcessStandardTest.java | 2 +-
...=> GraphSONRemoteGraphProcessComputerTest.java} | 9 ++---
...=> GraphSONRemoteGraphProcessStandardTest.java} | 7 ++--
...ava => GryoRemoteGraphProcessComputerTest.java} | 7 ++--
...ava => GryoRemoteGraphProcessStandardTest.java} | 7 ++--
13 files changed, 135 insertions(+), 66 deletions(-)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
similarity index 79%
rename from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java
rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
index 675f979..9c2890e 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
@@ -21,9 +21,11 @@ package org.apache.tinkerpop.gremlin.driver.remote;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -32,6 +34,7 @@ import org.apache.tinkerpop.gremlin.server.ServerTestHelper;
import org.apache.tinkerpop.gremlin.server.Settings;
import org.apache.tinkerpop.gremlin.server.TestClientFactory;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
import java.io.InputStream;
import java.util.HashMap;
@@ -44,17 +47,26 @@ import java.util.function.Supplier;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class RemoteGraphProvider extends AbstractGraphProvider implements AutoCloseable {
+public abstract class AbstractRemoteGraphProvider extends AbstractGraphProvider implements AutoCloseable {
private static final Set<Class> IMPLEMENTATION = new HashSet<Class>() {{
add(RemoteGraph.class);
}};
private static GremlinServer server;
private final Map<String, RemoteGraph> remoteCache = new HashMap<>();
- private final Cluster cluster = TestClientFactory.build().maxContentLength(1000000).create();
- private final Client client = cluster.connect();
+ private final Cluster cluster;
+ private final Client client;
+ private final boolean useComputer;
- public RemoteGraphProvider() {
+
+ public AbstractRemoteGraphProvider(final Cluster cluster) {
+ this(cluster, false);
+ }
+
+ public AbstractRemoteGraphProvider(final Cluster cluster, final boolean useComputer) {
+ this.cluster = cluster;
+ this.client = this.cluster.connect();
+ this.useComputer = useComputer;
try {
startServer();
} catch (Exception ex) {
@@ -115,12 +127,35 @@ public class RemoteGraphProvider extends AbstractGraphProvider implements AutoCl
@Override
public GraphTraversalSource traversal(final Graph graph) {
+ assert graph instanceof RemoteGraph;
+
// ensure that traversal is created using withRemote() rather than just using RemoteGraph. withRemote() is
// the appropriate way for users to create a remote traversal. RemoteGraph has been deprecated for users
// concerns and will be likely relegated to the test module so that OptOut can continue to work and we can
// full execute the process tests. we should be able to clean this up considerably when RemoteGraph can be
// moved with breaking change.
- return AnonymousTraversalSource.traversal().withRemote(((RemoteGraph) graph).getConnection());
+ final GraphTraversalSource g = AnonymousTraversalSource.traversal().withRemote(((RemoteGraph) graph).getConnection());
+
+ if (useComputer) {
+ final int state = TestHelper.RANDOM.nextInt(3);
+ switch (state) {
+ case 0:
+ return g.withComputer();
+ case 1:
+ return g.withComputer(Computer.compute(TinkerGraphComputer.class));
+ case 2:
+ return g.withComputer(Computer.compute(TinkerGraphComputer.class).workers(4));
+ default:
+ throw new IllegalStateException("This state should not have occurred: " + state);
+ }
+ }
+
+ return g;
+ }
+
+ public static Cluster.Builder createClusterBuilder(final Serializers serializer) {
+ // match the content length in the server yaml
+ return TestClientFactory.build().maxContentLength(1000000).serializer(serializer);
}
public static void startServer() throws Exception {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
similarity index 61%
copy from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphComputerProvider.java
copy to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
index 0fc1086..18917ac 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphComputerProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
@@ -20,6 +20,9 @@
package org.apache.tinkerpop.gremlin.driver.remote;
import org.apache.tinkerpop.gremlin.GraphProvider;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -29,26 +32,11 @@ import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComp
import java.util.Random;
/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class RemoteGraphComputerProvider extends RemoteGraphProvider {
-
- private final Random RANDOM = new Random();
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- assert graph instanceof RemoteGraph;
- final int state = RANDOM.nextInt(3);
- switch (state) {
- case 0:
- return super.traversal(graph).withComputer();
- case 1:
- return super.traversal(graph).withComputer(Computer.compute(TinkerGraphComputer.class));
- case 2:
- return super.traversal(graph).withComputer(Computer.compute(TinkerGraphComputer.class).workers(1));
- default:
- throw new IllegalStateException("This state should not have occurred: " + state);
- }
+public class GraphSONRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
+ public GraphSONRemoteGraphComputerProvider() {
+ super(createClusterBuilder(Serializers.GRAPHSON_V3D0).create(), true);
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
new file mode 100644
index 0000000..e8482e5
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.server.TestClientFactory;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
+ public GraphSONRemoteGraphProvider() {
+ super(createClusterBuilder(Serializers.GRAPHSON_V3D0).create());
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphComputerProvider.java
similarity index 64%
rename from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphComputerProvider.java
rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphComputerProvider.java
index 0fc1086..9cc3883 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphComputerProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphComputerProvider.java
@@ -20,6 +20,9 @@
package org.apache.tinkerpop.gremlin.driver.remote;
import org.apache.tinkerpop.gremlin.GraphProvider;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -30,25 +33,12 @@ import java.util.Random;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class RemoteGraphComputerProvider extends RemoteGraphProvider {
+public class GryoRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
- private final Random RANDOM = new Random();
-
- @Override
- public GraphTraversalSource traversal(final Graph graph) {
- assert graph instanceof RemoteGraph;
- final int state = RANDOM.nextInt(3);
- switch (state) {
- case 0:
- return super.traversal(graph).withComputer();
- case 1:
- return super.traversal(graph).withComputer(Computer.compute(TinkerGraphComputer.class));
- case 2:
- return super.traversal(graph).withComputer(Computer.compute(TinkerGraphComputer.class).workers(1));
- default:
- throw new IllegalStateException("This state should not have occurred: " + state);
- }
+ public GryoRemoteGraphComputerProvider() {
+ super(createClusterBuilder(Serializers.GRYO_V3D0).create(), true);
}
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphProvider.java
new file mode 100644
index 0000000..9e13797
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GryoRemoteGraphProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.remote;
+
+import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GryoRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
+ public GryoRemoteGraphProvider() {
+ super(createClusterBuilder(Serializers.GRYO_V3D0).create());
+ }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GryoRemoteGraphGroovyTranslatorComputerProvider.java
similarity index 90%
rename from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorComputerProvider.java
rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GryoRemoteGraphGroovyTranslatorComputerProvider.java
index 1b6cf70..b0e75af 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorComputerProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GryoRemoteGraphGroovyTranslatorComputerProvider.java
@@ -20,6 +20,7 @@
package org.apache.tinkerpop.gremlin.groovy.jsr223;
import org.apache.tinkerpop.gremlin.GraphProvider;
+import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -32,14 +33,12 @@ import java.util.Random;
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
-public class RemoteGraphGroovyTranslatorComputerProvider extends RemoteGraphGroovyTranslatorProvider {
-
- private final Random RANDOM = new Random();
+public class GryoRemoteGraphGroovyTranslatorComputerProvider extends GryoRemoteGraphGroovyTranslatorProvider {
@Override
public GraphTraversalSource traversal(final Graph graph) {
assert graph instanceof RemoteGraph;
- final int state = RANDOM.nextInt(3);
+ final int state = TestHelper.RANDOM.nextInt(3);
switch (state) {
case 0:
return super.traversal(graph).withComputer();
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GryoRemoteGraphGroovyTranslatorProvider.java
similarity index 93%
rename from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java
rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GryoRemoteGraphGroovyTranslatorProvider.java
index 38935a0..7a62ed4 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GryoRemoteGraphGroovyTranslatorProvider.java
@@ -20,7 +20,7 @@
package org.apache.tinkerpop.gremlin.groovy.jsr223;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.driver.remote.RemoteGraphProvider;
+import org.apache.tinkerpop.gremlin.driver.remote.GryoRemoteGraphProvider;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -33,7 +33,7 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class RemoteGraphGroovyTranslatorProvider extends RemoteGraphProvider {
+public class GryoRemoteGraphGroovyTranslatorProvider extends GryoRemoteGraphProvider {
private static boolean SKIP = false;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessComputerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessComputerTest.java
index ba95fde..36cd8f5 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessComputerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessComputerTest.java
@@ -28,6 +28,6 @@ import org.junit.runner.RunWith;
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = RemoteGraphGroovyTranslatorComputerProvider.class, graph = RemoteGraph.class)
+@GraphProviderClass(provider = GryoRemoteGraphGroovyTranslatorComputerProvider.class, graph = RemoteGraph.class)
public class RemoteGraphGroovyTranslatorProcessComputerTest {
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessStandardTest.java
index db71d2c..87eb375 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessStandardTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProcessStandardTest.java
@@ -28,6 +28,6 @@ import org.junit.runner.RunWith;
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = RemoteGraphGroovyTranslatorProvider.class, graph = RemoteGraph.class)
+@GraphProviderClass(provider = GryoRemoteGraphGroovyTranslatorProvider.class, graph = RemoteGraph.class)
public class RemoteGraphGroovyTranslatorProcessStandardTest {
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessComputerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java
similarity index 75%
copy from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessComputerTest.java
copy to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java
index bd5bc3a..e97a476 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessComputerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java
@@ -20,15 +20,14 @@
package org.apache.tinkerpop.gremlin.process.remote;
import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.driver.remote.RemoteGraphComputerProvider;
+import org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteGraphComputerProvider;
import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
import org.junit.runner.RunWith;
/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = RemoteGraphComputerProvider.class, graph = RemoteGraph.class)
-public class RemoteGraphProcessComputerTest {
+@GraphProviderClass(provider = GraphSONRemoteGraphComputerProvider.class, graph = RemoteGraph.class)
+public class GraphSONRemoteGraphProcessComputerTest {
}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java
similarity index 80%
copy from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessStandardTest.java
copy to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java
index 0eec63a..7f3f9f1 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessStandardTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java
@@ -19,15 +19,14 @@
package org.apache.tinkerpop.gremlin.process.remote;
import org.apache.tinkerpop.gremlin.GraphProviderClass;
+import org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteGraphProvider;
import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
-import org.apache.tinkerpop.gremlin.driver.remote.RemoteGraphProvider;
import org.junit.runner.RunWith;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = RemoteGraphProvider.class, graph = RemoteGraph.class)
-public class RemoteGraphProcessStandardTest {
+@GraphProviderClass(provider = GraphSONRemoteGraphProvider.class, graph = RemoteGraph.class)
+public class GraphSONRemoteGraphProcessStandardTest {
}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessComputerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessComputerTest.java
similarity index 80%
rename from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessComputerTest.java
rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessComputerTest.java
index bd5bc3a..3631490 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessComputerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessComputerTest.java
@@ -20,15 +20,14 @@
package org.apache.tinkerpop.gremlin.process.remote;
import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.driver.remote.RemoteGraphComputerProvider;
+import org.apache.tinkerpop.gremlin.driver.remote.GryoRemoteGraphComputerProvider;
import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite;
-import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
import org.junit.runner.RunWith;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@RunWith(ProcessComputerSuite.class)
-@GraphProviderClass(provider = RemoteGraphComputerProvider.class, graph = RemoteGraph.class)
-public class RemoteGraphProcessComputerTest {
+@GraphProviderClass(provider = GryoRemoteGraphComputerProvider.class, graph = RemoteGraph.class)
+public class GryoRemoteGraphProcessComputerTest {
}
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessStandardTest.java
similarity index 80%
rename from gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessStandardTest.java
rename to gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessStandardTest.java
index 0eec63a..d40c268 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraphProcessStandardTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GryoRemoteGraphProcessStandardTest.java
@@ -20,14 +20,13 @@ package org.apache.tinkerpop.gremlin.process.remote;
import org.apache.tinkerpop.gremlin.GraphProviderClass;
import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
-import org.apache.tinkerpop.gremlin.driver.remote.RemoteGraphProvider;
+import org.apache.tinkerpop.gremlin.driver.remote.GryoRemoteGraphProvider;
import org.junit.runner.RunWith;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@RunWith(ProcessStandardSuite.class)
-@GraphProviderClass(provider = RemoteGraphProvider.class, graph = RemoteGraph.class)
-public class RemoteGraphProcessStandardTest {
+@GraphProviderClass(provider = GryoRemoteGraphProvider.class, graph = RemoteGraph.class)
+public class GryoRemoteGraphProcessStandardTest {
}
\ No newline at end of file