Formatted all source code

orionll · Aug 21, 2012 · 1657580 · 1657580
1 parent 559020b
commit 1657580
Show file tree

Hide file tree

Showing 15 changed files with 143 additions and 259 deletions.
diff --git a/JUnitEE/src/main/java/junit/htmlui/TestServletBase.java b/JUnitEE/src/main/java/junit/htmlui/TestServletBase.java
@@ -5,13 +5,6 @@
 
 package junit.htmlui;
 
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
 import org.junitee.servlet.JUnitEEServlet;
 
 /**
@@ -22,5 +15,6 @@
  *
  * @deprecated  Use org.junitee.servlet.JUnitEEServlet instead
  */
+@Deprecated
 public class TestServletBase extends JUnitEEServlet {
 }
diff --git a/JUnitEE/src/main/java/org/junitee/output/AbstractOutput.java b/JUnitEE/src/main/java/org/junitee/output/AbstractOutput.java
@@ -3,13 +3,13 @@
  */
 package org.junitee.output;
 
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
 
-import java.io.*;
-import java.util.*;
-
-import org.junitee.runner.TestRunnerResults;
 import org.junitee.runner.TestInfo;
-
+import org.junitee.runner.TestRunnerResults;
 
 /**
  * @author <a href="mailto:oliver@oross.net">Oliver Rossmueller</a>
@@ -21,85 +21,73 @@ public abstract class AbstractOutput implements OutputProducer {
   private TestRunnerResults results;
   private boolean filterTrace = true;
 
-
   public AbstractOutput(TestRunnerResults results, boolean filterTrace) {
     this.results = results;
     this.filterTrace = filterTrace;
   }
 
-
+  @Override
   public abstract void render();
 
-
   public synchronized TestInfo getCurrentInfo() {
     synchronized (results) {
       return results.getCurrentInfo();
     }
   }
 
-
   protected long getTimestamp() {
     synchronized (results) {
       return results.getTimestamp();
     }
   }
 
-
   protected List getSuiteInfo() {
     synchronized (results) {
       return results.getSuiteInfo();
     }
   }
 
-
   protected boolean isFailure() {
     synchronized (results) {
       return results.isFailure();
     }
   }
 
-
   protected boolean isFilterTrace() {
     return filterTrace;
   }
 
-
   protected boolean isSingleTest() {
     synchronized (results) {
       return results.isSingleTest();
     }
   }
 
-
   protected boolean isFinished() {
     synchronized (results) {
       return results.isFinished();
     }
   }
 
-
   protected boolean isStopped() {
     synchronized (results) {
       return results.isStopped();
     }
   }
 
-
   protected List getErrorMessages() {
     synchronized (results) {
       return results.getErrorMessages();
     }
   }
 
-
   protected String exceptionToString(Throwable t) {
     CharArrayWriter buffer = new CharArrayWriter();
 
     t.printStackTrace(new PrintWriter(buffer));
     return buffer.toString();
   }
 
-
   /**
    * Checks to see if t is a RemoteException containing
    * an EJBException, and if it is, prints the nested
@@ -126,5 +114,4 @@ protected String getEJBExceptionDetail(Throwable t) {
     return "";
   }
 
-
 }
diff --git a/JUnitEE/src/main/java/org/junitee/output/HTMLOutput.java b/JUnitEE/src/main/java/org/junitee/output/HTMLOutput.java
@@ -5,21 +5,21 @@
 
 package org.junitee.output;
 
-
-import java.io.*;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Iterator;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junitee.runner.TestInfo;
 import org.junitee.runner.TestRunnerListener;
 import org.junitee.runner.TestRunnerResults;
 import org.junitee.runner.TestSuiteInfo;
 import org.junitee.util.StringUtils;
 
-
 /**
  * This class implements the {@link TestRunnerListener} interface and produces an HTML test report.
  *
@@ -47,25 +47,24 @@ public class HTMLOutput extends AbstractOutput {
   private HttpServletRequest request;
   private int refreshDelay;
 
-
   /**
    */
   public HTMLOutput(TestRunnerResults results, HttpServletRequest request, HttpServletResponse response, boolean filterTrace, int refreshDelay) throws IOException {
     super(results, filterTrace);
     response.setContentType("text/html;charset=UTF-8");
 
-    this.pw = response.getWriter();
+    pw = response.getWriter();
     this.response = response;
-    this.servletPath = request.getContextPath() + request.getServletPath();
-    this.queryString = request.getQueryString();
+    servletPath = request.getContextPath() + request.getServletPath();
+    queryString = request.getQueryString();
     this.request = request;
     this.refreshDelay = refreshDelay;
     numberFormat = NumberFormat.getInstance();
     numberFormat.setMaximumFractionDigits(3);
     numberFormat.setMinimumFractionDigits(3);
   }
 
