From 782e2c96cb4d52f8793d3036b56e63a109e9ccf1 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mikegerwitz@gnu.org>
Date: Tue, 7 Jan 2014 04:12:22 -0500
Subject: [PATCH] Moved test-class_builder-visibility into suite as
 ClassBuilder/VisibilityTest

---
 .../VisibilityTest.js}                        | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)
 rename test/{test-class_builder-visibility.js => ClassBuilder/VisibilityTest.js} (75%)

diff --git a/test/test-class_builder-visibility.js b/test/ClassBuilder/VisibilityTest.js
similarity index 75%
rename from test/test-class_builder-visibility.js
rename to test/ClassBuilder/VisibilityTest.js
index 3148887..f850828 100644
--- a/test/test-class_builder-visibility.js
+++ b/test/ClassBuilder/VisibilityTest.js
@@ -1,8 +1,6 @@
 /**
  * Tests class builder visibility implementation
  *
- * See also: test-class-visibility.js
- *
  *  Copyright (C) 2011, 2012, 2013 Mike Gerwitz
  *
  *  This file is part of GNU ease.js.
@@ -19,29 +17,31 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ * See also: Class/VisibilityTest
  */
 
-var common  = require( './common' ),
-    assert  = require( 'assert' ),
-    util    = common.require( 'util' ),
-
-    // XXX: get rid of this disgusting mess; we're mid-refactor and all these
-    // dependencies should not be necessary for testing
-    ClassBuilder         = common.require( '/ClassBuilder' ),
-    MethodWrapperFactory = common.require( '/MethodWrapperFactory' ),
-    wrappers             = common.require( '/MethodWrappers' ).standard
-;
-
-
 require( 'common' ).testCase(
 {
+    caseSetUp: function()
+    {
+        // XXX: get rid of this disgusting mess; we're mid-refactor and all
+        // these dependencies should not be necessary for testing
+        this.Sut                  = this.require( 'ClassBuilder' );
+        this.MethodWrapperFactory = this.require( 'MethodWrapperFactory' );
+
+        this.wrappers = this.require( 'MethodWrappers' ).standard;
+        this.util     = this.require( 'util' );
+    },
+
+
     setUp: function()
     {
-        this.builder = ClassBuilder(
+        this.builder = this.Sut(
             this.require( '/MemberBuilder' )(
-                MethodWrapperFactory( wrappers.wrapNew ),
-                MethodWrapperFactory( wrappers.wrapOverride ),
-                MethodWrapperFactory( wrappers.wrapProxy ),
+                this.MethodWrapperFactory( this.wrappers.wrapNew ),
+                this.MethodWrapperFactory( this.wrappers.wrapOverride ),
+                this.MethodWrapperFactory( this.wrappers.wrapProxy ),
                 this.getMock( 'MemberBuilderValidator' )
             ),
             this.require( '/VisibilityObjectFactoryFactory' ).fromEnvironment()
@@ -79,9 +79,9 @@ require( 'common' ).testCase(
         );
 
         // the property should be read-only
-        if ( util.definePropertyFallback() === false )
+        if ( this.util.definePropertyFallback() === false )
         {
-            assert.equal(
+            this.assertEqual(
                 Object.getOwnPropertyDescriptor( ref, '__inst' ).writable,
                 false,
                 "this.__inst is not writable"