[webbeans-commits] Webbeans SVN: r1692 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner: servlet and 1 other directory.
Author: pete.muir(a)jboss.org
Date: 2009-02-24 16:59:04 -0500 (Tue, 24 Feb 2009)
New Revision: 1692
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/servlet/ServletTestRunner.java
Log:
Fix expected exceptions for debug servlet mode
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-24
21:37:57 UTC (rev 1691)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-24
21:59:04 UTC (rev 1692)
@@ -39,7 +39,7 @@
return methodNames;
}
- public void run()
+ public void run(boolean ignoreExpectedExceptions)
{
AbstractDeclarativeTest.setInContainer(true);
if (classNames.size() == 0)
@@ -54,7 +54,10 @@
List<XmlSuite> xmlSuites = new ArrayList<XmlSuite>();
testNG.setXmlSuites(xmlSuites);
xmlSuites.add(createSuite());
- testNG.setAnnotationTransformer(new
RemoveExpectedExceptionsAnnotationTransformer());
+ if (ignoreExpectedExceptions)
+ {
+ testNG.setAnnotationTransformer(new
RemoveExpectedExceptionsAnnotationTransformer());
+ }
testNG.run();
this.context = listener.getContext();
this.testResults = listener.getTestResults();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-24
21:37:57 UTC (rev 1691)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-24
21:59:04 UTC (rev 1692)
@@ -45,9 +45,10 @@
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "No method
name specified");
return;
}
- runner.run();
+
if (outputMode.equals("html"))
{
+ runner.run(false);
resp.setContentType("text/html");
resp.setStatus(HttpServletResponse.SC_OK);
PrintWriter writer = resp.getWriter();
@@ -90,7 +91,7 @@
}
else if (outputMode.equals("serializedObject"))
{
-
+ runner.run(true);
ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream());
if (runner.getTestResults().size() == 1)
{