From 0edc94b44ad6fa30ef46d4b1e6bb2c87ed66ef8d Mon Sep 17 00:00:00 2001
From: Shinta Smith <shinta.smith@rackspace.com>
Date: Tue, 30 Apr 2013 10:46:16 -0500
Subject: [PATCH 1/2] change assertResultFailed(f : =>, code: Int) to return
 ErrorResult

---
 .gitignore                               | 1 +
 core/src/test/scala/validator-base.scala | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index eb5a316c..78575d1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 target
+*.iml
diff --git a/core/src/test/scala/validator-base.scala b/core/src/test/scala/validator-base.scala
index 29ac8308..65e4858a 100644
--- a/core/src/test/scala/validator-base.scala
+++ b/core/src/test/scala/validator-base.scala
@@ -481,7 +481,7 @@ class BaseValidatorSuite extends FunSuite {
 
   }
 
-  def assertResultFailed(f : => Any, code : Int) : Unit = {
+  def assertResultFailed(f : => Any, code : Int) : ErrorResult = {
     var result : ErrorResult = null
     assertResultFailed(f).get.result match {
       case other : ErrorResult =>
@@ -491,6 +491,7 @@ class BaseValidatorSuite extends FunSuite {
     if (result.code != code) {
       throw new TestFailedException(Some("Expected error code "+code+" but got "+result.code), None, 4)
     }
+    return result
   }
 
   def assertResultFailed(f : => Any, code : Int, message : String) : Unit = {

From deaa8319f879e85039c5a9fdbee58f893339faee Mon Sep 17 00:00:00 2001
From: Shinta Smith <shinta.smith@rackspace.com>
Date: Wed, 8 May 2013 17:06:25 -0500
Subject: [PATCH 2/2] update the other variant of assertResultFailed to also
 return result

---
 core/src/test/scala/validator-base.scala  | 9 ++++++---
 core/src/test/scala/validator-tests.scala | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/test/scala/validator-base.scala b/core/src/test/scala/validator-base.scala
index 65e4858a..3f821625 100644
--- a/core/src/test/scala/validator-base.scala
+++ b/core/src/test/scala/validator-base.scala
@@ -494,7 +494,7 @@ class BaseValidatorSuite extends FunSuite {
     return result
   }
 
-  def assertResultFailed(f : => Any, code : Int, message : String) : Unit = {
+  def assertResultFailed(f : => Any, code : Int, message : String) : ErrorResult = {
     var result : ErrorResult = null
     assertResultFailed(f).get.result match {
       case other : ErrorResult =>
@@ -507,9 +507,10 @@ class BaseValidatorSuite extends FunSuite {
     if (result.message != message) {
       throw new TestFailedException(Some("Expected error message '"+message+"' but got '"+result.message+"'"), None, 4)
     }
+    return result
   }
 
-  def assertResultFailed(f : => Any, code : Int, message : List[String]) : Unit = {
+  def assertResultFailed(f : => Any, code : Int, message : List[String]) : ErrorResult = {
     var result : ErrorResult = null
     assertResultFailed(f).get.result match {
       case other : ErrorResult =>
@@ -524,9 +525,10 @@ class BaseValidatorSuite extends FunSuite {
         throw new TestFailedException(Some("Expected error string '"+m+"' in the result message, but it didn't have one. Actual result message: '"+result.message+"'"), None, 4)
       }
     })
+    return result
   }
 
-  def assertResultFailed(f : => Any, code : Int, headers : Map[String, String]) : Unit = {
+  def assertResultFailed(f : => Any, code : Int, headers : Map[String, String]) : ErrorResult = {
     var result : ErrorResult = null
     assertResultFailed(f).get.result match {
       case other : ErrorResult =>
@@ -545,5 +547,6 @@ class BaseValidatorSuite extends FunSuite {
         throw new TestFailedException(Some("Expected result header "+k+" to match value '"+v+"' but instead got '"+result.headers.get(k)+"'"), None, 4)
       }
     })
+    return result
   }
 }
diff --git a/core/src/test/scala/validator-tests.scala b/core/src/test/scala/validator-tests.scala
index adc0fa95..f4677faf 100644
--- a/core/src/test/scala/validator-tests.scala
+++ b/core/src/test/scala/validator-tests.scala
@@ -30,7 +30,9 @@ class ValidatorSuite extends BaseValidatorSuite {
   }, assertConfig)
 
   test ("GET on / should fail on validator_EMPTY") {
-    assertResultFailed(validator_EMPTY.validate(request("GET","/"),response,chain), 405, Map("Allow"->""))
+    val result = assertResultFailed(validator_EMPTY.validate(request("GET","/"),response,chain), 405, Map("Allow"->""))
+    // this is just a check to make sure the returned result has the same error code
+    assert(result.code == 405)
   }
 
   test ("an empty GET should fail on validator_EMPTY") {