-
+  @Override
   public void render() {
     printHeader();
     if (isFinished()) {
@@ -86,7 +85,6 @@ public void render() {
     printFooter();
   }
 
-
   protected void printHeader() {
     String bgColor;
     String result;
@@ -107,7 +105,8 @@ protected void printHeader() {
       if (queryString != null) {
         redirect = redirect + "?" + queryString;
       }
-       pw.println("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"" + refreshDelay + "; URL=" + response.encodeURL(redirect) + "\">");
+      pw.println("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"" + refreshDelay + "; URL=" + response.encodeURL(redirect)
+          + "\">");
     }
     pw.println("</head>");
 
@@ -148,13 +147,11 @@ protected void printHeader() {
 
   }
 
-
   protected void printFooter() {
     pw.println("</body>");
     pw.println("</html>");
   }
 
-
   protected void printUnderProgress() {
     pw.println("<form action=\"" + response.encodeURL(servletPath) + "\" method=\"get\">");
     pw.println("<p>");
@@ -193,7 +190,6 @@ protected void printUnderProgress() {
     pw.println("</form>");
   }
 
-
   protected void printRunErrors() {
     if (getErrorMessages().isEmpty()) {
       return;
@@ -208,7 +204,6 @@ protected void printRunErrors() {
     while (errors.hasNext()) {
       String message = (String)errors.next();
 
-
       pw.println("<tr><td class=\"failedcell\">" + image(RESOURCE_RED_BULLET, "Error") + "</td>");
       pw.print("<td class=\"cell\">&nbsp;</td>");
       pw.println("<td width=\"100%\" class=\"cell\">" + message + "</td></tr>");
@@ -217,7 +212,6 @@ protected void printRunErrors() {
     pw.println("</table></p>");
   }
 
-
   protected void printSummary(boolean createInfoAndLinks) {
     if (getSuiteInfo().isEmpty()) {
       pw.println("<h2>No tests executed</h2>");
@@ -236,11 +230,14 @@ protected void printSummary(boolean createInfoAndLinks) {
 
       if (createInfoAndLinks) {
         if (suite.successful()) {
-          pw.println("<tr><td class=\"passedcell\">" + suiteTestLink(suite, image(RESOURCE_GREEN_BULLET, "Success (Run again)")) + "</td>");
+          pw.println("<tr><td class=\"passedcell\">"
+              + suiteTestLink(suite, image(RESOURCE_GREEN_BULLET, "Success (Run again)")) + "</td>");
         } else if (suite.hasError()) {
-          pw.println("<tr><td class=\"failedcell\">" + suiteTestLink(suite, image(RESOURCE_RED_BULLET, "Error (Run again)")) + "</td>");
+          pw.println("<tr><td class=\"failedcell\">"
+              + suiteTestLink(suite, image(RESOURCE_RED_BULLET, "Error (Run again)")) + "</td>");
         } else {
-          pw.println("<tr><td class=\"failedcell\">" + suiteTestLink(suite, image(RESOURCE_YELLOW_BULLET, "Failure (Run again)")) + "</td>");
+          pw.println("<tr><td class=\"failedcell\">"
+              + suiteTestLink(suite, image(RESOURCE_YELLOW_BULLET, "Failure (Run again)")) + "</td>");
         }
       } else {
         if (suite.successful()) {
@@ -259,19 +256,18 @@ protected void printSummary(boolean createInfoAndLinks) {
       } else {
         pw.print("&nbsp;");
       }
-      pw.println("</td><td width=\"100%\" class=\"cell\">" + suite.getTestClassName() + "</td><td class=\"cell\" align=\"right\">");
+      pw.println("</td><td width=\"100%\" class=\"cell\">" + suite.getTestClassName()
+          + "</td><td class=\"cell\" align=\"right\">");
       pw.println(elapsedTimeAsString(suite.getElapsedTime()) + "&nbsp;sec</td></tr>");
     }
     pw.println("<tr><td colspan=\"4\">&nbsp;</td></tr>");
     pw.println("</table></p>");
   }
 
-
   private String elapsedTimeAsString(long value) {
     return numberFormat.format((double)value / 1000);
   }
 
-
   protected void printMethodList() {
     if (getSuiteInfo().isEmpty()) {
       if (isSingleTest()) {
@@ -297,11 +293,14 @@ protected void printMethodList() {
         TestInfo test = (TestInfo)tests.next();
 
         if (test.successful()) {
-          pw.println("<tr><td class=\"passedcell\">" + singleTestLink(test, image(RESOURCE_GREEN_BULLET, "Success (Run again)")) + "</td>");
+          pw.println("<tr><td class=\"passedcell\">"
+              + singleTestLink(test, image(RESOURCE_GREEN_BULLET, "Success (Run again)")) + "</td>");
         } else if (test.hasError()) {
-          pw.println("<tr><td class=\"failedcell\">" + singleTestLink(test, image(RESOURCE_RED_BULLET, "Error (Run again)")) + "</td>");
+          pw.println("<tr><td class=\"failedcell\">"
+              + singleTestLink(test, image(RESOURCE_RED_BULLET, "Error (Run again)")) + "</td>");
         } else {
-          pw.println("<tr><td class=\"failedcell\">" + singleTestLink(test, image(RESOURCE_YELLOW_BULLET, "Failure (Run again)")) + "</td>");
+          pw.println("<tr><td class=\"failedcell\">"
+              + singleTestLink(test, image(RESOURCE_YELLOW_BULLET, "Failure (Run again)")) + "</td>");
         }
         pw.print("<td class=\"cell\">");
         if (test.successful()) {
@@ -320,18 +319,17 @@ protected void printMethodList() {
     pw.println("</table></p>");
   }
 
-
   private String image(String resource, String alt) {
     StringBuffer buffer = new StringBuffer();
     StringBuffer url = new StringBuffer();
 
     url.append(servletPath).append("/").append(resource);
-    buffer.append("<img src=\"").append(response.encodeURL(url.toString())).append("\" border=\"0\" height=\"14\" widht=\"14\" alt=\"");
+    buffer.append("<img src=\"").append(response.encodeURL(url.toString()))
+      .append("\" border=\"0\" height=\"14\" widht=\"14\" alt=\"");
     buffer.append(alt).append("\">");
     return buffer.toString();
   }
 
-
   private String singleTestLink(TestInfo test, String text) {
     StringBuffer buffer = new StringBuffer();
     StringBuffer url = new StringBuffer();
@@ -342,7 +340,6 @@ private String singleTestLink(TestInfo test, String text) {
     return buffer.toString();
   }
 
-
   private String suiteTestLink(TestSuiteInfo suite, String text) {
     StringBuffer buffer = new StringBuffer();
     StringBuffer url = new StringBuffer();
@@ -354,7 +351,6 @@ private String suiteTestLink(TestSuiteInfo suite, String text) {
     return buffer.toString();
   }
 
-
   protected void printErrorsAndFailures() {
     pw.println("<h2> List of errors and failures</h2>");
     pw.println("<p> <table border=\"0\" cellspacing=\"2\" cellpadding=\"3\" width=\"100%\">");
@@ -414,5 +410,4 @@ protected void printErrorsAndFailures() {
     pw.println("</table>");
   }
 
-
 }
diff --git a/JUnitEE/src/main/java/org/junitee/output/OutputProducer.java b/JUnitEE/src/main/java/org/junitee/output/OutputProducer.java
@@ -6,7 +6,6 @@
  */
 package org.junitee.output;
 
-
 /**
  * @version $Revision: 1.1 $
  * @author <a href="mailto:oliver@oross.net">Oliver Rossmueller</a>