[jboss-cvs] JBoss Messaging SVN: r2339 - in trunk/tests: src/org/jboss/test/messaging/tools/ant and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-16 03:41:05 -0500 (Fri, 16 Feb 2007)
New Revision: 2339

Modified:
   trunk/tests/smoke/build.xml
   trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java
Log:
smoke test HTML report imporvments: deterministic ordered list

Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml	2007-02-16 08:10:00 UTC (rev 2338)
+++ trunk/tests/smoke/build.xml	2007-02-16 08:41:05 UTC (rev 2339)
@@ -137,7 +137,7 @@
 
 
       <!--
-           Temporarily removed from the supported configurations list.
+           4.0.3SP1 standalone. Temporarily removed from the supported configurations list.
            See http://jira.jboss.org/jira/browse/JBMESSAGING-848
       -->
       <!--
@@ -1092,6 +1092,8 @@
          <arg value="smoke-test-report"/>
          <arg value="-installerdir"/>
          <arg value="C:\work\jnlp"/>
+         <arg value="-order"/>
+         <arg value="queue,topic,http,secure-socket,mdb,mdb-failure,stateless,distributed-queue,distributed-topic,queue-failover"/>
          <classpath>
             <pathelement location="../output/classes"/>
          </classpath>

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java	2007-02-16 08:10:00 UTC (rev 2338)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java	2007-02-16 08:41:05 UTC (rev 2339)
@@ -36,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Collection;
+import java.util.StringTokenizer;
 
 
 /**
@@ -47,7 +48,7 @@
  */
 public class GenerateSmokeReport
 {
-   // Constants -----------------------------------------------------
+   // Constants ------------------------------------------------------------------------------------
 
    public static final String DEFAULT_OUTPUT_BASENAME="smoke-tes-report";
 
@@ -55,21 +56,49 @@
    private static final byte CLIENT_COMPATIBILITY_TEST = 1;
    private static final byte SERVER_COMPATIBILITY_TEST = 2;
 
-   // Static --------------------------------------------------------
+   // Static ---------------------------------------------------------------------------------------
 
    public static void main(String[] args) throws Exception
    {
       new GenerateSmokeReport(args).run();
    }
 
-   // Attributes ----------------------------------------------------
+   /**
+    * The method generates a new example list in which examples are ordered according to the
+    * ordered name list.
+    *
+    * @param exampleNames - a List<String>.
+    * @param orderedNameList - comma (and space) separated ordered example name list
+    *
+    * @return a copy of the original list.
+    */
+   public static List order(List exampleNames, String orderedNameList)
+   {
+      List originalList = new ArrayList(exampleNames);
+      List orderedList = new ArrayList();
+      for(StringTokenizer st = new StringTokenizer(orderedNameList, ", "); st.hasMoreTokens(); )
+      {
+         String ordn = st.nextToken();
+         if (originalList.contains(ordn))
+         {
+            originalList.remove(ordn);
+            orderedList.add(ordn);
+         }
+      }
 
+      orderedList.addAll(originalList);
+      return orderedList;
+   }
+
+   // Attributes -----------------------------------------------------------------------------------
+
    private File inputFile;
    private File outputDir;
    private String outputFileName;
    private File installerDir;
+   private String orderedNameList;
 
-   // Constructors --------------------------------------------------
+   // Constructors ---------------------------------------------------------------------------------
 
    private GenerateSmokeReport(String[] args) throws Exception
    {
@@ -109,6 +138,14 @@
             }
             installerDir = new File(args[++i]);
          }
+         else if ("-order".equals(args[i]))
+         {
+            if (i == args.length - 1)
+            {
+               throw new Exception("Example name list must follow -order");
+            }
+            orderedNameList = args[++i];
+         }
          else
          {
             throw new Exception("Unknown argument: " + args[i]);
@@ -144,13 +181,13 @@
       outputFileName = baseName + ".java-" + System.getProperty("java.version") + ".html";
    }
 
-   // Public --------------------------------------------------------
+   // Public ---------------------------------------------------------------------------------------
 
-   // Package protected ---------------------------------------------
+   // Package protected ----------------------------------------------------------------------------
 
-   // Protected -----------------------------------------------------
+   // Protected ------------------------------------------------------------------------------------
 
-   // Private -------------------------------------------------------
+   // Private --------------------------------------------------------------------------------------
 
    private void run() throws Exception
    {
@@ -314,7 +351,14 @@
          List installations = new ArrayList(data.getInstallations());
          Collections.sort(installations);
          List examples = new ArrayList(data.getExamples(INSTALLATION_TEST));
-         Collections.sort(examples);
+         if (orderedNameList != null)
+         {
+            examples = order(examples, orderedNameList);
+         }
+         else
+         {
+            Collections.sort(examples);
+         }
 
          pw.println("<h2>Installation Test Results</h2>");