Author: dblevins
Date: Fri Dec 30 02:55:45 2011
New Revision: 1225732
URL: http://svn.apache.org/viewvc?rev=1225732&view=rev
Log:
Force OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS to "false" for these tests
as validation issues will cause OUTPUT_DESCRIPTORS to be turned on unless it is
explicitly set.
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java?rev=1225732&r1=1225731&r2=1225732&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
Fri Dec 30 02:55:45 2011
@@ -35,9 +35,11 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.OutputGeneratedDescriptors;
import org.apache.openejb.config.ValidationFailedException;
import org.apache.openejb.config.ValidationFailure;
import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Join;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.Statement;
@@ -69,7 +71,11 @@ public class InvokeMethod extends Statem
Map<Integer, List<String>> expectedKeys = validateKeys();
setUp();
Object obj = testMethod.invokeExplosively(target);
+
+ final String outputDescriptors =
SystemInstance.get().getProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS,
"false");
try {
+
SystemInstance.get().setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS,
"false");
+
if (obj instanceof EjbJar) {
EjbJar ejbJar = (EjbJar) obj;
assembler.createApplication(config.configureApplication(ejbJar));
@@ -100,7 +106,10 @@ public class InvokeMethod extends Statem
}
fail("There should be no validation failures");
}
+ } finally {
+
SystemInstance.get().setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS,
outputDescriptors);
}
+
tearDown();
}