[jboss-cvs] JBossAS SVN: r103422 - in projects/ejb3/trunk/testsuite: src/main/java/org/jboss/ejb3/testsuite/ant/taskdefs/optional/junit and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 1 09:11:50 EDT 2010
Author: wolfc
Date: 2010-04-01 09:11:49 -0400 (Thu, 01 Apr 2010)
New Revision: 103422
Added:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/testsuite/
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/testsuite/TestSetupErrorTestCase.java
Modified:
projects/ejb3/trunk/testsuite/pom.xml
projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/ant/taskdefs/optional/junit/KnownIssuesXMLJUnitResultFormatter.java
projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/knownissue/KnownIssues.java
Log:
EJBTHREE-2067: counting test cases at start of test
Modified: projects/ejb3/trunk/testsuite/pom.xml
===================================================================
--- projects/ejb3/trunk/testsuite/pom.xml 2010-04-01 12:41:25 UTC (rev 103421)
+++ projects/ejb3/trunk/testsuite/pom.xml 2010-04-01 13:11:49 UTC (rev 103422)
@@ -158,7 +158,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <exclude>**/*.java</exclude>
+ <exclude>org/jboss/ejb3/test/**/*.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -294,6 +294,13 @@
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
Modified: projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/ant/taskdefs/optional/junit/KnownIssuesXMLJUnitResultFormatter.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/ant/taskdefs/optional/junit/KnownIssuesXMLJUnitResultFormatter.java 2010-04-01 12:41:25 UTC (rev 103421)
+++ projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/ant/taskdefs/optional/junit/KnownIssuesXMLJUnitResultFormatter.java 2010-04-01 13:11:49 UTC (rev 103422)
@@ -21,11 +21,7 @@
*/
package org.jboss.ejb3.testsuite.ant.taskdefs.optional.junit;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-
import junit.framework.Test;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
import org.apache.tools.ant.taskdefs.optional.junit.JUnitVersionHelper;
@@ -33,6 +29,8 @@
import org.jboss.ejb3.testsuite.knownissue.KnownIssues;
import org.jboss.ejb3.testsuite.lang.reflect.Invoker;
+import java.lang.reflect.Method;
+
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
* @version $Revision: $
@@ -44,13 +42,11 @@
formatErrorMethod = Invoker.getMethod(XMLJUnitResultFormatter.class, "formatError", String.class, Test.class, Throwable.class);
}
- protected Hashtable<Test, Test> failedTests;
private long runCount = 0, failures = 0, errors = 0;
public KnownIssuesXMLJUnitResultFormatter()
{
super();
- this.failedTests = Invoker.getFieldValue(this, XMLJUnitResultFormatter.class, "failedTests");
}
@Override
@@ -85,15 +81,6 @@
}
@Override
- public void endTest(Test test)
- {
- // formatError also calls endTest
- if(!failedTests.contains(test))
- runCount += test.countTestCases();
- super.endTest(test);
- }
-
- @Override
public void endTestSuite(JUnitTest suite) throws BuildException
{
long oldRunCount = suite.runCount();
@@ -108,8 +95,15 @@
// expose formatError the hacky way
Invoker.invoke(formatErrorMethod, this, type, test, t);
}
-
+
@Override
+ public void startTest(Test test)
+ {
+ runCount += test.countTestCases();
+ super.startTest(test);
+ }
+
+ @Override
public void startTestSuite(JUnitTest suite)
{
runCount = 0;
Modified: projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/knownissue/KnownIssues.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/knownissue/KnownIssues.java 2010-04-01 12:41:25 UTC (rev 103421)
+++ projects/ejb3/trunk/testsuite/src/main/java/org/jboss/ejb3/testsuite/knownissue/KnownIssues.java 2010-04-01 13:11:49 UTC (rev 103422)
@@ -29,7 +29,8 @@
/**
*
* Per default all known issues will fail. To override specify
- * a known issues properties file via -DknownIssues=filename.
+ * a known issues properties file via system property 'knownIssuesFile'.
+ * So java -DknownIssuesFile=filename.
*
* This file contains the action to take when a known issue is encountered.
*
@@ -55,7 +56,12 @@
private KnownIssues()
{
}
-
+
+ /**
+ * Find the action to take for the specified issue.
+ * @param issue the issue to query
+ * @return the action to perform
+ */
public static Action getAction(String issue)
{
Properties actions = getActions();
Added: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/testsuite/TestSetupErrorTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/testsuite/TestSetupErrorTestCase.java (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/testsuite/TestSetupErrorTestCase.java 2010-04-01 13:11:49 UTC (rev 103422)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2010, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ejb3.testsuite;
+
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
+import org.jboss.ejb3.testsuite.ant.taskdefs.optional.junit.KnownIssuesXMLJUnitResultFormatter;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public class TestSetupErrorTestCase
+{
+ @Test
+ public void testError()
+ {
+ boolean assertions = false;
+ assert assertions = true;
+ assertTrue("please enable assertions", assertions);
+
+ KnownIssuesXMLJUnitResultFormatter formatter = new KnownIssuesXMLJUnitResultFormatter();
+ formatter.setOutput(System.out);
+ JUnitTest suite = new JUnitTest("testError");
+ // we're going to run 1 test
+ suite.setCounts(1, 0, 0);
+ formatter.startTestSuite(suite);
+ junit.framework.TestCase test = mock(junit.framework.TestCase.class);
+ when(test.countTestCases()).thenReturn(1);
+ when(test.getName()).thenReturn("testError");
+ // start test
+ formatter.startTest(test);
+ // end test
+ formatter.endTest(test);
+ // oops an error afterwards
+ formatter.addError(test, new Exception("not important"));
+ formatter.endTestSuite(suite);
+ }
+}
Property changes on: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/testsuite/TestSetupErrorTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list