Author: pete.muir(a)jboss.org Date: 2009-02-18 12:49:01 -0500 (Wed, 18 Feb 2009) New Revision: 1574 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/RemoveExpectedExceptionsAnnotationTransformer.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java Log: pass expected exceptions to the client! Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 16:52:33 UTC (rev 1573) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 17:49:01 UTC (rev 1574) @@ -253,6 +253,7 @@ if (result.getStatus().equals(Status.FAILED) || result.getStatus().equals(Status.SKIPPED)) { testResult.setThrowable(result.getThrowable()); + testResult.setStatus(ITestResult.FAILURE); } } catch (IOException e) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-18 16:52:33 UTC (rev 1573) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-18 17:49:01 UTC (rev 1574) @@ -4,6 +4,7 @@ import java.util.List; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.testng.RemoveExpectedExceptionsAnnotationTransformer; import org.jboss.jsr299.tck.impl.util.DeploymentProperties; import org.testng.ITestContext; import org.testng.ITestResult; @@ -53,6 +54,7 @@ List<XmlSuite> xmlSuites = new ArrayList<XmlSuite>(); testNG.setXmlSuites(xmlSuites); xmlSuites.add(createSuite()); + testNG.setAnnotationTransformer(new RemoveExpectedExceptionsAnnotationTransformer()); testNG.run(); this.context = listener.getContext(); this.testResults = listener.getTestResults(); Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/RemoveExpectedExceptionsAnnotationTransformer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/RemoveExpectedExceptionsAnnotationTransformer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/RemoveExpectedExceptionsAnnotationTransformer.java 2009-02-18 17:49:01 UTC (rev 1574) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.impl.testng; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; + +import org.testng.internal.annotations.IAnnotationTransformer; +import org.testng.internal.annotations.ITest; + +public class RemoveExpectedExceptionsAnnotationTransformer implements IAnnotationTransformer +{ + + public void transform(ITest arg0, Class arg1, Constructor arg2, Method arg3) + { + arg0.setExpectedExceptions(new Class<?>[0]); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/RemoveExpectedExceptionsAnnotationTransformer.java ___________________________________________________________________ Name: svn:mime-type + text/plain