Skip to content

Commit b0adafa

Browse files
author
DvirDukhan
authored
removed null properties (#94)
1 parent 91ad263 commit b0adafa

File tree

1 file changed

+16
-24
lines changed

1 file changed

+16
-24
lines changed

‎src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ public void testRecord(){
210210
Property<Double> doubleProperty = new Property<>("doubleValue", doubleValue);
211211
Property<Boolean> trueBooleanProperty = new Property<>("boolValue", true);
212212
Property<Boolean> falseBooleanProperty = new Property<>("boolValue", false);
213-
Property<?> nullProperty = new Property<>("nullValue", null);
214213

215214
Property<String> placeProperty = new Property<>("place", place);
216215
Property<Integer> sinceProperty = new Property<>("since", since);
@@ -222,13 +221,11 @@ public void testRecord(){
222221
expectedNode.addProperty(ageProperty);
223222
expectedNode.addProperty(doubleProperty);
224223
expectedNode.addProperty(trueBooleanProperty);
225-
expectedNode.addProperty(nullProperty);
226224
Assert.assertEquals(
227225
"Node{labels=[person], id=0, "
228226
+ "propertyMap={name=Property{name='name', value=roi}, "
229227
+ "boolValue=Property{name='boolValue', value=true}, "
230228
+ "doubleValue=Property{name='doubleValue', value=3.14}, "
231-
+ "nullValue=Property{name='nullValue', value=null}, "
232229
+ "age=Property{name='age', value=32}}}", expectedNode.toString());
233230

234231
Edge expectedEdge = new Edge();
@@ -240,12 +237,10 @@ public void testRecord(){
240237
expectedEdge.addProperty(sinceProperty);
241238
expectedEdge.addProperty(doubleProperty);
242239
expectedEdge.addProperty(falseBooleanProperty);
243-
expectedEdge.addProperty(nullProperty);
244240
Assert.assertEquals("Edge{relationshipType='knows', source=0, destination=1, id=0, "
245241
+ "propertyMap={boolValue=Property{name='boolValue', value=false}, "
246242
+ "place=Property{name='place', value=TLV}, "
247243
+ "doubleValue=Property{name='doubleValue', value=3.14}, "
248-
+ "nullValue=Property{name='nullValue', value=null}, "
249244
+ "since=Property{name='since', value=2000}}}", expectedEdge.toString());
250245

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

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

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

267262

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

297-
Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue", "a.nullValue",
298-
"r.place", "r.since", "r.doubleValue", "r.boolValue", "r.nullValue"), record.keys());
292+
Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue",
293+
"r.place", "r.since", "r.doubleValue", "r.boolValue"), record.keys());
299294

300295
Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge,
301-
name, (long)age, doubleValue, true, null,
302-
place, (long)since, doubleValue, false, null),
296+
name, (long)age, doubleValue, true,
297+
place, (long)since, doubleValue, false),
303298
record.values());
304299

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

607601
Property<String> placeProperty = new Property<>("place", place);
608602
Property<Integer> sinceProperty = new Property<>("since", since);
@@ -614,7 +608,6 @@ public void testContextedAPI() {
614608
expectedNode.addProperty(ageProperty);
615609
expectedNode.addProperty(doubleProperty);
616610
expectedNode.addProperty(trueBooleanProperty);
617-
expectedNode.addProperty(nullProperty);
618611

619612
Edge expectedEdge = new Edge();
620613
expectedEdge.setId(0);
@@ -625,22 +618,21 @@ public void testContextedAPI() {
625618
expectedEdge.addProperty(sinceProperty);
626619
expectedEdge.addProperty(doubleProperty);
627620
expectedEdge.addProperty(falseBooleanProperty);
628-
expectedEdge.addProperty(nullProperty);
629621

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

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

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

674-
Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue", "a.nullValue",
675-
"r.place", "r.since", "r.doubleValue", "r.boolValue", "r.nullValue"), record.keys());
666+
Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue",
667+
"r.place", "r.since", "r.doubleValue", "r.boolValue"), record.keys());
676668

677669
Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge,
678-
name, (long)age, doubleValue, true, null,
679-
place, (long)since, doubleValue, false, null),
670+
name, (long)age, doubleValue, true,
671+
place, (long)since, doubleValue, false),
680672
record.values());
681673

682674
Node a = record.getValue("a");

0 commit comments

Comments
 (0)