bug fix tests

Author: DvirDukhan

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

@@ -303,6 +303,7 @@ public void testMultiThread(){
 
         Property nameProperty = new Property("name", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "roi");
         Property ageProperty = new Property("age", ResultSet.ResultSetScalarTypes.PROPERTY_INTEGER, 32);
+        Property lastNameProperty =new Property("lastName", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "a");
 
         Node expectedNode = new Node();
         expectedNode.setId(0);
@@ -321,36 +322,160 @@ public void testMultiThread(){
         for (ResultSet resultSet : resultSets){
             Assert.assertNotNull(resultSet.getHeader());
             Header header = resultSet.getHeader();
-
             List<String> schemaNames = header.getSchemaNames();
             List<Header.ResultSetColumnTypes> schemaTypes = header.getSchemaTypes();
-
             Assert.assertNotNull(schemaNames);
             Assert.assertNotNull(schemaTypes);
-
             Assert.assertEquals(3, schemaNames.size());
             Assert.assertEquals(3, schemaTypes.size());
-
             Assert.assertEquals("a", schemaNames.get(0));
             Assert.assertEquals("r", schemaNames.get(1));
             Assert.assertEquals("a.age", schemaNames.get(2));
-
             Assert.assertEquals(COLUMN_NODE, schemaTypes.get(0));
             Assert.assertEquals(COLUMN_RELATION, schemaTypes.get(1));
             Assert.assertEquals(COLUMN_SCALAR, schemaTypes.get(2));
-
             Assert.assertEquals(1, resultSet.size());
             Assert.assertTrue(resultSet.hasNext());
             Record record = resultSet.next();
             Assert.assertFalse(resultSet.hasNext());
+            Assert.assertEquals(Arrays.asList("a", "r", "a.age"), record.keys());
+            Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge, 32), record.values());
+        }
 
+        //test for update in local cache
+        expectedNode.removeProperty("name");
+        expectedNode.removeProperty("age");
+        expectedNode.addProperty(lastNameProperty);
+        expectedNode.removeLabel("person");
+        expectedNode.addLabel("worker");
+        expectedNode.setId(2);
 
-            Assert.assertEquals(Arrays.asList("a", "r", "a.age"), record.keys());
 
-            Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge, 32), record.values());
+        expectedEdge.setRelationshipType("worksWith");
+        expectedEdge.setSource(2);
+        expectedEdge.setDestination(3);
+        expectedEdge.setId(1);
+
+        Assert.assertNotNull(api.query("social", "CREATE (:worker{lastName:'a'})"));
+        Assert.assertNotNull(api.query("social", "CREATE (:worker{lastName:'b'})"));
+        Assert.assertNotNull(api.query("social", "MATCH (a:worker), (b:worker) WHERE (a.lastName = 'a' AND b.lastName='b')  CREATE (a)-[:worksWith]->(b)"));
+
+        resultSets = IntStream.range(0,16).parallel().
+                mapToObj(i-> api.query("social", "MATCH (a:worker)-[r:worksWith]->(b:worker) RETURN a,r")).
+                collect(Collectors.toList());
+
+        for (ResultSet resultSet : resultSets){
+            Assert.assertNotNull(resultSet.getHeader());
+            Header header = resultSet.getHeader();
+            List<String> schemaNames = header.getSchemaNames();
+            List<Header.ResultSetColumnTypes> schemaTypes = header.getSchemaTypes();
+            Assert.assertNotNull(schemaNames);
+            Assert.assertNotNull(schemaTypes);
+            Assert.assertEquals(2, schemaNames.size());
+            Assert.assertEquals(2, schemaTypes.size());
+            Assert.assertEquals("a", schemaNames.get(0));
+            Assert.assertEquals("r", schemaNames.get(1));
+            Assert.assertEquals(COLUMN_NODE, schemaTypes.get(0));
+            Assert.assertEquals(COLUMN_RELATION, schemaTypes.get(1));
+            Assert.assertEquals(1, resultSet.size());
+            Assert.assertTrue(resultSet.hasNext());
+            Record record = resultSet.next();
+            Assert.assertFalse(resultSet.hasNext());
+            Assert.assertEquals(Arrays.asList("a", "r"), record.keys());
+            Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge), record.values());
         }
     }
 
