[jbpm-commits] JBoss JBPM SVN: r3401 - in jbpm3/trunk/modules/enterprise: scripts and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-12-16 09:24:23 -0500 (Tue, 16 Dec 2008) New Revision: 3401 Modified: jbpm3/trunk/modules/enterprise/pom.xml jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java Log: [JBPM-1830] Fix AppServerConfigurationsTest for sybase on jboss500 Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-12-16 13:57:21 UTC (rev 3400) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-12-16 14:24:23 UTC (rev 3401) @@ -26,6 +26,11 @@ <relativePath>../../pom.xml</relativePath> </parent> + <!-- Properties --> + <properties> + <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> + </properties> + <!-- Dependencies --> <dependencies> <!-- jBPM Dependencies --> @@ -176,7 +181,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args}</argLine> + <argLine>${surefire.security.args}</argLine> <systemProperties> <property> <name>log4j.output.dir</name> @@ -335,8 +340,6 @@ <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude> <exclude>org/jbpm/enterprise/jta/JtaDbPersistenceTest.java</exclude> <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude> - <!-- [JBPM-1830] Fix AppServerConfigurationsTest for sybase on jboss500 --> - <exclude>org/jbpm/enterprise/config/AppServerConfigurationsTest.java</exclude> </excludes> </configuration> </plugin> Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml =================================================================== --- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-12-16 13:57:21 UTC (rev 3400) +++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-12-16 14:24:23 UTC (rev 3401) @@ -22,7 +22,20 @@ <!-- enterprise-test --> <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/enterprise/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes" /> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jbpm/ejb/RemoteCommandServiceHome.class"/> + <include name="org/jbpm/ejb/RemoteCommandService.class"/> + <include name="org/jbpm/ejb/TimerEntityHome.class"/> + <include name="org/jbpm/ejb/TimerEntity.class"/> + <include name="org/jbpm/msg/jms/JmsMessageServiceFactory.class"/> + <include name="org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.class"/> + </classes> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jbpm/enterprise/config/AppServerConfigurationsTest.class"/> + <include name="org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.class"/> + <include name="org/jbpm/enterprise/jms/JmsMessageTest.class"/> + <include name="org/jbpm/enterprise/jta/JtaDbPersistenceTest.class"/> + </classes> <lib dir="${tests.output.dir}/test-dependencies"> <include name="aspectjrt*.jar"/> <include name="cactus*.jar"/> Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-12-16 13:57:21 UTC (rev 3400) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-12-16 14:24:23 UTC (rev 3401) @@ -47,7 +47,10 @@ public void testJtaDbPersistenceFactoryConfiguration() { - assertSame(JtaDbPersistenceServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE).getClass()); + String expService = JtaDbPersistenceServiceFactory.class.getName(); + String wasService = jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE).getClass().getName(); + assertEquals(expService, wasService); + JtaDbPersistenceServiceFactory persistenceServiceFactory = (JtaDbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); assertFalse(persistenceServiceFactory.isTransactionEnabled()); assertTrue(persistenceServiceFactory.isCurrentSessionEnabled()); @@ -55,11 +58,15 @@ public void testJmsMessageServiceFactoryConfiguration() { - assertSame(JmsMessageServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass()); + String expService = JmsMessageServiceFactory.class.getName(); + String wasService = jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass().getName(); + assertEquals(expService, wasService); } public void testEjbSchedulerServiceFactoryConfiguration() { - assertSame(EntitySchedulerServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_SCHEDULER).getClass()); + String expService = EntitySchedulerServiceFactory.class.getName(); + String wasService = jbpmConfiguration.getServiceFactory(Services.SERVICENAME_SCHEDULER).getClass().getName(); + assertEquals(expService, wasService); } }