[Yanel-commits] rev 22382 - public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources

Fri Feb 2 10:48:47 CET 2007

Author: josias
Date: 2007-02-02 10:48:45 +0100 (Fri, 02 Feb 2007)
New Revision: 22382

Modified:
   public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java
Log:
code cleanup. see bug #5161

Modified: public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java
===================================================================

--- public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java	2007-02-02 09:35:54 UTC (rev 22381)
+++ public/yanel/trunk/src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java	2007-02-02 09:48:45 UTC (rev 22382)
@@ -121,13 +121,13 @@
         if(request.getSession().getAttribute("tmpResultDir") != null){
             return showProgress(path, defaultView);
         }
+        if (archivedResults != null) {
+            return showArchive(path, defaultView, archivedResults);
+        }
         if (submit != null) {
             if (testnames != null) {
                 return executeTests(path, defaultView, testnames);
             }
-            if (archivedResults != null) {
-                return showArchive(path, defaultView, archivedResults);
-            }
             return plainRequest(path, defaultView);
         } else {
 
@@ -148,7 +148,6 @@
         sb.append("<title>Testing Control</title>");
         sb.append("</head>");
         sb.append("<body>");
-
         sb.append("<ul id=\"htmlunit\">");
         String[] allHtmlUnitTestNames = getAllTestNames("htmlunit");
 
@@ -167,34 +166,6 @@
                     + "\">" + allJUnitTestNames[i] + "</li>");
         }
         sb.append("</ul>");
-
-        // sb.append("<form method=\"post\">");
-        // sb.append("<br/>Archived Test-Results: <select name=\"archived-results\">");
-        // try {
-        // org.wyona.yarep.core.Path testResultArchivePath = new
-        // org.wyona.yarep.util.YarepUtil().getRepositoryPath(new
-        // org.wyona.yarep.core.Path(path.getParent()
-        // .toString()
-        // + "/test-results-archive/"),
-        // getRepositoryFactory())
-        // .getPath();
-        // org.wyona.yarep.core.Path[] children = contentRepo.getChildren(testResultArchivePath);
-        // for (int i = 0; i < children.length; i++) {
-        // if (contentRepo.isResource(children[i])
-        // && children[i].getName()
-        // .matches("[\\d]{4,4}[-][\\d]{2,2}[-][\\d]{2,2}[-][\\d]{2,2}[-][\\d]{2,2}[-][\\d]{2,2}[-]tests\\.xml"))
-        // {
-        // sb.append("<option value=\"" + children[i] + "\">" + children[i].getName()
-        // + "</option>");
-        // }
-        // }
-        // } catch (Exception e) {
-        // log.error(e);
-        // }
-        // sb.append("</select>");
-        // sb.append("<input type=\"submit\" name=\"submit\" value=\"Show\"/>");
-        // sb.append("</form>");
-
         sb.append("</body>");
         sb.append("</html>");
 