+
+    @Test
+    public void testAdditionToProcedures(){
+
+        Assert.assertNotNull(api.query("social", "CREATE (:person{name:'roi',age:32})"));
+        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]->(b)"));
+
+
+        List<ResultSet> resultSets = IntStream.range(0,16).parallel().
+                mapToObj(i-> api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r")).
+                collect(Collectors.toList());
+
+        //expected objects init
+        Property nameProperty = new Property("name", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "roi");
+        Property ageProperty = new Property("age", ResultSet.ResultSetScalarTypes.PROPERTY_INTEGER, 32);
+        Property lastNameProperty =new Property("lastName", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "a");
+
+        Node expectedNode = new Node();
+        expectedNode.setId(0);
+        expectedNode.addLabel("person");
+        expectedNode.addProperty(nameProperty);
+        expectedNode.addProperty(ageProperty);
+
+
+        Edge expectedEdge = new Edge();
+        expectedEdge.setId(0);
+        expectedEdge.setSource(0);
+        expectedEdge.setDestination(1);
+        expectedEdge.setRelationshipType("knows");
+
+
+        ResultSet resultSet = api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r");
+        Assert.assertNotNull(resultSet.getHeader());
+        Header header = resultSet.getHeader();
+        List<String> schemaNames = header.getSchemaNames();
+        List<Header.ResultSetColumnTypes> schemaTypes = header.getSchemaTypes();
+        Assert.assertNotNull(schemaNames);
+        Assert.assertNotNull(schemaTypes);
+        Assert.assertEquals(2, schemaNames.size());
+        Assert.assertEquals(2, schemaTypes.size());
+        Assert.assertEquals("a", schemaNames.get(0));
+        Assert.assertEquals("r", schemaNames.get(1));
+        Assert.assertEquals(COLUMN_NODE, schemaTypes.get(0));
+        Assert.assertEquals(COLUMN_RELATION, schemaTypes.get(1));
+        Assert.assertEquals(1, resultSet.size());
+        Assert.assertTrue(resultSet.hasNext());
+        Record record = resultSet.next();
+        Assert.assertFalse(resultSet.hasNext());
+        Assert.assertEquals(Arrays.asList("a", "r"), record.keys());
+        Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge), record.values());
+
+        //test for local cache updates
+
+        expectedNode.removeProperty("name");
+        expectedNode.removeProperty("age");
+        expectedNode.addProperty(lastNameProperty);
+        expectedNode.removeLabel("person");
+        expectedNode.addLabel("worker");
+        expectedNode.setId(2);
+        expectedEdge.setRelationshipType("worksWith");
+        expectedEdge.setSource(2);
+        expectedEdge.setDestination(3);
+        expectedEdge.setId(1);
+        Assert.assertNotNull(api.query("social", "CREATE (:worker{lastName:'a'})"));
+        Assert.assertNotNull(api.query("social", "CREATE (:worker{lastName:'b'})"));
+        Assert.assertNotNull(api.query("social", "MATCH (a:worker), (b:worker) WHERE (a.lastName = 'a' AND b.lastName='b')  CREATE (a)-[:worksWith]->(b)"));
+        resultSet = api.query("social", "MATCH (a:worker)-[r:worksWith]->(b:worker) RETURN a,r");
+        Assert.assertNotNull(resultSet.getHeader());
+        header = resultSet.getHeader();
+        schemaNames = header.getSchemaNames();
+        schemaTypes = header.getSchemaTypes();
+        Assert.assertNotNull(schemaNames);
+        Assert.assertNotNull(schemaTypes);
+        Assert.assertEquals(2, schemaNames.size());
+        Assert.assertEquals(2, schemaTypes.size());
+        Assert.assertEquals("a", schemaNames.get(0));
+        Assert.assertEquals("r", schemaNames.get(1));
+        Assert.assertEquals(COLUMN_NODE, schemaTypes.get(0));
+        Assert.assertEquals(COLUMN_RELATION, schemaTypes.get(1));
+        Assert.assertEquals(1, resultSet.size());
+        Assert.assertTrue(resultSet.hasNext());
+        record = resultSet.next();
+        Assert.assertFalse(resultSet.hasNext());
+        Assert.assertEquals(Arrays.asList("a", "r"), record.keys());
+        Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge), record.values());
+
+    }
+
+
     @Test
     public void testEscapedQuery() {
         Assert.assertNotNull(api.query("social", "CREATE (:escaped{s1:%s,s2:%s})", "S\"\'", "S\\'\\\""));