X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Ffacebook%2Ferrors%2FGraphApiErrorResponseErrorHandlerIntegrationTest.java;h=752a13f71d972856e7df70f3d5289b02b2ebcdb8;hb=8424f86af23f0194857544edea2a0d307c6da395;hp=470af41942d66dd081dfbdcd14f73795defbfae5;hpb=b32b4862a4c0b75fe7d29e79f6b95c3a039d5ba9;p=facebook-errors

diff --git a/src/test/java/de/juplo/facebook/errors/GraphApiErrorResponseErrorHandlerIntegrationTest.java b/src/test/java/de/juplo/facebook/errors/GraphApiErrorResponseErrorHandlerIntegrationTest.java
index 470af41..752a13f 100644
--- a/src/test/java/de/juplo/facebook/errors/GraphApiErrorResponseErrorHandlerIntegrationTest.java
+++ b/src/test/java/de/juplo/facebook/errors/GraphApiErrorResponseErrorHandlerIntegrationTest.java
@@ -51,34 +51,34 @@ public class GraphApiErrorResponseErrorHandlerIntegrationTest
   @Test
   public void testNoError()
   {
-//    server
-//        .enqueue(new MockResponse()
-//            .setResponseCode(HttpStatus.CONTINUE.value())
-//            .setHeader("Content-Type", "application/json")
-//            .setBody("{ \"message\": \"Hello World!\" }"));
-//
-//    try
-//    {
-//      String result = clientTemplate.getForObject(uri, String.class);
-//      assertEquals("{ \"message\": \"Hello World!\" }", result);
-//    }
-//    catch(Exception e)
-//    {
-//      LOG.debug("{}", e.toString());
-//      fail("Unexpected error: " + e);
-//    }
+    //server
+    //    .enqueue(new MockResponse()
+    //        .setResponseCode(HttpStatus.CONTINUE.value())
+    //        .setHeader("Content-Type", "application/json")
+    //        .setBody("Hallo Welt!"));
+    //
+    //try
+    //{
+    //  String result = clientTemplate.getForObject(uri, String.class);
+    //  assertEquals("Hallo Welt!", result);
+    //}
+    //catch(Exception e)
+    //{
+    //  LOG.debug("{}", e.toString());
+    //  fail("Unexpected error: " + e);
+    //}
 
 
     server
         .enqueue(new MockResponse()
             .setResponseCode(HttpStatus.OK.value())
-            .setHeader("Content-Type", "application/json")
-            .setBody("{ \"message\": \"Hello World!\" }"));
+            .setHeader("Content-Type", "text/plain")
+            .setBody("Hallo Welt!"));
 
     try
     {
       String result = clientTemplate.getForObject(uri, String.class);
-      assertEquals("{ \"message\": \"Hello World!\" }", result);
+      assertEquals("Hallo Welt!", result);
     }
     catch(Exception e)
     {
@@ -90,35 +90,13 @@ public class GraphApiErrorResponseErrorHandlerIntegrationTest
     server
         .enqueue(new MockResponse()
             .setResponseCode(HttpStatus.TEMPORARY_REDIRECT.value())
-            .setHeader("Content-Type", "application/json")
-            .setBody("{ \"message\": \"Hello World!\" }"));
+            .setHeader("Content-Type", "text/plain")
+            .setBody("Hallo Welt!"));
 
     try
     {
       String result = clientTemplate.getForObject(uri, String.class);
-      assertEquals("{ \"message\": \"Hello World!\" }", result);
-    }
-    catch(Exception e)
-    {
-      LOG.debug("{}", e.toString());
-      fail("Unexpected error: " + e);
-    }
-
-
-    server
-        .enqueue(new MockResponse()
-            .setResponseCode(HttpStatus.BAD_REQUEST.value())
-            .setHeader("Content-Type", "application/json")
-            .setBody("{ \"message\": \"Hello World!\" }"));
-
-    try
-    {
-      clientTemplate.getForObject(uri, String.class);
-      fail("The parent handler should have raised an exception!");
-    }
-    catch(HttpClientErrorException e)
-    {
-      LOG.debug("Expexted error: {}", e.toString());
+      assertEquals("Hallo Welt!", result);
     }
     catch(Exception e)
     {
@@ -130,8 +108,8 @@ public class GraphApiErrorResponseErrorHandlerIntegrationTest
     server
         .enqueue(new MockResponse()
             .setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-            .setHeader("Content-Type", "application/json")
-            .setBody("{ \"message\": \"Hello World!\" }"));
+            .setHeader("Content-Type", "text/plain")
+            .setBody("Hallo Welt!"));
 
     try
     {
@@ -188,14 +166,14 @@ public class GraphApiErrorResponseErrorHandlerIntegrationTest
             .setResponseCode(HttpStatus.BAD_REQUEST.value())
             .setHeader("Content-Type", "application/json")
             .setBody(
-        "{\n" +
-        "  \"error\":\n" +
-        "  {\n" +
-        "    \"message\": \"This error does not exist.\",\n" +
-        "    \"type\": \"NonexistentTypeException\",\n" +
-        "    \"code\": 999999999\n" +
-        "  }\n" +
-        "}"));
+                "{\n" +
+                "  \"error\":\n" +
+                "  {\n" +
+                "    \"message\": \"This error does not exist.\",\n" +
+                "    \"type\": \"NonexistentTypeException\",\n" +
+                "    \"code\": 999999999\n" +
+                "  }\n" +
+                "}"));
 
     try
     {
@@ -225,27 +203,50 @@ public class GraphApiErrorResponseErrorHandlerIntegrationTest
             .setResponseCode(HttpStatus.BAD_REQUEST.value())
             .setHeader("Content-Type", "application/json")
             .setBody(
-        "{\n" +
-        "  \"error\":\n" +
-        "  {\n" +
-        "    \"message\": \"Not a Graph-Api-Exception.\",\n" +
-        "    \"type\": \"Whatever\",\n" +
-        "    \"code\": \"some string\"\n" +
-        "  }\n" +
-        "}"));
+                "{\n" +
+                "  \"error\":\n" +
+                "  {\n" +
+                "    \"message\": \"Not a Graph-Api-Exception.\",\n" +
+                "    \"type\": \"Whatever\",\n" +
+                "    \"code\": \"some string\"\n" +
+                "  }\n" +
+                "}"));
 
     try
     {
       clientTemplate.getForObject(uri, String.class);
-      fail("The expected exception was not thrown");
+      fail("The parent handler should have raised an exception!");
     }
     catch(HttpClientErrorException e)
+    {
+      LOG.debug("Expexted error: {}", e.toString());
+    }
+    catch(Exception e)
     {
       LOG.debug("{}", e.toString());
+      fail("Unexpected error: " + e);
+    }
+
+
+    server
+        .enqueue(new MockResponse()
+            .setResponseCode(HttpStatus.BAD_REQUEST.value())
+            .setHeader("Content-Type", "text/plain")
+            .setBody("Hallo Welt!"));
+
+    try
+    {
+      clientTemplate.getForObject(uri, String.class);
+      fail("The parent handler should have raised an exception!");
+    }
+    catch(HttpClientErrorException e)
+    {
+      LOG.debug("Expexted error: {}", e.toString());
     }
     catch(Exception e)
     {
-      fail("A wrong exception was thrown: " + e.toString());
+      LOG.debug("{}", e.toString());
+      fail("Unexpected error: " + e);
     }
   }
 }