From ee3d65e17ec541e00179964875d660ff3c409b2f Mon Sep 17 00:00:00 2001
From: oof1lab <oof1lab@gmail.com>
Date: Thu, 2 Nov 2017 17:51:08 +0000
Subject: [PATCH] tests for where clause

---
 README.md      |  2 +-
 lib/xapi.js    |  4 ---
 tests/tests.js | 87 ++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index edabc2e754..0fef4e171e 100644
--- a/README.md
+++ b/README.md
@@ -288,7 +288,7 @@ http://localhost:3000/download?name=fileName
 
 ## When NOT to use ?
 * If you are in need of a full blown MVC framework, ACL, Authorisation etc - Not this.
-* Other times not mentioned in when to use section
+* Other times not mentioned in when to use section 
 
 
 ### Command line options
diff --git a/lib/xapi.js b/lib/xapi.js
index 251989e3f4..f7b17f2093 100644
--- a/lib/xapi.js
+++ b/lib/xapi.js
@@ -194,10 +194,7 @@ class Xapi {
       this.app.get('/download', this.downloadFile.bind(this));
       /**************** END : multer routes ****************/
 
-
     }
-
-
   }
 
   async create(req, res) {
@@ -502,7 +499,6 @@ class Xapi {
 
   uploadFiles(req, res) {
 
-
     if (!req.files || req.files.length === 0) {
       res.end('upload failed')
     } else {
diff --git a/tests/tests.js b/tests/tests.js
index e217695c22..6858903f96 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1009,28 +1009,73 @@ describe('xmysql : tests', function () {
   });
 
 
-  // it('where clause unit ?_where=((a,eq,1)+and(b,eq,2))+or(c,eq,3) should PASS', function (done) {
-  //
-  //   var query = ''
-  //   var params = []
-  //   var err = whereClause.getWhereClause('((a,eq,1)+and(b,eq,2))+or(c,eq,3)',query,params)
-  //
-  //   err.err.should.be.equal(0)
-  //   err.query.should.be.equal('((??=?)and(??=?))or(??=?)')
-  //   err.params.length.should.be.equal(4)
-  //   err.params[0].should.be.equal('abc')
-  //   err.params[1].should.be.equal('1')
-  //   err.params[2].should.be.equal('b')
-  //   err.params[3].should.be.equal('2')
-  //
-  //   err.params[1].should.be.equal('1234')
-  //
-  //   done()
-  //
-  //   //console.log(query,params,err);
-  //
-  // });
+  it('where clause unit ?_where=((a,eq,1)+and(b,eq,2))+or(c,eq,3) should PASS', function (done) {
+
+    var query = ''
+    var params = []
+    var err = whereClause.getWhereClause('((abc,eq,1234)+and(b,eq,2))+or(cde,eq,3)',query,params)
+
+    err.err.should.be.equal(0)
+    err.query.should.be.equal('((??=?)and(??=?))or(??=?)')
+    err.params.length.should.be.equal(6)
+
+    err.params[0].should.be.equal('abc')
+    err.params[2].should.be.equal('b')
+    err.params[4].should.be.equal('cde')
+
+    err.params[1].should.be.equal('1234')
+    err.params[3].should.be.equal('2')
+    err.params[5].should.be.equal('3')
+
+    done()
+
+  });
+
+
+  it('where clause unit ?_where=((a,eq,1)+and(b,eq,2))+xor(c,eq,3) should PASS', function (done) {
+
+    var query = ''
+    var params = []
+    var err = whereClause.getWhereClause('((abc,eq,1234)+and(b,eq,2))+xor(cde,eq,3)',query,params)
 
+    err.err.should.be.equal(0)
+    err.query.should.be.equal('((??=?)and(??=?))xor(??=?)')
+    err.params.length.should.be.equal(6)
+
+    err.params[0].should.be.equal('abc')
+    err.params[2].should.be.equal('b')
+    err.params[4].should.be.equal('cde')
+
+    err.params[1].should.be.equal('1234')
+    err.params[3].should.be.equal('2')
+    err.params[5].should.be.equal('3')
+
+    done()
+
+  });
+
+
+  it('where clause unit ?_where=(a,eq,1)+and((b,eq,2)+or(c,eq,3)) should PASS', function (done) {
+
+    var query = ''
+    var params = []
+    var err = whereClause.getWhereClause('(a,eq,1)+and((b,eq,2)+or(c,eq,3))',query,params)
+
+    err.err.should.be.equal(0)
+    err.query.should.be.equal('(??=?)and((??=?)or(??=?))')
+    err.params.length.should.be.equal(6)
+
+    err.params[0].should.be.equal('a')
+    err.params[2].should.be.equal('b')
+    err.params[4].should.be.equal('c')
+
+    err.params[1].should.be.equal('1')
+    err.params[3].should.be.equal('2')
+    err.params[5].should.be.equal('3')
+
+    done()
+
+  });