Author: julien(a)jboss.com Date: 2007-10-23 10:45:40 -0400 (Tue, 23 Oct 2007) New Revision: 8752 Added: modules/portlet/trunk/test/src/resources/test/deployment/ Removed: modules/portlet/trunk/portlet/src/resources/test/deployment/ Modified: modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java Log: tweaks to correct failling test cases Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-10-23 13:57:28 UTC (rev 8751) +++ modules/portlet/trunk/test/build.xml 2007-10-23 14:45:40 UTC (rev 8752) @@ -573,6 +573,8 @@ <classpath> + <pathelement location="${build.resources}/test"/> + <path refid="jboss.portal/modules/test.classpath"/> <path location="../tools/lib/ant.jar"/> <path location="../tools/lib/ant-launcher.jar"/> Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-10-23 13:57:28 UTC (rev 8751) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-10-23 14:45:40 UTC (rev 8752) @@ -49,11 +49,10 @@ public class UnmarshallerTestCase { - @Test public void testJBossPortletXML() throws Exception { - URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); - assertTrue(URLTools.exists(jbossPortletXML)); + URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("deployment/jboss-portlet.xml"); + assertTrue(URLTools.exists(assertNotNull(jbossPortletXML))); // JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory(); @@ -97,8 +96,8 @@ @Test public void testPortletXML() throws Exception { - URL portletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/portlet.xml"); - assertTrue(URLTools.exists(portletXML)); + URL portletXML = Thread.currentThread().getContextClassLoader().getResource("deployment/portlet.xml"); + assertTrue(URLTools.exists(assertNotNull(portletXML))); // // URL portletXSD = Thread.currentThread().getContextClassLoader().getResource("portlet-app_1_0.xsd"); Copied: modules/portlet/trunk/test/src/resources/test/deployment (from rev 8636, modules/portlet/trunk/portlet/src/resources/test/deployment)