This is an automated email from the ASF dual-hosted git repository. kenhuuu pushed a commit to branch http-server-test-updates in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 57dd2c444a002352336d3ff704470aa21ca650df Author: Ken Hu <[email protected]> AuthorDate: Mon May 20 12:13:15 2024 -0700 Remove GraphSON feature/process tests. Starting in 4.0, gremlin-driver only supports GraphBinary. --- .../remote/GraphSONRemoteComputerFeatureTest.java | 51 ------- .../driver/remote/GraphSONRemoteFeatureTest.java | 51 ------- .../GraphSONRemoteGraphComputerProvider.java | 151 --------------------- .../driver/remote/GraphSONRemoteGraphProvider.java | 30 ---- .../gremlin/driver/remote/RemoteWorld.java | 12 -- .../GraphSONRemoteGraphProcessComputerTest.java | 34 ----- .../GraphSONRemoteGraphProcessStandardTest.java | 33 ----- .../io.cucumber.core.backend.ObjectFactory | 2 - 8 files changed, 364 deletions(-) diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteComputerFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteComputerFeatureTest.java deleted file mode 100644 index ed170e470f..0000000000 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteComputerFeatureTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Stage; -import io.cucumber.guice.CucumberModules; -import io.cucumber.junit.Cucumber; -import io.cucumber.junit.CucumberOptions; -import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory; -import org.apache.tinkerpop.gremlin.features.World; -import org.junit.runner.RunWith; - -@RunWith(Cucumber.class) -@CucumberOptions( - tags = "not @RemoteOnly and not @GraphComputerVerificationElementSupported", - glue = { "org.apache.tinkerpop.gremlin.features" }, - objectFactory = GraphSONRemoteComputerFeatureTest.RemoteGuiceFactory.class, - features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" }, - plugin = {"progress", "junit:target/cucumber.xml"}) -public class GraphSONRemoteComputerFeatureTest extends AbstractFeatureTest { - public static class RemoteGuiceFactory extends AbstractGuiceFactory { - public RemoteGuiceFactory() { - super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule())); - } - } - - public static final class ServiceModule extends AbstractModule { - @Override - protected void configure() { - bind(World.class).to(RemoteWorld.GraphSONRemoteComputerWorld.class); - } - } -} diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java deleted file mode 100644 index 901ac413b1..0000000000 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteFeatureTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Stage; -import io.cucumber.guice.CucumberModules; -import io.cucumber.junit.Cucumber; -import io.cucumber.junit.CucumberOptions; -import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory; -import org.apache.tinkerpop.gremlin.features.World; -import org.junit.runner.RunWith; - -@RunWith(Cucumber.class) -@CucumberOptions( - tags = "not @RemoteOnly and not @GraphComputerOnly and not @AllowNullPropertyValues", - glue = { "org.apache.tinkerpop.gremlin.features" }, - objectFactory = GraphSONRemoteFeatureTest.RemoteGuiceFactory.class, - features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" }, - plugin = {"progress", "junit:target/cucumber.xml"}) -public class GraphSONRemoteFeatureTest extends AbstractFeatureTest { - public static class RemoteGuiceFactory extends AbstractGuiceFactory { - public RemoteGuiceFactory() { - super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule())); - } - } - - public static final class ServiceModule extends AbstractModule { - @Override - protected void configure() { - bind(World.class).to(RemoteWorld.GraphSONRemoteWorld.class); - } - } -} diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java deleted file mode 100644 index 6a119441cc..0000000000 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * 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.GraphProvider; -import org.apache.tinkerpop.gremlin.structure.Graph; -import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer; -import org.apache.tinkerpop.gremlin.util.ser.SerializersV4; - -/** - * @author Stephen Mallette (http://stephen.genoprime.com) - */ [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest", - method = "*", - reason = "The addEdge() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest", - method = "g_injectX1X_chooseXisX1X__constantX10Xfold__foldX", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest", - method = "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest", - method = "g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX", - reason = "Mid-traversal V()/E() is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest", - method = "g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name", - reason = "Mid-traversal V()/E() is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest", - method = "g_V_outXknowsX_V_name", - reason = "Mid-traversal V()/E() is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest", - method = "g_VX1X_V_valuesXnameX", - reason = "Mid-traversal V()/E() is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeTest", - method = "*", - reason = "Mid-traversal V()/E() is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest", - method = "*", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MathTest", - method = "g_withSackX1X_injectX1X_repeatXsackXsumX_byXconstantX1XXX_timesX5X_emit_mathXsin__X_byXsackX", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest", - method = "g_V_foo_injectX9999999999X_min", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalTest", - method = "g_VX1X_optionalXaddVXdogXX_label", - reason = "The addV() step is not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathTest", - method = "g_V_asXaX_out_asXbX_out_asXcX_simplePath_byXlabelX_fromXbX_toXcX_path_byXnameX", - reason = "It is not possible to access more than a path element's id on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexTest", - method = "g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name", - reason = "Mid-traversal V()/E() is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest", - method = "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", - reason = "One bulk is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest", - method = "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", - reason = "One bulk is currently not supported on GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest", - method = "g_injectXg_VX1X_propertiesXnameX_nextX_value", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest", - method = "g_injectXnull_10_5_nullX_sum", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest", - method = "g_injectXlistXnull_10_5_nullXX_sumXlocalX", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest", - method = "g_injectXlistXnull_10_20_nullXX_meanXlocalX", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest", - method = "g_injectXnull_10_20_nullX_mean", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectTest", - method = "g_withSideEffectXk_nullX_injectXxX_selectXkX", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ReadTest", - method = "*", - reason = "The io() step is not supported generally by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.WriteTest", - method = "*", - reason = "The io() step is not supported generally by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest", - method = "g_V_hasXk_withinXcXX_valuesXkX", - reason = "Requires some test data initialization with addV()") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest", - method = "g_V_hasXname_regexXTinkerXX", - reason = "Requires some test data initialization with addV()") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest", - method = "g_V_hasXname_regexXTinkerUnicodeXX", - reason = "Requires some test data initialization with addV()") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest", - method = "g_injectX1_null_nullX_path", - reason = "The inject() step is not supported by GraphComputer") [email protected]( - test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest", - method = "g_injectX1_null_nullX_path_dedup", - reason = "The inject() step is not supported by GraphComputer") [email protected](computer = TinkerGraphComputer.class) -public class GraphSONRemoteGraphComputerProvider extends AbstractRemoteGraphProvider { - public GraphSONRemoteGraphComputerProvider() { - super(createClusterBuilder(SerializersV4.GRAPHSON_V4).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 deleted file mode 100644 index 20a8fcc562..0000000000 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.util.ser.SerializersV4; - -/** - * @author Stephen Mallette (http://stephen.genoprime.com) - */ -public class GraphSONRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable { - public GraphSONRemoteGraphProvider() { - super(createClusterBuilder(SerializersV4.GRAPHSON_V4).create()); - } -} diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java index 3e32bb7663..7ed9f23792 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java @@ -168,16 +168,4 @@ public abstract class RemoteWorld implements World { public static class GraphBinaryRemoteComputerWorld extends RemoteComputerWorld { public GraphBinaryRemoteComputerWorld() { super(createTestCluster(SerializersV4.GRAPHBINARY_V4)); } } - - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - public static class GraphSONRemoteWorld extends RemoteWorld { - public GraphSONRemoteWorld() { super(createTestCluster(SerializersV4.GRAPHSON_V4)); } - } - - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - public static class GraphSONRemoteComputerWorld extends RemoteComputerWorld { - public GraphSONRemoteComputerWorld() { super(createTestCluster(SerializersV4.GRAPHSON_V4)); } - } } diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java deleted file mode 100644 index 8d6013bd8e..0000000000 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessComputerTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.process.remote; - -import org.apache.tinkerpop.gremlin.GraphProviderClass; -import org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteGraphComputerProvider; -import org.apache.tinkerpop.gremlin.process.ProcessComputerSuite; -import org.apache.tinkerpop.gremlin.structure.RemoteGraph; -import org.junit.runner.RunWith; - -/** - * @author Stephen Mallette (http://stephen.genoprime.com) - */ -@RunWith(ProcessComputerSuite.class) -@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/GraphSONRemoteGraphProcessStandardTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java deleted file mode 100644 index c1d429c611..0000000000 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/process/remote/GraphSONRemoteGraphProcessStandardTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.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.structure.RemoteGraph; -import org.junit.runner.RunWith; - -/** - * @author Stephen Mallette (http://stephen.genoprime.com) - */ -@RunWith(ProcessStandardSuite.class) -@GraphProviderClass(provider = GraphSONRemoteGraphProvider.class, graph = RemoteGraph.class) -public class GraphSONRemoteGraphProcessStandardTest { -} \ No newline at end of file diff --git a/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory b/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory index 023350111b..d91805a42f 100644 --- a/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory +++ b/gremlin-server/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory @@ -1,4 +1,2 @@ org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryRemoteFeatureTest$RemoteGuiceFactory org.apache.tinkerpop.gremlin.driver.remote.GraphBinaryRemoteComputerFeatureTest$RemoteGuiceFactory -org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteFeatureTest$RemoteGuiceFactory -org.apache.tinkerpop.gremlin.driver.remote.GraphSONRemoteComputerFeatureTest$RemoteGuiceFactory
