Browse files

Merge branch 'phofmann-trust-master' into develop

  • Loading branch information...
2 parents 13dfd2d + 0cdfc44 commit b3cfc4c6ce6c08e19208bad028c57eba7b90be4f @marcesher marcesher committed Apr 12, 2013
Showing with 4 additions and 4 deletions.
  1. +3 −3 framework/XPathAssert.cfc
  2. +1 −1 framework/javaloader/JavaLoader.cfc
View
6 framework/XPathAssert.cfc
@@ -34,12 +34,12 @@ mssage to display when this assertion fails" default="The XPath expression,
</cfif>
<cfset results = xmlSearch(dom,arguments.xpath)>
- <cfif len(arguments.text) gt 0>
- <cfset assertEquals(arguments.text, results[1].xmlText, message) />
- </cfif>
<cfif arrayLen(results) lt 1>
<cfset fail(message) />
</cfif>
+ <cfif len(arguments.text) gt 0>
+ <cfset assertEquals(arguments.text, results[1].xmlText, message) />
+ </cfif>
<cfreturn results />
<cfcatch type="any">
View
2 framework/javaloader/JavaLoader.cfc
@@ -497,4 +497,4 @@ Copies a directory.
</cfloop>
</cffunction>
-</cfcomponent>
+</cfcomponent>

0 comments on commit b3cfc4c

Please sign in to comment.