extends tests

Author: gkorland

src/main/java/com/redislabs/redisgraph/ResultSet.java

@@ -1,6 +1,7 @@
 package com.redislabs.redisgraph;
 
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * Hold a query result
@@ -11,4 +12,6 @@ public interface ResultSet extends Iterator<Record>{
 	 * @return statistics object
 	 */
 	Statistics getStatistics();
+
+	List<String> getHeader();
 }

src/main/java/com/redislabs/redisgraph/impl/ResultSetImpl.java

@@ -46,6 +46,7 @@ public ResultSetImpl(List<Object> resp) {
     }
   }
 
+  @Override
   public List<String> getHeader(){
     return header;
   }

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

@@ -1,5 +1,8 @@
 package com.redislabs.redisgraph;
 
+import java.util.Arrays;
+import java.util.NoSuchElementException;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,16 +20,21 @@ public RedisGraphAPITest() {
     }
 
     @Before
-    public void deleteGraph() throws Exception{
+    public void deleteGraph(){
     	api.deleteGraph();
     }
 
     @Test
-    public void testCreateNode() throws Exception {
+    public void testCreateNode(){
         // Create a node    	
     	ResultSet result = api.query("CREATE ({name:'roi',age:32})");
     	Assert.assertFalse(result.hasNext());
 
+    	try {
+    	  result.next();
+    	  Assert.fail();
+    	}catch(NoSuchElementException e) {}
+    	
     	Assert.assertEquals(1, result.getStatistics().nodesCreated());
     	Assert.assertNull(result.getStatistics().getStringValue(Label.NODES_DELETED));
     	Assert.assertNull(result.getStatistics().getStringValue(Label.RELATIONSHIPS_CREATED));
@@ -36,7 +44,7 @@ public void testCreateNode() throws Exception {
     }
 
     @Test
-    public void testCreateLabeledNode() throws Exception {    	
+    public void testCreateLabeledNode(){    	
         // Create a node with a label
     	ResultSet result = api.query("CREATE (:human{name:'danny',age:12})");
     	Assert.assertFalse(result.hasNext());
@@ -47,7 +55,7 @@ public void testCreateLabeledNode() throws Exception {
     }
 
     @Test
-    public void testConnectNodes() throws Exception {
+    public void testConnectNodes(){
         // Create both source and destination nodes
         Assert.assertNotNull(api.query("CREATE (:person{name:'roi',age:32})"));
         Assert.assertNotNull(api.query("CREATE (:person{name:'amit',age:30})"));
@@ -64,7 +72,7 @@ public void testConnectNodes() throws Exception {
     }
 
     @Test
-    public void testIndex() throws Exception {
+    public void testIndex(){
         // Create both source and destination nodes
       Assert.assertNotNull(api.query("CREATE (:person{name:'roi',age:32})"));
 
@@ -80,7 +88,7 @@ public void testIndex() throws Exception {
 
 
     @Test
-    public void testQuery() throws Exception {
+    public void testQuery(){
 
         // Create both source and destination nodes    	
         Assert.assertNotNull(api.query("CREATE (:qhuman{name:'roi',age:32})"));
@@ -92,6 +100,9 @@ public void testQuery() throws Exception {
         // Query
         ResultSet resultSet = api.query("MATCH (a:qhuman)-[knows]->(:qhuman) RETURN a");
 
+        Assert.assertEquals(Arrays.asList("a.age", "a.name"), resultSet.getHeader());
+        Assert.assertEquals("[a.age, a.name]\n[[32.000000, roi]]\n" + resultSet.getStatistics(), resultSet.toString());        
+        
     	Assert.assertTrue(resultSet.hasNext());
     	Assert.assertEquals(0, resultSet.getStatistics().nodesCreated());
     	Assert.assertEquals(0, resultSet.getStatistics().propertiesSet());
@@ -100,8 +111,16 @@ public void testQuery() throws Exception {
     	Assert.assertNotNull(resultSet.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME)); 
 
     	Record record = resultSet.next();
+    	Assert.assertEquals( Arrays.asList("a.age", "a.name"), record.keys());
+    	Assert.assertEquals( Arrays.asList("32.000000", "roi"), record.values());
+    	Assert.assertTrue(record.containsKey("a.name"));
+        Assert.assertEquals( 2, record.size());
+        Assert.assertEquals( "[32.000000, roi]", record.toString());
+        
     	Assert.assertEquals( "roi", record.getString(1));
     	Assert.assertEquals( "32.000000", record.getString(0));
-    	
+        Assert.assertEquals( "roi", record.getString("a.name"));
+        Assert.assertEquals( "32.000000", record.getString("a.age"));     
+
     }
 }