Merge branch 'develop' of github.com:mxunit/mxunit into develop

mxunit · Jul 11, 2012 · 83ce099 · 83ce099
2 parents 3878817 + f8dcaba
commit 83ce099
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/framework/TestCase.cfc b/framework/TestCase.cfc
@@ -47,8 +47,8 @@
 		<cfset variables.beforeTestsEnabled = true>
 	</cffunction>
 
-	<cffunction name="okToRunBeforeTests" output="false" access="public" returntype="boolean" hint="">    
-    	<cfreturn variables.beforeTestsEnabled>
+	<cffunction name="okToRunBeforeTests" output="false" access="public" returntype="boolean" hint="">    
+    	<cfreturn variables.beforeTestsEnabled>
     </cffunction>
 
 	<cffunction name="disableAfterTests" output="false">
@@ -59,8 +59,8 @@
 		<cfset variables.afterTestsEnabled = true>
 	</cffunction>
 
-	<cffunction name="okToRunAfterTests" output="false" access="public" returntype="boolean" hint="">    
-    	<cfreturn variables.afterTestsEnabled>
+	<cffunction name="okToRunAfterTests" output="false" access="public" returntype="boolean" hint="">    
+    	<cfreturn variables.afterTestsEnabled>
     </cffunction>
 
 	<!--- constructor --->
@@ -137,10 +137,10 @@
 		<cfargument name="methodName" hint="the name of the method to invoke" type="string" required="Yes">
 		<cfargument name="args" hint="Optional set of arguments" type="struct" required="No" default="#StructNew()#">
 		<cfset var output = 0>
-		<cfsavecontent variable="output" >
-			<cfinvoke component="#this#" method="#arguments.methodName#" argumentcollection="#arguments.args#">
+		<cfsavecontent variable="output" >
+			<cfinvoke component="#this#" method="#arguments.methodName#" argumentcollection="#arguments.args#">
 		</cfsavecontent>
-		<cfreturn output />
+		<cfreturn output />
 	</cffunction>
 
 	<!---
@@ -315,13 +315,13 @@
 								ignoreIfExisting = false )>
 	</cffunction>
 
-	<cffunction name="restoreMethod" output="false" access="public" returntype="void" hint="restores a previously overwritten method (via injectMethod) to its original state">
+	<cffunction name="restoreMethod" output="false" access="public" returntype="void" hint="restores a previously overwritten method (via injectMethod) to its original state">
     	<cfargument name="receiver" type="any" required="true"/>
 		<cfargument name="functionName" type="string" required="true"/>
 		<cfset var blender = createObject("component","ComponentBlender")>
 		<cfset blender._mixinAll(receiver, blender, "_copyToNewName")>
 		<cfset receiver._copyToNewName(functionName & "__orig__", functionName,false)>
-	</cffunction>
+	</cffunction>
 
 
 	<cffunction name="injectProperty" output="false" access="public" returntype="void" hint="injects properties into the receiving object">
@@ -474,7 +474,7 @@
 					if(StructKeyExists(metadata,"mxunit:" & arguments.annotationName) OR
 						StructKeyExists(metadata,arguments.annotationName)
 						)
-					{
+					{
 						break;
 					}
 
@@ -528,7 +528,7 @@
 		<cfset decoratorNames = listPrepend( decoratorNames, getRequiredDecoratorPaths() ) />
 
 		<cfloop list="#decoratorNames#" index="decoratorPath">
-			<cfset decorator = createObject("component", decoratorPath)/>
+			<cfset decorator = createObject("component", trim(decoratorPath))/>
 			<cfset decorator.setTarget(object)/>
 			<cfset decorator.metadata = meta />
 			<cfset arguments.object = decorator/> <!--- flip it and reverse it. --->
@@ -537,8 +537,8 @@
 		<cfreturn arguments.object>
 	</cffunction>
 
-	<cffunction name="getRequiredDecoratorPaths" output="false" access="public" returntype="any" hint="Returns a list of fully-qualified paths to framework-required decorators">
-    	<cfreturn "mxunit.framework.decorators.DataProviderDecorator">
+	<cffunction name="getRequiredDecoratorPaths" output="false" access="public" returntype="any" hint="Returns a list of fully-qualified paths to framework-required decorators">
+    	<cfreturn "mxunit.framework.decorators.DataProviderDecorator">
     </cffunction>
 
     <cffunction name="setExpectedExceptionType" access="public">
@@ -560,6 +560,6 @@
 	</cffunction>
 
 	<cffunction name="getVariablesScope" access="public" hint="Front door into the Test's variables scope">
-		<cfreturn variables>
+		<cfreturn variables>
 	</cffunction>
 </cfcomponent>
diff --git a/tests/framework/TestDecoratorTest.cfc b/tests/framework/TestDecoratorTest.cfc
@@ -1,5 +1,5 @@
 <cfcomponent extends="mxunit.framework.TestCase" output="false"
-	mxunit:decorators="mxunit.tests.framework.fixture.decorators.StoreTestNameDecorator,mxunit.tests.framework.fixture.decorators.IgnoreFunnyFunctionsDecorator">
+	mxunit:decorators="mxunit.tests.framework.fixture.decorators.StoreTestNameDecorator, mxunit.tests.framework.fixture.decorators.IgnoreFunnyFunctionsDecorator">
 
 	<cffunction name="testDecoratorWrappingTest" hint="test to see if the decorator gets called and places the name of the test in the request scope"
 				access="public" returntype="void" output="false">