From 6fc3d0516674f7692092bb8bb882b5321acdd83b Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Sun, 23 Oct 2011 01:11:09 -0400
Subject: [PATCH] [#25] Moved quick keyword validation into shared
 MemberBuilderValidator test module

---
 test/MemberBuilderValidator/MethodTest.js | 56 +++--------------------
 test/MemberBuilderValidator/inc-common.js | 53 +++++++++++++++++++++
 2 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/test/MemberBuilderValidator/MethodTest.js b/test/MemberBuilderValidator/MethodTest.js
index 163c19f..ab9558c 100644
--- a/test/MemberBuilderValidator/MethodTest.js
+++ b/test/MemberBuilderValidator/MethodTest.js
@@ -22,66 +22,24 @@
  * @package test
  */
 
+var shared = require( __dirname + '/inc-common' );
+
+
 require( 'common' ).testCase(
 {
     caseSetUp: function()
     {
         var _self = this;
 
-        /**
-         * Tests to ensure that a method with the given keywords fails
-         * validation with an error message partially matching the provided
-         * identifier
-         *
-         * To test overrides, specify keywords for 'prev'. To test for success
-         * instead of failure, set identifier to null.
-         */
         this.quickKeywordMethodTest = function( keywords, identifier, prev )
         {
-            var keyword_obj = {},
-                prev_obj    = {},
-                prev_data   = {},
-                name        = 'fooBar';
-
-            // convert our convenient array into a keyword obj
-            for ( var i = 0, len = keywords.length; i < len; i++ )
-            {
-                keyword_obj[ keywords[ i ] ] = true;
-            }
-
-            // if prev keywords were given, do the same thing with those to
-            // generate our keyword obj
-            if ( prev !== undefined )
-            {
-                for ( var i = 0, len = prev.length; i < len; i++ )
-                {
-                    prev_obj[ prev[ i ] ] = true;
-                }
-
-                // define a dummy previous method value
-                prev_data = { member: function() {} };
-            }
-
-            var testfunc = function()
-            {
-                _self.sut.validateMethod(
-                    name, function() {}, keyword_obj, prev_data, prev_obj
-                );
-            };
-
-            if ( identifier )
-            {
-                _self.quickFailureTest( name, identifier, testfunc );
-            }
-            else
-            {
-                _self.assertDoesNotThrow( testfunc, Error );
-            }
+            shared.quickKeywordTest.call( this,
+                'validateMethod', keywords, identifier, prev
+            );
         };
 
 
-        this.quickFailureTest = require( __dirname + '/inc-common' )
-            .quickFailureTest;
+        this.quickFailureTest = shared.quickFailureTest;
 
 
         this.quickVisChangeTest = function( start, override, failtest )
diff --git a/test/MemberBuilderValidator/inc-common.js b/test/MemberBuilderValidator/inc-common.js
index d7d7b41..6128d1d 100644
--- a/test/MemberBuilderValidator/inc-common.js
+++ b/test/MemberBuilderValidator/inc-common.js
@@ -67,3 +67,56 @@ exports.quickFailureTest = function( name, identifier, action )
 
     _self.fail( "Expected failure" );
 };
+
+
+/**
+ * Tests to ensure that a member with the given keywords fails validation with
+ * an error message partially matching the provided identifier
+ *
+ * To test overrides, specify keywords for 'prev'. To test for success instead
+ * of failure, set identifier to null.
+ */
+exports.quickKeywordTest = function( type, keywords, identifier, prev )
+{
+    var keyword_obj = {},
+        prev_obj    = {},
+        prev_data   = {},
+        name        = 'fooBar',
+        _self       = this;
+
+    // convert our convenient array into a keyword obj
+    for ( var i = 0, len = keywords.length; i < len; i++ )
+    {
+        keyword_obj[ keywords[ i ] ] = true;
+    }
+
+    // if prev keywords were given, do the same thing with those to
+    // generate our keyword obj
+    if ( prev !== undefined )
+    {
+        for ( var i = 0, len = prev.length; i < len; i++ )
+        {
+            prev_obj[ prev[ i ] ] = true;
+        }
+
+        // define a dummy previous method value
+        prev_data = { member: function() {} };
+    }
+
+    var testfunc = function()
+    {
+        _self.sut[ type ](
+            name, function() {}, keyword_obj, prev_data, prev_obj
+        );
+    };
+
+    if ( identifier )
+    {
+        _self.quickFailureTest( name, identifier, testfunc );
+    }
+    else
+    {
+        _self.assertDoesNotThrow( testfunc, Error );
+    }
+};
+