#badGet and #badPost refactoring: avoid duplication

hawkular · Mar 24, 2015 · 20bcefb · 20bcefb
1 parent ac3ca3b
commit 20bcefb
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/rest-tests/src/test/groovy/org/hawkular/metrics/rest/RESTTest.groovy b/rest-tests/src/test/groovy/org/hawkular/metrics/rest/RESTTest.groovy
@@ -70,24 +70,19 @@ class RESTTest {
   }
 
   static def badPost(args, errorHandler) {
-    def originalFailureHandler = hawkularMetrics.handler.failure;
-    hawkularMetrics.handler.failure = defaultFailureHandler;
-    try {
-      def object = hawkularMetrics.post(args)
-      fail("Expected exception to be thrown")
-      return object
-    } catch (e) {
-      errorHandler(e)
-    } finally {
-      hawkularMetrics.handler.failure = originalFailureHandler;
-    }
+    badRequest(hawkularMetrics.&post, args, errorHandler)
   }
 
   static def badGet(args, errorHandler) {
+    badRequest(hawkularMetrics.&get, args, errorHandler)
+  }
+
+
+  static def badRequest(method, args, errorHandler) {
     def originalFailureHandler = hawkularMetrics.handler.failure;
     hawkularMetrics.handler.failure = defaultFailureHandler;
     try {
-      def object = hawkularMetrics.get(args)
+      def object = method(args)
       fail("Expected exception to be thrown")
       return object
     } catch (e) {
@@ -96,4 +91,5 @@ class RESTTest {
       hawkularMetrics.handler.failure = originalFailureHandler;
     }
   }
+
 }