Add Record and cleanup tests

Author: gkorland

src/record.js

@@ -0,0 +1,38 @@
+/**
+ * Hold a query record
+ */
+module.exports = class Record {
+	
+    constructor(header, values){
+    	this._header = header;
+    	this._values = values;
+    }
+    
+	getString(key) {
+		let index = key;
+		if(typeof key === "string"){
+			index = this._header.indexOf(key);
+		}
+		return this._values[index];
+	}
+
+	keys() {
+		return this._header;
+	}
+
+	values() {
+		return this._values;
+	}
+
+	containsKey(key) {
+		return this._header.includes(key);
+	}
+
+	size() {
+		return this._header.length;
+	}
+	
+	toString() {
+		return this._values.toString();
+	}
+}

src/redisGraph.js

@@ -39,7 +39,7 @@ module.exports = class RedisGraph {
      * @return delete running time statistics 
      */
     deleteGraph() {
-		return this._sendCommand('graph.DELETE',[this._graphId, query])
+		return this._sendCommand('graph.DELETE',[this._graphId])
 		.then((res) => {
 			return new ResultSet(res);
 		});

src/resultSet.js

@@ -1,25 +1,29 @@
-const Statistics = require('./statistics').Statistics;
+const Statistics = require('./statistics').Statistics,
+	Record = require('./record');
 
 /**
  * Hold a query result
  */
 module.exports = class ResultSet {
 
     constructor(resp) {
-
-    	this._position = 1;
+    	this._position = 0;
     	this._statistics = new Statistics(resp[1]);
-    	this._results = resp[0];
+    	
+    	let result = resp[0];
 
         // Empty result set
-        if(this._results === null || this._results.length === 0) {
+        if(result === null || result.length === 0) {
         	this._header = [];
             this._totalResults = 0;
+	        this._results = [];    
         } else {
-        	this._header = this._results[0];
-
-        	// First row is a header row
-        	this._totalResults = this._results.length - 1;
+        	this._header = result[0];
+        	this._totalResults = result.length - 1;
+        	this._results = new Array(this._totalResults);
+        	for(let i = 0 ; i < this._totalResults; ++i){
+        		this._results[i] = new Record(this._header, result[i+1]);
+        	}
         }
     }
 
@@ -28,7 +32,7 @@ module.exports = class ResultSet {
     }
 
 	hasNext() {
-		return this._position <= this._totalResults;
+		return this._position < this._totalResults;
 	}
 
 	next() {

test/redisGraphAPITest.js

@@ -3,19 +3,15 @@ Label = require('../src/statistics').Label,
 RedisGraphAPI = require('../src/redisGraph');
 
 describe('RedisGraphAPI Test', () =>{
-	const api = new RedisGraphAPI("social"); 
-
+	const api = new RedisGraphAPI("social");
+	
 	beforeEach( () => {
-		//api.deleteGraph(); - TODO add this back once we implement this API
-
-//		Method method = RedisGraphAPI.class.getDeclaredMethod("_conn");
-//		method.setAccessible(true);
-//		((Jedis)method.invoke(api)).flushDB();
+		return api.deleteGraph();
 	});
 
-	it('test Create Node', (done) => {
+	it('test Create Node', () => {
 		// Create a node    	
-		api.query("CREATE ({name:'roi',age:32})")
+		return api.query("CREATE ({name:'roi',age:32})")
 		.then( (result) => {
 			assert.ok(!result.hasNext());		    	
 			assert.equal(1, result.getStatistics().nodesCreated());
@@ -24,56 +20,53 @@ describe('RedisGraphAPI Test', () =>{
 			assert.ifError(result.getStatistics().getStringValue(Label.RELATIONSHIPS_DELETED));
 			assert.equal(2, result.getStatistics().propertiesSet());
 			assert.ok(result.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME));   
-			done();
 		});
 	});
 
-	it('test Create Labeled Node', (done) => {    	
+	it('test Create Labeled Node', () => {    	
 		// Create a node with a label
-		api.query("CREATE (:human{name:'danny',age:12})")
+		return api.query("CREATE (:human{name:'danny',age:12})")
 		.then( (result) => {
 			assert.ok(!result.hasNext());
 			assert.equal("1", result.getStatistics().getStringValue(Label.NODES_CREATED));
 			assert.equal("2", result.getStatistics().getStringValue(Label.PROPERTIES_SET));
 			assert.ok(result.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME)); 
-			done();
 		});
 	});
 
-	it('test Connect Nodes', (done) => {
+	it('test Connect Nodes', () => {
 		// Create both source and destination nodes
 		let createResult1 = api.query("CREATE (:person{name:'roi',age:32})");
 		let createResult2 = api.query("CREATE (:person{name:'amit',age:30})");
 
 		// Connect source and destination nodes.
-		api.query("MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit')  CREATE (a)-[knows]->(a)")
+		return api.query("MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit')  CREATE (a)-[knows]->(a)")
 		.then( (matchResult) => {
 			assert.ok(!matchResult.hasNext());
 			assert.ifError(matchResult.getStatistics().getStringValue(Label.NODES_CREATED));
 			assert.ifError(matchResult.getStatistics().getStringValue(Label.PROPERTIES_SET));
 			assert.equal(1, matchResult.getStatistics().relationshipsCreated());
 			assert.equal(0, matchResult.getStatistics().relationshipsDeleted());
 			assert.ok(matchResult.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME)); 
-			done();
 		});
 	});
 
-	it('test Query', (done) => {
+	it('test Query', () => {
 
 		// Create both source and destination nodes    	
-		api.query("CREATE (:qhuman{name:'roi',age:32})")
-		.then( (create1Result) => {
+		return api.query("CREATE (:qhuman{name:'roi',age:32})")
+		.then( (create1Result) => {	
 			return api.query("CREATE (:qhuman{name:'amit',age:30})");
 		})
 		.then( (create2Result) => {
 			// Connect source and destination nodes.
-			return api.query("MATCH (a:qhuman), (b:qhuman) WHERE (a.name = 'roi' AND b.name='amit')  CREATE (a)-[knows]->(b)");
+			return api.query("MATCH (a:qhuman), (b:qhuman) WHERE (a.name = 'roi' AND b.name='amit') CREATE (a)-[knows]->(b)");
 		})
 		.then( (connectResult) => {
 			// Query
 			return api.query("MATCH (a:qhuman)-[knows]->(:qhuman) RETURN a");
 		})
-		.then( (resultSet) => {
+		.then( (resultSet) => {	
 			assert.ok(resultSet.hasNext());
 			assert.equal(0, resultSet.getStatistics().nodesCreated());
 			assert.equal(0, resultSet.getStatistics().propertiesSet());
@@ -84,7 +77,6 @@ describe('RedisGraphAPI Test', () =>{
 			let record = resultSet.next();
 			assert.equal( "roi", record.getString(1));
 			assert.equal( "32.000000", record.getString(0));
-			done();
 		});
 	});
 })