[jboss-cvs] JBossAS SVN: r64932 - in branches/Branch_4_2/test: src/main/org/jboss/ant/taskdefs and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-08-28 17:55:49 -0400 (Tue, 28 Aug 2007)
New Revision: 64932

Added:
   branches/Branch_4_2/test/src/main/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java
Modified:
   branches/Branch_4_2/test/.classpath
   branches/Branch_4_2/test/build.xml
Log:
[JBAS-4641] Move XMLJUnitMultipleResultFormatter from testsuite module to test module

Modified: branches/Branch_4_2/test/.classpath
===================================================================
--- branches/Branch_4_2/test/.classpath	2007-08-28 21:54:59 UTC (rev 64931)
+++ branches/Branch_4_2/test/.classpath	2007-08-28 21:55:49 UTC (rev 64932)
@@ -7,5 +7,6 @@
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/ant.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/Branch_4_2/test/build.xml
===================================================================
--- branches/Branch_4_2/test/build.xml	2007-08-28 21:54:59 UTC (rev 64931)
+++ branches/Branch_4_2/test/build.xml	2007-08-28 21:55:49 UTC (rev 64932)
@@ -72,6 +72,7 @@
          <path refid="apache.log4j.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="apache.ant.classpath"/>
+         <path refid="apache.ant.junit.classpath"/>
       </path>
 
       <!-- ======= -->

Copied: branches/Branch_4_2/test/src/main/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java (from rev 64899, branches/Branch_4_2/testsuite/src/main/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java)
===================================================================
--- branches/Branch_4_2/test/src/main/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java	                        (rev 0)
+++ branches/Branch_4_2/test/src/main/org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java	2007-08-28 21:55:49 UTC (rev 64932)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ant.taskdefs;
+
+
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
+import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
+
+/**
+ * This class only serves the proposite of keep multiple JUnit runnings between different configurations.
+ * For example, if you run a testcase as cluster, and the same testcase as singlenode, we want to keep both results in the JUnitReport.
+ * This is a simple implementation that uses a variable defined jboss-configuration and put that as part of the name.
+ * @author Clebert Suconic
+ */
+public class XMLJUnitMultipleResultFormatter extends XMLJUnitResultFormatter 
+{
+	
+    public void startTestSuite(JUnitTest test) 
+    { 
+        String configuration = (String)System.getProperties().get("jboss-junit-configuration");
+    	
+    	if (configuration!=null && !configuration.trim().equals("")) 
+        {
+                test.setName(test.getName() + "(" + configuration + ")");
+        }
+
+        super.startTestSuite(test);    	
+    }
+
+}