Author: chris.laprun(a)jboss.com Date: 2007-06-04 19:55:06 -0400 (Mon, 04 Jun 2007) New Revision: 7382 Modified: trunk/wsrp/build.xml trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml Log: - Added dependencies for ConsumerRegistryTestCase. - Activated ConsumerRegistryTestCase that correctly starts (but fails). - Minor changes. Modified: trunk/wsrp/build.xml =================================================================== --- trunk/wsrp/build.xml 2007-06-04 00:41:03 UTC (rev 7381) +++ trunk/wsrp/build.xml 2007-06-04 23:55:06 UTC (rev 7382) @@ -762,31 +762,40 @@ <!-- Consumer-specific tests --> <target name="consumer-test" depends="package-consumer-test"> <execute-tests> + <x-sysproperty> + <!--<jvmarg value="-Xdebug"/> + <jvmarg value="-Xnoagent"/> + <jvmarg value="-Djava.compiler=NONE"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>--> + <sysproperty key="test.root" value="${build.lib}/tests"/> + <sysproperty + key="jboss.aop.path" + value="${build.resources}/portal-wsrp-sar/wsrp-aop.xml"/> + <sysproperty + key="jboss.aop.class.path" + value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> + </x-sysproperty> <x-test> <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.ProducerSessionInformationTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.EndpointConfigurationInfoTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.ProducerInfoTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.RegistrationInfoTestCase"/> - <!--<zest todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.ConsumerRegistryTestCase" + <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.RegistrationInfoTestCase"/> + <zest todir="${test.reports}" name="org.jboss.portal.test.wsrp.consumer.ConsumerRegistryTestCase" outfile="TEST-ConsumerRegistryTestCase"> <parameter name="Config" value="persistent-jboss-beans.xml"/> - </zest>--> + </zest> </x-test> - <x-sysproperty> - <!--<jvmarg value="-Xdebug"/> - <jvmarg value="-Xnoagent"/> - <jvmarg value="-Djava.compiler=NONE"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>--> - <sysproperty key="test.root" value="${build.lib}/tests"/> - </x-sysproperty> <x-classpath> + <!-- Access to conf/consumer/hibernate/domain.hbm.xml --> <pathelement location="${build.lib}/portal-wsrp.sar"/> - <!-- Access to conf/consumer/hibernate/domain.hbm.xml --> + <pathelement location="${build.lib}/portal-wsrp-lib.jar"/> <pathelement location="${build.lib.test}/test-consumer-lib.jar"/> + + <!-- Needed to access datasources.xml --> <pathelement location="${jboss.portal-test.root}/etc"/> - <!-- Needed to access datasources.xml --> + <path refid="jboss.microcontainer.classpath"/> <!-- Required for test framework --> @@ -794,6 +803,7 @@ <path refid="cglib.cglib.classpath"/> <path refid="aop.classpath"/> <path refid="asm.asm.classpath"/> + <path refid="antlr.antlr.classpath"/> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java 2007-06-04 00:41:03 UTC (rev 7381) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java 2007-06-04 23:55:06 UTC (rev 7382) @@ -58,18 +58,6 @@ return "org/jboss/portal/test/wsrp/consumer/" + paramValue.get(); } - protected void setUp() throws Exception - { - super.setUp(); - - System.out.println("ConsumerRegistryTestCase.setUp"); - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - public ConsumerRegistry getRegistry() { return registry; Modified: trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml =================================================================== --- trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml 2007-06-04 00:41:03 UTC (rev 7381) +++ trunk/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml 2007-06-04 23:55:06 UTC (rev 7382) @@ -41,11 +41,9 @@ </constructor> </bean> - <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport"> - </bean> + <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport"/> - <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport"> - </bean> + <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport"/> <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>