Revision: 5491
http://jnode.svn.sourceforge.net/jnode/?rev=5491&view=rev
Author: fduminy
Date: 2009-05-15 17:46:33 +0000 (Fri, 15 May 2009)
Log Message:
-----------
- fixed bug in anonymous implementation of WatchDog, which gave duplicated
tests in mauve results
- now, whatever happen, the main method will kill all running servers on exit
- renamed variables in mergeResults method for source code readability/clarity
Modified Paths:
--------------
trunk/core/src/test/org/jtestserver/client/TestDriver.java
Modified: trunk/core/src/test/org/jtestserver/client/TestDriver.java
===================================================================
--- trunk/core/src/test/org/jtestserver/client/TestDriver.java 2009-05-15
17:40:27 UTC (rev 5490)
+++ trunk/core/src/test/org/jtestserver/client/TestDriver.java 2009-05-15
17:46:33 UTC (rev 5491)
@@ -71,17 +71,9 @@
}
} catch (IOException e) {
LOGGER.log(Level.SEVERE, "protocol error", e);
-
- if (testDriver != null) {
- try {
- testDriver.killRunningServers();
- } catch (ProtocolException e1) {
- LOGGER.log(Level.SEVERE, "protocol error", e1);
- }
- }
} catch (ProtocolException e) {
LOGGER.log(Level.SEVERE, "I/O error", e);
-
+ } finally {
if (testDriver != null) {
try {
testDriver.killRunningServers();
@@ -123,11 +115,9 @@
protected void processDead() {
LOGGER.warning("process is dead. restarting it.");
try {
- TestDriver.this.start();
+ TestDriver.this.process.start();
} catch (IOException e) {
LOGGER.log(Level.SEVERE, "error while restarting", e);
- } catch (ProtocolException e) {
- LOGGER.log(Level.SEVERE, "error while restarting", e);
}
}
};
@@ -263,26 +253,24 @@
return result;
}
- private void mergeResults(RunResult targetResult, RunResult result) {
- for (Iterator<?> itPackage = result.getPackageIterator();
itPackage.hasNext(); ) {
- PackageResult pkg = (PackageResult) itPackage.next();
+ private void mergeResults(RunResult target, RunResult source) {
+ for (Iterator<?> itSourcePackage = source.getPackageIterator();
itSourcePackage.hasNext(); ) {
+ PackageResult sourcePackage = (PackageResult)
itSourcePackage.next();
- PackageResult pr = targetResult.getPackageResult(pkg.getName());
- if (pr == null) {
- pr = pkg;
- targetResult.add(pkg);
+ PackageResult targetPackage =
target.getPackageResult(sourcePackage.getName());
+ if (targetPackage == null) {
+ target.add(sourcePackage);
} else {
- for (Iterator<?> itClass = pkg.getClassIterator();
itClass.hasNext(); ) {
- ClassResult cls = (ClassResult) itClass.next();
+ for (Iterator<?> itSourceClass =
sourcePackage.getClassIterator(); itSourceClass.hasNext(); ) {
+ ClassResult sourceClass = (ClassResult)
itSourceClass.next();
- ClassResult cr = pr.getClassResult(cls.getName());
- if (cr == null) {
- cr = cls;
- pr.add(cls);
+ ClassResult targetClass =
targetPackage.getClassResult(sourceClass.getName());
+ if (targetClass == null) {
+ targetPackage.add(sourceClass);
} else {
- for (Iterator<?> itTest = cls.getTestIterator();
itTest.hasNext(); ) {
- TestResult test = (TestResult) itTest.next();
- cr.add(test);
+ for (Iterator<?> itSourceTest =
sourceClass.getTestIterator(); itSourceTest.hasNext(); ) {
+ TestResult sourceTest = (TestResult)
itSourceTest.next();
+ targetClass.add(sourceTest);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits
