From 6f9c103d78f6e361a71e4ffe79249826828da534 Mon Sep 17 00:00:00 2001
From: wltsmrz <wltsmrz@gmail.com>
Date: Tue, 10 Sep 2013 15:48:57 -0700
Subject: [PATCH] Update tests for future test coverage

---
 test/amount-test.js           | 12 +++++-------
 test/base58-test.js           |  5 ++---
 test/serializedobject-test.js |  3 ++-
 test/serializedtypes-test.js  | 21 ++++++++++++---------
 test/sign-test.js             |  3 ++-
 test/testutils.js             |  6 ++++++
 test/utils-test.js            |  2 +-
 7 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/test/amount-test.js b/test/amount-test.js
index f133ca64..a614ca00 100644
--- a/test/amount-test.js
+++ b/test/amount-test.js
@@ -1,12 +1,10 @@
 var assert     = require('assert');
-
-var jsbn       = require('../src/js/ripple/jsbn');
+var utils      = require('./testutils');
+var jsbn       = utils.load_module('jsbn');
 var BigInteger = jsbn.BigInteger;
-
-var Amount     = require('../src/js/ripple/amount').Amount;
-var UInt160    = require('../src/js/ripple/uint160').UInt160;
-
-var config     = require('./testutils').get_config();
+var Amount     = utils.load_module('amount').Amount;
+var UInt160    = utils.load_module('uint160').UInt160;
+var config     = utils.get_config();
 
 describe('Amount', function() {
   describe('Negatives', function() {
diff --git a/test/base58-test.js b/test/base58-test.js
index 2660fd3b..4383df4c 100644
--- a/test/base58-test.js
+++ b/test/base58-test.js
@@ -1,7 +1,6 @@
 var assert = require('assert');
-
-var Seed   = require('../src/js/ripple/seed').Seed;
-
+var utils  = require('./testutils');
+var Seed   = utils.load_module('seed').Seed;
 var config = require('./testutils').get_config();
 
 describe('Base58', function() {
diff --git a/test/serializedobject-test.js b/test/serializedobject-test.js
index ac7e9a20..09cf3a26 100644
--- a/test/serializedobject-test.js
+++ b/test/serializedobject-test.js
@@ -1,5 +1,6 @@
+var utils            = require('./testutils');
 var assert           = require('assert');
-var SerializedObject = require('../src/js/ripple/serializedobject').SerializedObject;
+var SerializedObject = utils.load_module('serializedobject').SerializedObject;
 
 describe('Serialied object', function() {
   describe('Serialized object', function() {
diff --git a/test/serializedtypes-test.js b/test/serializedtypes-test.js
index b2ae90a0..bf68d551 100644
--- a/test/serializedtypes-test.js
+++ b/test/serializedtypes-test.js
@@ -1,9 +1,9 @@
-var assert = require('assert');
-var SerializedObject = require('../src/js/ripple/serializedobject').SerializedObject;
-var types = require('../src/js/ripple/serializedtypes');
-
-var jsbn    = require('../src/js/ripple/jsbn');
-var BigInteger = jsbn.BigInteger;
+var utils            = require('./testutils');
+var assert           = require('assert');
+var SerializedObject = utils.load_module('serializedobject').SerializedObject;
+var types            = utils.load_module('serializedtypes');
+var jsbn             = utils.load_module('jsbn');
+var BigInteger       = jsbn.BigInteger;
 
 var config = require('./testutils').get_config();
 
@@ -467,7 +467,8 @@ describe('Serialized types', function() {
     it('Parse [[e],[e,e]]', function () {
       var so = new SerializedObject('31000000000000000000000000000000000000007B00000000000000000000000055534400000000000000000000000000000000000000000000000315FF31000000000000000000000000000000000000007B000000000000000000000000425443000000000000000000000000000000000000000000000003153100000000000000000000000000000000000003DB0000000000000000000000004555520000000000000000000000000000000000000000000000014100');
       parsed_path = types.PathSet.parse(so);
-      assert.deepEqual(parsed_path, [[{
+
+      var comp = [[{
         account :  { _value:  123 },
         currency:  {_value:   'USD'},
         issuer:    {_value:   789}}],
@@ -480,7 +481,9 @@ describe('Serialized types', function() {
           account :  {_value:  987},
           currency:  {_value:  'EUR'},
           issuer:    {_value:  321}
-        }]]);
+      }]];
+
+      assert.deepEqual(parsed_path, comp);
     });
   });
 
@@ -586,7 +589,7 @@ describe('Serialized types', function() {
     });
     it('Parse the same array 2', function () {
       var so = new SerializedObject('2E0000007B2014000001C8684000000000000315F1');
-      var parsed_object=types.Array.parse(so);
+      var parsed_object = types.Array.parse(so);
       //TODO: Is this correct? Return some things as integers, and others as objects?
       assert.deepEqual([123,456,789],[
                        parsed_object[0].DestinationTag,
diff --git a/test/sign-test.js b/test/sign-test.js
index 7662548f..695132ee 100644
--- a/test/sign-test.js
+++ b/test/sign-test.js
@@ -1,5 +1,6 @@
 var assert = require('assert');
-var Seed   = require('../src/js/ripple/seed').Seed;
+var utils  = require('./testutils');
+var Seed   = utils.load_module('seed').Seed;
 
 describe('Signing', function() {
   describe('Keys', function() {
diff --git a/test/testutils.js b/test/testutils.js
index 7fb0c7cd..1cab290c 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -16,3 +16,9 @@ exports.load_config = load_config;
 function load_config(config) {
   return( require('../src/js/ripple/config')).load(config);
 }
+
+exports.load_module = load_module;
+
+function load_module(name) {
+  return require((process.env.RIPPLE_LIB_COV ? '../lib-cov/' : '../src/js/ripple/') + name);
+}
diff --git a/test/utils-test.js b/test/utils-test.js
index 999d0df6..690b9664 100644
--- a/test/utils-test.js
+++ b/test/utils-test.js
@@ -1,6 +1,6 @@
 var fs     = require('fs');
 var assert = require('assert');
-var utils  = require('../src/js/ripple/utils.js');
+var utils  = require('./testutils').load_module('utils');
 
 describe('Utils', function() {
   describe('hexToString and stringToHex', function() {