[webbeans-commits] Webbeans SVN: r1571 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Feb 18 10:40:28 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-18 10:40:28 -0500 (Wed, 18 Feb 2009)
New Revision: 1571
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
Log:
skip deployment errors incontainer for now
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 15:08:47 UTC (rev 1570)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-18 15:40:28 UTC (rev 1571)
@@ -43,6 +43,7 @@
private TCKArtifactDescriptor artifact;
private DeploymentException deploymentException;
+ private boolean skipTest = false;
private boolean isSuiteDeployingTestsToContainer()
{
@@ -114,7 +115,13 @@
{
// We expect this exception, so ignore it
deploymentException = null;
+ skipTest = true;
}
+ else if (!getCurrentConfiguration().isStandalone())
+ {
+ deploymentException = null;
+ skipTest = true;
+ }
}
else
{
@@ -198,6 +205,7 @@
undeployArtifact();
this.artifact = null;
this.deploymentException = null;
+ skipTest = false;
}
@BeforeMethod(alwaysRun=true)
@@ -233,11 +241,11 @@
{
testResult.setThrowable(deploymentException.getCause());
}
- else if (!isDeployToContainerNeeded())
+ else if (!isDeployToContainerNeeded() && !skipTest)
{
callback.runTestMethod(testResult);
}
- else
+ else if (!skipTest)
{
try
{
More information about the weld-commits
mailing list