Skip to content

Commit

Permalink
removed null properties (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DvirDukhan
DvirDukhan authored Nov 29, 2020
1 parent 91ad263 commit b0adafa
Showing 1 changed file with 16 additions and 24 deletions.
40 changes: 16 additions & 24 deletions src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ public void testRecord(){
Property<Double> doubleProperty = new Property<>("doubleValue", doubleValue);
Property<Boolean> trueBooleanProperty = new Property<>("boolValue", true);
Property<Boolean> falseBooleanProperty = new Property<>("boolValue", false);
Property<?> nullProperty = new Property<>("nullValue", null);

Property<String> placeProperty = new Property<>("place", place);
Property<Integer> sinceProperty = new Property<>("since", since);
Expand All @@ -222,13 +221,11 @@ public void testRecord(){
expectedNode.addProperty(ageProperty);
expectedNode.addProperty(doubleProperty);
expectedNode.addProperty(trueBooleanProperty);
expectedNode.addProperty(nullProperty);
Assert.assertEquals(
"Node{labels=[person], id=0, "
+ "propertyMap={name=Property{name='name', value=roi}, "
+ "boolValue=Property{name='boolValue', value=true}, "
+ "doubleValue=Property{name='doubleValue', value=3.14}, "
+ "nullValue=Property{name='nullValue', value=null}, "
+ "age=Property{name='age', value=32}}}", expectedNode.toString());

Edge expectedEdge = new Edge();
Expand All @@ -240,12 +237,10 @@ public void testRecord(){
expectedEdge.addProperty(sinceProperty);
expectedEdge.addProperty(doubleProperty);
expectedEdge.addProperty(falseBooleanProperty);
expectedEdge.addProperty(nullProperty);
Assert.assertEquals("Edge{relationshipType='knows', source=0, destination=1, id=0, "
+ "propertyMap={boolValue=Property{name='boolValue', value=false}, "
+ "place=Property{name='place', value=TLV}, "
+ "doubleValue=Property{name='doubleValue', value=3.14}, "
+ "nullValue=Property{name='nullValue', value=null}, "
+ "since=Property{name='since', value=2000}}}", expectedEdge.toString());

Map<String, Object> params = new HashMap<>();
Expand All @@ -254,14 +249,14 @@ public void testRecord(){
params.put("boolValue", boolValue);
params.put("doubleValue", doubleValue);

Assert.assertNotNull(api.query("social", "CREATE (:person{name:$name,age:$age, doubleValue:$doubleValue, boolValue:$boolValue, nullValue:null})", params));
Assert.assertNotNull(api.query("social", "CREATE (:person{name:$name,age:$age, doubleValue:$doubleValue, boolValue:$boolValue})", params));
Assert.assertNotNull(api.query("social", "CREATE (:person{name:'amit',age:30})"));
Assert.assertNotNull(api.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') " +
"CREATE (a)-[:knows{place:'TLV', since:2000,doubleValue:3.14, boolValue:false, nullValue:null}]->(b)"));
"CREATE (a)-[:knows{place:'TLV', since:2000,doubleValue:3.14, boolValue:false}]->(b)"));

ResultSet resultSet = api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, " +
"a.name, a.age, a.doubleValue, a.boolValue, a.nullValue, " +
"r.place, r.since, r.doubleValue, r.boolValue, r.nullValue");
"a.name, a.age, a.doubleValue, a.boolValue, " +
"r.place, r.since, r.doubleValue, r.boolValue");
Assert.assertNotNull(resultSet);


Expand Down Expand Up @@ -294,12 +289,12 @@ public void testRecord(){
edge = record.getValue("r");
Assert.assertEquals(expectedEdge, edge);

Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue", "a.nullValue",
"r.place", "r.since", "r.doubleValue", "r.boolValue", "r.nullValue"), record.keys());
Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue",
"r.place", "r.since", "r.doubleValue", "r.boolValue"), record.keys());

Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge,
name, (long)age, doubleValue, true, null,
place, (long)since, doubleValue, false, null),
name, (long)age, doubleValue, true,
place, (long)since, doubleValue, false),
record.values());

Node a = record.getValue("a");
Expand Down Expand Up @@ -602,7 +597,6 @@ public void testContextedAPI() {
Property<Double> doubleProperty = new Property<>("doubleValue", doubleValue);
Property<Boolean> trueBooleanProperty = new Property<>("boolValue", true);
Property<Boolean> falseBooleanProperty = new Property<>("boolValue", false);
Property<?> nullProperty = new Property<>("nullValue", null);

Property<String> placeProperty = new Property<>("place", place);
Property<Integer> sinceProperty = new Property<>("since", since);
Expand All @@ -614,7 +608,6 @@ public void testContextedAPI() {
expectedNode.addProperty(ageProperty);
expectedNode.addProperty(doubleProperty);
expectedNode.addProperty(trueBooleanProperty);
expectedNode.addProperty(nullProperty);

Edge expectedEdge = new Edge();
expectedEdge.setId(0);
Expand All @@ -625,22 +618,21 @@ public void testContextedAPI() {
expectedEdge.addProperty(sinceProperty);
expectedEdge.addProperty(doubleProperty);
expectedEdge.addProperty(falseBooleanProperty);
expectedEdge.addProperty(nullProperty);

Map<String, Object> params = new HashMap<>();
params.put("name", name);
params.put("age", age);
params.put("boolValue", boolValue);
params.put("doubleValue", doubleValue);
try (RedisGraphContext c = api.getContext()) {
Assert.assertNotNull(c.query("social", "CREATE (:person{name:$name, age:$age, doubleValue:$doubleValue, boolValue:$boolValue, nullValue:null})", params));
Assert.assertNotNull(c.query("social", "CREATE (:person{name:$name, age:$age, doubleValue:$doubleValue, boolValue:$boolValue})", params));
Assert.assertNotNull(c.query("social", "CREATE (:person{name:'amit',age:30})"));
Assert.assertNotNull(c.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') " +
"CREATE (a)-[:knows{place:'TLV', since:2000,doubleValue:3.14, boolValue:false, nullValue:null}]->(b)"));
"CREATE (a)-[:knows{place:'TLV', since:2000,doubleValue:3.14, boolValue:false}]->(b)"));

ResultSet resultSet = c.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, " +
"a.name, a.age, a.doubleValue, a.boolValue, a.nullValue, " +
"r.place, r.since, r.doubleValue, r.boolValue, r.nullValue");
"a.name, a.age, a.doubleValue, a.boolValue, " +
"r.place, r.since, r.doubleValue, r.boolValue");
Assert.assertNotNull(resultSet);

Assert.assertEquals(0, resultSet.getStatistics().nodesCreated());
Expand Down Expand Up @@ -671,12 +663,12 @@ public void testContextedAPI() {
edge = record.getValue("r");
Assert.assertEquals(expectedEdge, edge);

Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue", "a.nullValue",
"r.place", "r.since", "r.doubleValue", "r.boolValue", "r.nullValue"), record.keys());
Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue",
"r.place", "r.since", "r.doubleValue", "r.boolValue"), record.keys());

Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge,
name, (long)age, doubleValue, true, null,
place, (long)since, doubleValue, false, null),
name, (long)age, doubleValue, true,
place, (long)since, doubleValue, false),
record.values());

Node a = record.getValue("a");
Expand Down

0 comments on commit b0adafa

Please sign in to comment.