[jboss-cvs] JBossAS SVN: r108095 - in trunk/testsuite: imports/sections and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 9 16:25:35 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-09-09 16:25:34 -0400 (Thu, 09 Sep 2010)
New Revision: 108095
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/imports/sections/security.xml
trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAttachUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/management/test/JSR77SpecUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/authorization/ACLIntegrationUnitTestCase.java
Log:
JBAS-8236, JBAS-8238, JBAS-8239 - test suite fixes
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/build.xml 2010-09-09 20:25:34 UTC (rev 108095)
@@ -1176,6 +1176,8 @@
<!-- Pending completion of JBAS-5878 / JBPAPP-3674 -->
<exclude name="org/jboss/test/web/test/StatusServletTestCase.class"/>
+ <!-- JBAS-8239 -->
+ <exclude name="org/jboss/test/deadlock/test/BeanStressTestCase.class"/>
</patternset>
<patternset id="aop-with-classloader.excludes">
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/imports/sections/aop.xml 2010-09-09 20:25:34 UTC (rev 108095)
@@ -582,7 +582,7 @@
<include name="META-INF/jboss-aop.xml"/>
</fileset>
</jar>
- <jar destfile="${build.lib}/aop-scopedattachtest1.sar">
+ <jar destfile="${build.lib}/aop-scopedattachtest01.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/scopedattach/ScopedTester*.class"/>
<include name="org/jboss/test/aop/scopedattach/POJO.class"/>
@@ -604,7 +604,7 @@
<include name="META-INF/jboss-aop.xml"/>
</fileset>
</jar>
- <jar destfile="${build.lib}/aop-scopedattachtest2.sar">
+ <jar destfile="${build.lib}/aop-scopedattachtest02.sar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/scopedattach/ScopedTester*.class"/>
<include name="org/jboss/test/aop/scopedattach/POJO.class"/>
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/imports/sections/cluster.xml 2010-09-09 20:25:34 UTC (rev 108095)
@@ -766,7 +766,7 @@
</jar>
<!-- build sfsb-passexp.jar -->
- <jar destfile="${build.lib}/sfsb-passexp.jar">
+ <jar destfile="${build.lib}/sfsb-passexp1.jar">
<fileset dir="${build.classes}">
<patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/testbean/interfaces/**"/>
Modified: trunk/testsuite/imports/sections/security.xml
===================================================================
--- trunk/testsuite/imports/sections/security.xml 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/imports/sections/security.xml 2010-09-09 20:25:34 UTC (rev 108095)
@@ -454,8 +454,8 @@
</zipfileset>
</ear>
- <!-- acl-integration.jar -->
- <jar destfile="${build.lib}/acl-integration.jar">
+ <!-- acl-integration1.jar -->
+ <jar destfile="${build.lib}/acl-integration1.jar">
<metainf dir="${build.resources}/security/authorization/acl-ejb/META-INF">
<include name="jboss-acl-policy.xml" />
</metainf>
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAttachUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAttachUnitTestCase.java 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedAttachUnitTestCase.java 2010-09-09 20:25:34 UTC (rev 108095)
@@ -143,9 +143,9 @@
TestSuite suite = new TestSuite();
suite.addTest(new TestSuite(ScopedAttachUnitTestCase.class));
- setup = new AOPClassLoaderHookTestSetup(suite, "aop-scopedattachtest1.sar,aop-scopedattachtest2.sar");
+ setup = new AOPClassLoaderHookTestSetup(suite, "aop-scopedattachtest01.sar,aop-scopedattachtest02.sar");
//Since this test relies on some of the aspects from base-aspects.xml, deploy those for this test
setup.setUseBaseXml(true);
return setup;
}
-}
\ No newline at end of file
+}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java 2010-09-09 20:25:34 UTC (rev 108095)
@@ -67,7 +67,7 @@
public static Test suite() throws Exception
{
return JBossClusteredTestCase.getDeploySetup(StatefulPassivationExpirationUnitTestCase.class,
- "sfsb-passexp.sar, sfsb-passexp.jar");
+ "sfsb-passexp.sar, sfsb-passexp1.jar");
}
/**
Modified: trunk/testsuite/src/main/org/jboss/test/management/test/JSR77SpecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/management/test/JSR77SpecUnitTestCase.java 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/src/main/org/jboss/test/management/test/JSR77SpecUnitTestCase.java 2010-09-09 20:25:34 UTC (rev 108095)
@@ -248,9 +248,11 @@
jsr77MEJB.remove();
}
- /** Test JMSResource availability.
+ /* Test JMSResource availability.
* @throws Exception
- */
+ *
+ * JBAS-8238 - exclude
+
public void testJMSResource() throws Exception
{
getLog().debug("+++ testJMSResource");
@@ -267,7 +269,7 @@
while (iter.hasNext())
getLog().debug("JMSResource: " + iter.next());
jsr77MEJB.remove();
- }
+ } */
// NYI - see JBAS-5545
//
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/authorization/ACLIntegrationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/authorization/ACLIntegrationUnitTestCase.java 2010-09-09 20:24:01 UTC (rev 108094)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/authorization/ACLIntegrationUnitTestCase.java 2010-09-09 20:25:34 UTC (rev 108095)
@@ -167,7 +167,7 @@
// deploy the web application that calls the ACL module.
deploy("acl-integration.war");
// deploy the ejb application that calls the ACL module.
- deploy("acl-integration.jar");
+ deploy("acl-integration1.jar");
}
/*
@@ -179,7 +179,7 @@
protected void tearDown() throws Exception
{
// undeploy the test ejb application.
- undeploy("acl-integration.jar");
+ undeploy("acl-integration1.jar");
// undeploy the test web application.
undeploy("acl-integration.war");
// undeploy the application policy.
More information about the jboss-cvs-commits
mailing list