Added printing of last response for JASPIC tests and updated .gitignore

arjantijms · arjantijms · commit fd8bb4d63b41 · 2016-05-01T22:09:30.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -94,3 +94,10 @@ local.properties
 
 # Testing environment specific
 derby.log
+
+
+######################
+# Liberty tools
+######################
+
+.factorypath
diff --git a/jaspic/common/pom.xml b/jaspic/common/pom.xml
@@ -12,9 +12,9 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <groupId>org.javaee7</groupId>
+    
     <artifactId>jaspic-common</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    
     <packaging>jar</packaging>
     <name>Java EE 7 Sample: jaspic - common</name>
 
@@ -36,5 +36,10 @@
             <version>2.13</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.9.1</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java
@@ -1,18 +1,25 @@
 package org.javaee7.jaspic.common;
 
 import static java.lang.Boolean.getBoolean;
+import static java.util.logging.Level.SEVERE;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.jsoup.Jsoup.parse;
+import static org.jsoup.parser.Parser.xmlParser;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.logging.Logger;
 
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
 
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -25,8 +32,38 @@
 public class ArquillianBase {
 
     private static final String WEBAPP_SRC = "src/main/webapp";
+    private static final Logger logger = Logger.getLogger(ArquillianBase.class.getName());
+    
     private WebClient webClient;
+    private String response;
+    
+    @Rule
+    public TestWatcher ruleExample = new TestWatcher() {
+        @Override
+        protected void failed(Throwable e, Description description) {
+            super.failed(e, description);
+            
+            logger.log(SEVERE, 
+                "\n\nTest failed: " + 
+                description.getClassName() + "." + description.getMethodName() +
+                
+                "\nMessage: " + e.getMessage() +
+                
+                "\nLast response: " +
+                
+                "\n\n"  + formatHTML(response) + "\n\n");
+            
+        }
+    };
     
+    public static String formatHTML(String html) {
+        try {
+            return parse(html, "", xmlParser()).toString();
+        } catch (Exception e) {
+            return html;
+        }
+    }
+
     public static Archive<?> defaultArchive() {
         return tryWrapEAR(defaultWebArchive());
     }
@@ -48,6 +85,8 @@ public static Archive<?> tryWrapEAR(WebArchive webArchive) {
                 create(EnterpriseArchive.class, "test.ear")
                 
                     // Liberty needs to have the binding file in an ear.
+                    // TODO: this is no longer the case and this code can be removed (-bnd.xml
+                    // needs to be moved to correct place)
                     .addAsManifestResource(resource("ibm-application-bnd.xml"))
     
                     // Web module
@@ -82,6 +121,8 @@ public void tearDown() {
         webClient.getCookieManager().clearCookies();
         webClient.closeAllWindows();
     }
+    
+    
 
     protected WebClient getWebClient() {
         return webClient;
@@ -100,7 +141,9 @@ protected URL getBase() {
      */
     protected String getFromServerPath(final String path) {
         try {
-            return webClient.getPage(base + path).getWebResponse().getContentAsString();
+            response = null;
+            response = webClient.getPage(base + path).getWebResponse().getContentAsString();
+            return response;
         } catch (FailingHttpStatusCodeException | IOException e) {
             throw new IllegalStateException(e);
         }
