From a3cf31aa401288647bd0dd715587d3a00b93f844 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Tue, 21 Dec 2010 22:51:42 -0500
Subject: [PATCH] Tests now explicitly specify relative path to tested module -
 Certain modules otherwise have naming conflicts (e.g. util in node.js is
 loaded instead)

---
 test/common.js                  | 2 +-
 test/test-class-constructor.js  | 2 +-
 test/test-class-extend.js       | 2 +-
 test/test-class-gettersetter.js | 2 +-
 test/test-class-parent.js       | 2 +-
 test/test-class.js              | 2 +-
 test/test-combine.js            | 2 +-
 test/test-index.js              | 2 +-
 test/test-interface-extend.js   | 2 +-
 test/test-interface.js          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/common.js b/test/common.js
index f432d64..67b762e 100644
--- a/test/common.js
+++ b/test/common.js
@@ -22,5 +22,5 @@
  * @package test
  */
 
-require.paths.unshift( __dirname + '/../lib' );
+// may be implemented in the future
 
diff --git a/test/test-class-constructor.js b/test/test-class-constructor.js
index b6adbcd..df560fd 100644
--- a/test/test-class-constructor.js
+++ b/test/test-class-constructor.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert = require( 'assert' ),
-    Class  = require( 'class' );
+    Class  = require( '../lib/class' );
 
 // these two variables are declared outside of the class to ensure that they
 // will still be set even if the context of the constructor is wrong
diff --git a/test/test-class-extend.js b/test/test-class-extend.js
index 92771bd..cb93bc0 100644
--- a/test/test-class-extend.js
+++ b/test/test-class-extend.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert = require( 'assert' ),
-    Class  = require( 'class' );
+    Class  = require( '../lib/class' );
 
 var foo_props = {
         one: 1,
diff --git a/test/test-class-gettersetter.js b/test/test-class-gettersetter.js
index 5d2d663..dcf5f5a 100644
--- a/test/test-class-gettersetter.js
+++ b/test/test-class-gettersetter.js
@@ -31,7 +31,7 @@ if ( Object.prototype.__defineGetter__ === undefined )
 require( './common' );
 
 var assert = require( 'assert' ),
-    Class  = require( 'class' );
+    Class  = require( '../lib/class' );
 
 
 var Foo = Class.extend(
diff --git a/test/test-class-parent.js b/test/test-class-parent.js
index e05be78..25187de 100644
--- a/test/test-class-parent.js
+++ b/test/test-class-parent.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert = require( 'assert' ),
-    Class  = require( 'class' );
+    Class  = require( '../lib/class' );
 
 var Foo = Class.extend(
 {
diff --git a/test/test-class.js b/test/test-class.js
index 1e29952..4e4c415 100644
--- a/test/test-class.js
+++ b/test/test-class.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert = require( 'assert' ),
-    Class  = require( 'class' );
+    Class  = require( '../lib/class' );
 
 
 assert.ok(
diff --git a/test/test-combine.js b/test/test-combine.js
index 0cf4dc6..926164c 100644
--- a/test/test-combine.js
+++ b/test/test-combine.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert  = require( 'assert' ),
-    Class   = require( 'class' ),
+    Class   = require( '../lib/class' ),
     Script  = process.binding( 'evals' ).Script,
     sandbox = {};
 
diff --git a/test/test-index.js b/test/test-index.js
index b130160..6a09cf9 100644
--- a/test/test-index.js
+++ b/test/test-index.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert = require( 'assert' ),
-    Class  = require( 'class' ),
+    Class  = require( '../lib/class' ),
     index  = require( '../' );
 
 
diff --git a/test/test-interface-extend.js b/test/test-interface-extend.js
index c08f2fc..52a5693 100644
--- a/test/test-interface-extend.js
+++ b/test/test-interface-extend.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert         = require( 'assert' ),
-    Interface      = require( 'interface' ),
+    Interface      = require( '../lib/interface' ),
     abstractMethod = Interface.abstractMethod;
 
 
diff --git a/test/test-interface.js b/test/test-interface.js
index b6a37cb..7485f2d 100644
--- a/test/test-interface.js
+++ b/test/test-interface.js
@@ -25,7 +25,7 @@
 require( './common' );
 
 var assert         = require( 'assert' ),
-    Interface      = require( 'interface' ),
+    Interface      = require( '../lib/interface' ),
     abstractMethod = Interface.abstractMethod;
 
 var FooType = Interface.extend();