[Jnode-svn-commits] SF.net SVN: jnode:[5495] trunk/core

[<fd...@us...>]

Revision: 5495
          http://jnode.svn.sourceforge.net/jnode/?rev=5495&view=rev
Author:   fduminy
Date:     2009-05-17 11:13:42 +0000 (Sun, 17 May 2009)

Log Message:
-----------
- update of mauve with new feature to embed system properties inside the xml report, the html report and the RunResult class
- added custom system properties to reports (xml, html) to say if server was running in a vmware, kvm or a new jvm

Modified Paths:
--------------
    trunk/core/lib/mauve-src.jar
    trunk/core/lib/mauve.jar
    trunk/core/src/test/org/jtestserver/client/TestDriver.java
    trunk/core/src/test/org/jtestserver/server/commands/MauveTestRunner.java

Modified: trunk/core/lib/mauve-src.jar
===================================================================
(Binary files differ)

Modified: trunk/core/lib/mauve.jar
===================================================================
(Binary files differ)

Modified: trunk/core/src/test/org/jtestserver/client/TestDriver.java
===================================================================
--- trunk/core/src/test/org/jtestserver/client/TestDriver.java	2009-05-17 11:09:40 UTC (rev 5494)
+++ trunk/core/src/test/org/jtestserver/client/TestDriver.java	2009-05-17 11:13:42 UTC (rev 5495)
@@ -172,6 +172,7 @@
         LOGGER.info("running list of working tests");
         File workingTests = (latestRun == null) ? null : latestRun.getWorkingTests();
         RunResult runResult = runTests(workingTests, true, workingList, crashingList, newRun.getTimestampString());
+        runResult.setSystemProperty("jtestserver.process", process.getClass().getName());
         
         LOGGER.info("running list of crashing tests");
         File crashingTests = (latestRun == null) ? null : latestRun.getCrashingTests();
@@ -234,17 +235,19 @@
         }
 
         RunResult result = new RunResult(timestamp);
-        int i = 0;
+        boolean firstTest = true;
+        int i = 0; // TODO for debug only, remove that
         for (String test : list) {
             if (i++ > 100) { // TODO for debug only, remove that
                 break;
             }
             
             boolean working = false;
+            RunResult delta = null;
             LOGGER.info("launching test " + test);
-
+            
             try {
-                RunResult delta = client.runMauveTest(test);
+                delta = client.runMauveTest(test);
                 mergeResults(result, delta);
                 
                 working = true;
@@ -256,6 +259,14 @@
                 } else {
                     crashingList.add(test);
                 }
+                
+                if (firstTest && (delta != null)) {
+                    for (String name : delta.getSystemPropertyNames()) {
+                        result.setSystemProperty(name, delta.getSystemProperty(name));
+                    }
+                    
+                    firstTest = false;
+                }
             }
         }
         

Modified: trunk/core/src/test/org/jtestserver/server/commands/MauveTestRunner.java
===================================================================
--- trunk/core/src/test/org/jtestserver/server/commands/MauveTestRunner.java	2009-05-17 11:09:40 UTC (rev 5494)
+++ trunk/core/src/test/org/jtestserver/server/commands/MauveTestRunner.java	2009-05-17 11:13:42 UTC (rev 5495)
@@ -64,16 +64,16 @@
 
     private class JTSMauve extends Mauve {
         public RunResult runTest(String testName) {
-            // save the default locale, some tests change the default and we want
-            // to restore it before generating the HTML report...
+            // save the default locale, some tests change the default
             Locale savedLocale = Locale.getDefault();
             
             result = new RunResult("Mauve Test Run");
+            addSystemProperties(result);
             currentCheck = new CheckResult(0, false);
 
             executeLine("", testName);
             
-            // tests are complete so restore the default locale
+            // restore the default locale
             Locale.setDefault(savedLocale);
             
             return getResult();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.