From e2110c4aec63ef4f8efecdbdb257eceba889b53c Mon Sep 17 00:00:00 2001
From: simov <simeonvelichkov@gmail.com>
Date: Tue, 9 Sep 2014 11:48:45 +0300
Subject: [PATCH] Fix tests

---
 lib/data/otm.js         |  2 ++
 test/editview/data.js   |  2 +-
 test/editview/format.js | 18 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/data/otm.js b/lib/data/otm.js
index 32ed7a2..400fb2d 100644
--- a/lib/data/otm.js
+++ b/lib/data/otm.js
@@ -25,3 +25,5 @@ exports.get = function (args, done) {
         });
     }, done);
 }
+
+exports._getData = getData;
diff --git a/test/editview/data.js b/test/editview/data.js
index 3f9004f..984f556 100644
--- a/test/editview/data.js
+++ b/test/editview/data.js
@@ -21,7 +21,7 @@ describe('data (editview)', function () {
             instance.x = new Xsql({dialect:db.client.name, schema:db.client.config.schema});
 
             setTimeout(function () {
-                data = require('../../lib/editview/data');
+                data = require('../../lib/data');
                 editview = require('../../lib/editview/index');
                 qb = require('../../lib/qb');
                 done();
diff --git a/test/editview/format.js b/test/editview/format.js
index dc86cff..70360f5 100644
--- a/test/editview/format.js
+++ b/test/editview/format.js
@@ -1,6 +1,6 @@
 
 var should = require('should');
-var format = require('../../lib/editview/format');
+var format = require('../../lib/format');
 
 
 describe('format (editview)', function () {
@@ -16,7 +16,7 @@ describe('format (editview)', function () {
                 { __pk: '2', __text: 'tea' }
             ]
         };
-        format.setActiveSingle(column, 1);
+        format.form.setActiveSingle(column, 1);
         column.value[2].selected.should.equal(true);
         done();
     });
@@ -32,7 +32,7 @@ describe('format (editview)', function () {
                 { __pk: '2', __text: 'tea' }
             ]
         };
-        format.setActiveMultiple(column, [5,2]);
+        format.form.setActiveMultiple(column, [5,2]);
         column.value[1].selected.should.equal(true);
         column.value[4].selected.should.equal(true);
         done();
@@ -41,22 +41,22 @@ describe('format (editview)', function () {
     // value
     it('get column\'s default value', function (done) {
         var column = {control: {text: true}, defaultValue: 22.50};
-        format.value(column, '').should.equal(22.50);
+        format.form.value(column, '').should.equal(22.50);
         done();
     });
     it('skip value formatting on empty string', function (done) {
         var column = {control: {text: true}};
-        format.value(column, '').should.equal('');
+        format.form.value(column, '').should.equal('');
         done();
     });
     it('return null on missing date value', function (done) {
         var column = {control: {date: true}};
-        should.equal(format.value(column, null), null);
+        should.equal(format.form.value(column, null), null);
         done();
     });
     it('return the date values formatted as YYYY-MM-DD', function (done) {
         var column = {control: {date: true}};
-        format.value(column, '2013-10-23 00:00:00').should.equal('2013-10-23');
+        format.form.value(column, '2013-10-23 00:00:00').should.equal('2013-10-23');
         done();
     });
     it('set the active item for a oneToMany select control', function (done) {
@@ -70,7 +70,7 @@ describe('format (editview)', function () {
                 { __pk: '2', __text: 'tea' }
             ]
         };
-        format.value(column, 1);
+        format.form.value(column, 1);
         column.value[2].selected.should.equal(true);
         done();
     });
@@ -85,7 +85,7 @@ describe('format (editview)', function () {
                 { __pk: '2', __text: 'tea' }
             ]
         };
-        format.value(column, [5,2]);
+        format.form.value(column, [5,2]);
         column.value[1].selected.should.equal(true);
         column.value[4].selected.should.equal(true);
         done();