Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1975 869f5069e -> cb03a1b11
wip Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cb03a1b1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cb03a1b1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cb03a1b1 Branch: refs/heads/TINKERPOP-1975 Commit: cb03a1b11e2342b904cc74a3211b0f64ce6acb5a Parents: 869f506 Author: Stephen Mallette <[email protected]> Authored: Wed May 30 10:38:14 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed May 30 10:38:14 2018 -0400 ---------------------------------------------------------------------- .../GraphSONMapperPartialEmbeddedTypeTest.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cb03a1b1/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java index de4dded..e3a14e5 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java @@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraver import org.apache.tinkerpop.gremlin.process.traversal.Bytecode; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.process.traversal.step.util.DefaultStepConfiguration; import org.apache.tinkerpop.gremlin.process.traversal.step.util.StepConfigurationProxy; import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException; @@ -39,6 +40,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -338,10 +340,20 @@ public class GraphSONMapperPartialEmbeddedTypeTest extends AbstractGraphSONTest @Test public void shouldHandleWithDefaultStepConfiguration() throws Exception { - final DefaultStepConfiguration stepConfig = new DefaultStepConfiguration("setInterval", 1000); - final StepConfigurationProxy deserStepConfig = serializeDeserializeAuto(mapper, stepConfig); + final DefaultStepConfiguration stepConfigSimple = new DefaultStepConfiguration("setInterval", 1000); + StepConfigurationProxy deserStepConfig = serializeDeserializeAuto(mapper, stepConfigSimple); assertEquals(1000, deserStepConfig.getConfiguration().getInt("setInterval")); assertEquals(DefaultStepConfiguration.class, deserStepConfig.getStepConfigurationClass()); + + final LinkedHashMap<String,List<Object>> conf = new LinkedHashMap<>(); + conf.put("setInterval", Collections.singletonList(1000)); + conf.put("setTraversal", Collections.singletonList(__.out().constant(100))); + final DefaultStepConfiguration stepConfigMulti = new DefaultStepConfiguration(conf); + deserStepConfig = serializeDeserializeAuto(mapper, stepConfigMulti); + assertEquals(1000, deserStepConfig.getConfiguration().getInt("setInterval")); + assertEquals(__.out().constant(100).asAdmin().getBytecode(), deserStepConfig.getConfiguration().getList("setTraversal").get(0)); + assertEquals(DefaultStepConfiguration.class, deserStepConfig.getStepConfigurationClass()); + } // Class needs to be defined as statics as it's a nested class.
