subject:"\[35\/50\] \[abbrv\] tinkerpop git commit\: Merge branch 'tp32' into tp33"

[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-10-05 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java

gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs

gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/28bf3046
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/28bf3046
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/28bf3046

Branch: refs/heads/TINKERPOP-2053
Commit: 28bf30468cca9bbd5c95b3814619801348cfad96
Parents: 650d1e8 80fa89b
Author: Stephen Mallette 
Authored: Thu Oct 4 14:10:54 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 4 14:10:54 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/dev/io/graphson.asciidoc   |  2 +
 .../io/graphson/GraphSONSerializersV2d0.java| 19 ++--
 .../GraphSONMapperEmbeddedTypeTest.java | 14 ++
 .../IO/GraphSON/GraphSONReaderTests.cs  | 49 +---
 .../IO/GraphSON/GraphSONWriterTests.cs  | 32 -
 .../lib/structure/io/type-serializers.js| 30 +++-
 .../test/unit/graphson-test.js  | 39 
 .../gremlin_python/structure/io/graphsonV2d0.py | 26 +++
 .../tests/structure/io/test_graphsonV2d0.py | 25 ++
 10 files changed, 224 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/docs/src/dev/io/graphson.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28bf3046/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
--
diff --cc 
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index a375e3b,e5f2693..c9400cd
--- 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@@ -44,16 -44,8 +44,17 @@@ import java.time.ZoneOffset
  import java.time.ZonedDateTime;
  import java.util.ArrayList;
  import java.util.Arrays;
 +import java.util.HashMap;
 +import java.util.Iterator;
 +import java.util.LinkedHashMap;
 +import java.util.LinkedHashSet;
  import java.util.List;
 +import java.util.Map;
 +import java.util.Set;
  
 +import static org.hamcrest.CoreMatchers.any;
 +import static org.hamcrest.Matchers.either;
++import static org.hamcrest.core.IsNot.not;
  import static org.hamcrest.core.StringStartsWith.startsWith;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assume.assumeThat;
@@@ -85,58 -74,21 +86,71 @@@ public class GraphSONMapperEmbeddedType
  public String version;
  
  @Test
+ public void shouldHandleNumberConstants() throws Exception {
 -assumeThat(version, startsWith("v2"));
++assumeThat(version, not(startsWith("v1")));
+ 
+ final List o = new ArrayList<>();
+ o.add(123.321d);
+ o.add(Double.NaN);
+ o.add(Double.NEGATIVE_INFINITY);
+ o.add(Double.POSITIVE_INFINITY);
+ 
+ assertEquals(o, serializeDeserialize(mapper, o, List.class));
+ }
+ 
+ @Test
 +public void shouldHandleMap() throws Exception {
 +assumeThat(version, startsWith("v3"));
 +
 +final Map o = new LinkedHashMap<>();
 +o.put("string key", "string value");
 +o.put(1, 1);
 +o.put(1L, 1L);
 +
 +final List l = Arrays.asList("test", 1, 5L);
 +o.put(l, "crazy");
 +
 +assertEquals(o, serializeDeserialize(mapper, o, Map.class));
 +}
 +
 +@Test
 +public void shouldHandleList() throws Exception {
 +assumeThat(version, startsWith("v3"));
 +
 +final List o = new ArrayList<>();
 +o.add("test");
 +o.add(1);
 +o.add(1);
 +o.add(1L);
 +o.add(1L);
 +
 +final List l = Arrays.asList("test", 1, 5L);
 +o.add(l);
 +
 +assertEquals(o, serializeDeserialize(mapper, o, List.class));
 +}

[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-25 Thread dkuppitz

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy
gremlin-test/features/map/AddVertex.feature

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9d5b7229
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9d5b7229
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9d5b7229

Branch: refs/heads/TINKERPOP-1447
Commit: 9d5b72290bddfbc0b987297626427e2cfedd86d5
Parents: 012eba6 44c4073
Author: Stephen Mallette 
Authored: Wed Apr 25 07:27:29 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 07:27:29 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/step/util/Parameters.java | 30 +++-
 gremlin-test/features/map/AddVertex.feature | 26 +
 .../traversal/step/map/AddVertexTest.java   | 20 +++--
 4 files changed, 62 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d5b7229/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d5b7229/gremlin-test/features/map/AddVertex.feature
--
diff --cc gremlin-test/features/map/AddVertex.feature
index e58040c,996521b..5d324f3
--- a/gremlin-test/features/map/AddVertex.feature
+++ b/gremlin-test/features/map/AddVertex.feature
@@@ -309,54 -309,29 +309,80 @@@ Feature: Step - addV(
| m[{"temp": ["test"], "name": ["lop"]}] |
| m[{"temp": ["test"], "name": ["ripple"]}] |
  
+   Scenario: g_withSideEffectXa_nameX_addV_propertyXselectXaX_markoX_name
+ Given the empty graph
+ And the graph initializer of
+   """
+   g.addV("person").property(T.id, 1).property("name", 
"marko").property("age", 29).as("marko").
+ addV("person").property(T.id, 2).property("name", 
"vadas").property("age", 27).as("vadas").
+ addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
+ addV("person").property(T.id, 
4).property("name","josh").property("age", 32).as("josh").
+ addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", "java").as("ripple").
+ addV("person").property(T.id, 6).property("name", 
"peter").property("age", 35).as('peter').
+ addE("knows").from("marko").to("vadas").property(T.id, 
7).property("weight", 0.5).
+ addE("knows").from("marko").to("josh").property(T.id, 
8).property("weight", 1.0).
+ addE("created").from("marko").to("lop").property(T.id, 
9).property("weight", 0.4).
+ addE("created").from("josh").to("ripple").property(T.id, 
10).property("weight", 1.0).
+ addE("created").from("josh").to("lop").property(T.id, 
11).property("weight", 0.4).
+ addE("created").from("peter").to("lop").property(T.id, 
12).property("weight", 0.2)
+   """
+ And the traversal of
+   """
+   g.withSideEffect("a", "name").addV().property(__.select("a"), 
"marko").values("name")
+   """
+ When iterated to list
+ Then the result should be unordered
+   | result |
+   | marko |
 -And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
++And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
 +  Scenario: 
g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX
 +Given the empty graph
 +And the graph initializer of
 +  """
 +  g.addV("person").property(T.id, 1).property("name", 
"marko").property("age", 29).as("marko").
 +addV("person").property(T.id, 2).property("name", 
"vadas").property("age", 27).as("vadas").
 +addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
 +addV("person").property(T.id, 
4).property("name","josh").property("age", 32).as("josh").
 +addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", "java").as("ripple").
 +addV("person").property(T.id, 6).property("name", 
"peter").property("age", 35).as('peter').
 +addE("knows").from("marko").to("vadas").property(T.id, 
7).property("weight", 0.5).
 +addE("knows").from("marko").to("josh").property(T.id, 
8).property("weight", 1.0).
 +addE("created").from("marko").to("lop").property(T.id, 
9).property("weight", 0.4).
 +addE("created").from("josh").to("ripple").property(T.id,

[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-24 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81add608
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81add608
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81add608

Branch: refs/heads/TINKERPOP-1869
Commit: 81add608549846e5f45e4e1a504e5e3cea6e03f9
Parents: 7e6e985 682f298
Author: Stephen Mallette 
Authored: Fri Apr 20 19:29:17 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:29:17 2018 -0400

--

--

[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33

3 matches

Site Navigation

Mail list logo

Footer information