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 2017/12/29 13:48:42 UTC

tinkerpop git commit: Merge branch 'TINKERPOP-1860' into TINKERPOP-1860-master

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1860-master [created] 7ad7d616e


Merge branch 'TINKERPOP-1860' into TINKERPOP-1860-master

Conflicts:
	gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
	gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java


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

Branch: refs/heads/TINKERPOP-1860-master
Commit: 7ad7d616e677c1d13e8ac17aae18c6850418d617
Parents: 5b51d1b 0b94b50
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 29 08:48:12 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 29 08:48:12 2017 -0500

----------------------------------------------------------------------
 .../src/main/jython/radish/feature_steps.py     |   8 +-
 gremlin-test/features/map/ValueMap.feature      |  32 ++++++
 .../traversal/step/map/ValueMapTest.java        | 107 +++++++++++++++++--
 3 files changed, 139 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7ad7d616/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
index 9c13d5a,d1f08ce..3490185
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
@@@ -22,8 -22,7 +22,7 @@@ import org.apache.tinkerpop.gremlin.Loa
  import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
  import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
  import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
--import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
 +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
  import org.apache.tinkerpop.gremlin.structure.T;
  import org.apache.tinkerpop.gremlin.structure.Vertex;
  import org.junit.Test;
@@@ -33,8 -32,7 +32,9 @@@ import java.util.List
  import java.util.Map;
  
  import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+ import static org.hamcrest.core.Is.is;
 +import static org.apache.tinkerpop.gremlin.structure.T.id;
 +import static org.apache.tinkerpop.gremlin.structure.T.label;
  import static org.junit.Assert.*;
  
  /**
@@@ -46,11 -44,13 +46,15 @@@ public abstract class ValueMapTest exte
  
      public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMap();
  
 -    public abstract Traversal<Vertex, Map<String, Object>> get_g_V_valueMapXtrueX();
++    public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapXtrueX();
+ 
      public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX();
  
 -    public abstract Traversal<Vertex, Map<String, Object>> get_g_V_valueMapXtrue_name_ageX();
++    public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapXtrue_name_ageX();
+ 
 -    public abstract Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
 +    public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX();
 +
-     public abstract Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
++    public abstract Traversal<Vertex, Map<String, List>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
  
      @Test
      @LoadGraphWith(MODERN)
@@@ -84,6 -84,43 +88,43 @@@
  
      @Test
      @LoadGraphWith(MODERN)
+     public void g_V_valueMapXtrueX() {
 -        final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_valueMapXtrueX();
++        final Traversal<Vertex, Map<Object, Object>> traversal = get_g_V_valueMapXtrueX();
+         printTraversalForm(traversal);
+         int counter = 0;
+         while (traversal.hasNext()) {
+             counter++;
 -            final Map<String, Object> values = traversal.next();
++            final Map<Object, Object> values = traversal.next();
+             final String name = (String) ((List) values.get("name")).get(0);
+             assertEquals(4, values.size());
+             assertThat(values.containsKey(T.id), is(true));
+             if (name.equals("marko")) {
+                 assertEquals(29, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("josh")) {
+                 assertEquals(32, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("peter")) {
+                 assertEquals(35, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("vadas")) {
+                 assertEquals(27, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("lop")) {
+                 assertEquals("java", ((List) values.get("lang")).get(0));
+                 assertEquals("software", values.get(T.label));
+             } else if (name.equals("ripple")) {
+                 assertEquals("java", ((List) values.get("lang")).get(0));
+                 assertEquals("software", values.get(T.label));
+             } else {
+                 throw new IllegalStateException("It is not possible to reach here: " + values);
+             }
+         }
+         assertEquals(6, counter);
+     }
+ 
+     @Test
+     @LoadGraphWith(MODERN)
      public void g_V_valueMapXname_ageX() {
          final Traversal<Vertex, Map<String, List>> traversal = get_g_V_valueMapXname_ageX();
          printTraversalForm(traversal);
@@@ -119,11 -156,53 +160,53 @@@
  
      @Test
      @LoadGraphWith(MODERN)
+     public void g_V_valueMapXtrue_name_ageX() {
 -        final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_valueMapXtrue_name_ageX();
++        final Traversal<Vertex, Map<Object, Object>> traversal = get_g_V_valueMapXtrue_name_ageX();
+         printTraversalForm(traversal);
+         int counter = 0;
+         while (traversal.hasNext()) {
+             counter++;
 -            final Map<String, Object> values = traversal.next();
++            final Map<Object, Object> values = traversal.next();
+             final String name = (String) ((List) values.get("name")).get(0);
+             assertThat(values.containsKey(T.id), is(true));
+             if (name.equals("marko")) {
+                 assertEquals(4, values.size());
+                 assertEquals(29, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("josh")) {
+                 assertEquals(4, values.size());
+                 assertEquals(32, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("peter")) {
+                 assertEquals(4, values.size());
+                 assertEquals(35, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("vadas")) {
+                 assertEquals(4, values.size());
+                 assertEquals(27, ((List) values.get("age")).get(0));
+                 assertEquals("person", values.get(T.label));
+             } else if (name.equals("lop")) {
+                 assertEquals(3, values.size());
+                 assertNull(values.get("lang"));
+                 assertEquals("software", values.get(T.label));
+             } else if (name.equals("ripple")) {
+                 assertEquals(3, values.size());
+                 assertNull(values.get("lang"));
+                 assertEquals("software", values.get(T.label));
+             } else {
+                 throw new IllegalStateException("It is not possible to reach here: " + values);
+             }
+         }
+         assertEquals(6, counter);
+     }
+ 
+     @Test
+     @LoadGraphWith(MODERN)
      public void g_VX1X_outXcreatedX_valueMap() {
--        final Traversal<Vertex, Map<String, List<String>>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko"));
++        final Traversal<Vertex, Map<String, List>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko"));
          printTraversalForm(traversal);
          assertTrue(traversal.hasNext());
--        final Map<String, List<String>> values = traversal.next();
++        final Map<String, List> values = traversal.next();
          assertFalse(traversal.hasNext());
          assertEquals("lop", values.get("name").get(0));
          assertEquals("java", values.get("lang").get(0));
@@@ -131,29 -210,6 +214,29 @@@
  
      }
  
 +    /**
 +     * TINKERPOP-1483
 +     */
 +    @Test
 +    @LoadGraphWith(MODERN)
 +    public void g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX() {
 +    	final Traversal<Vertex,Map<Object,Object>> gt=get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX();
 +    	int cnt = 0;
 +    	while(gt.hasNext()){
 +    		final Map<Object,Object> m = gt.next();
 +    		assertTrue(m.size() > 0);
 +    		for (Object o : m.keySet()){
 +    			assertNotNull(m.get(o));
 +    		}
 +    		assertTrue(m.containsKey(id));
 +    		assertTrue(m.containsKey(label));
 +    		assertEquals("person",m.get(label));
 +    		cnt++;
 +    	}
 +    	// check we had results
 +    	assertTrue(cnt > 0);
 +    }
-     
++
      public static class Traversals extends ValueMapTest {
          @Override
          public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
@@@ -161,18 -217,23 +244,28 @@@
          }
  
          @Override
 -        public Traversal<Vertex, Map<String, Object>> get_g_V_valueMapXtrueX() {
++        public Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapXtrueX() {
+             return g.V().valueMap(true);
+         }
+ 
+         @Override
          public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
              return g.V().valueMap("name", "age");
          }
  
          @Override
-         public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
 -        public Traversal<Vertex, Map<String, Object>> get_g_V_valueMapXtrue_name_ageX() {
++        public Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapXtrue_name_ageX() {
+             return g.V().valueMap(true, "name", "age");
+         }
+ 
+         @Override
 -        public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
++        public Traversal<Vertex, Map<String, List>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
              return g.V(v1Id).out("created").valueMap();
          }
-         
++
 +        @Override
 +        public Traversal<Vertex, Map<Object, Object>> get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX() {
 +        	return g.V().hasLabel("person").filter(__.outE("created")).valueMap(true);
 +        }
      }
  }