[jboss-svn-commits] JBoss Portal SVN: r5206 - in trunk: common common/src/main/org/jboss/portal/test/common tools/etc/buildfragments

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-09-14 19:36:20 -0400 (Thu, 14 Sep 2006)
New Revision: 5206

Modified:
   trunk/common/build.xml
   trunk/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java
   trunk/tools/etc/buildfragments/buildmagic.ent
Log:
provide build.lib directory to test case

Modified: trunk/common/build.xml
===================================================================
--- trunk/common/build.xml	2006-09-14 23:21:53 UTC (rev 5205)
+++ trunk/common/build.xml	2006-09-14 23:36:20 UTC (rev 5206)
@@ -183,7 +183,7 @@
    <target name="most" depends="_default:most"/>
    <target name="help" depends="_default:help"/>
 
-   <target name="tests" depends="compile">
+   <target name="tests" depends="init">
       <execute-tests>
          <x-test>
             <test todir="${test.reports}" name="org.jboss.portal.test.common.AbstractInvocationContextTestCase"/>

Modified: trunk/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java	2006-09-14 23:21:53 UTC (rev 5205)
+++ trunk/common/src/main/org/jboss/portal/test/common/URLNavigatorTestCase.java	2006-09-14 23:36:20 UTC (rev 5206)
@@ -114,7 +114,9 @@
 
    public void testJar() throws Exception
    {
-      File libDir = new File(System.getProperty("build.lib"));
+      String libPath = System.getProperty("build.lib");
+      assertNotNull(libPath);
+      File libDir = new File(libPath);
       assertTrue(libDir.exists());
       assertTrue(libDir.isDirectory());
       File jarFile = new File(libDir, "test.jar");
@@ -137,7 +139,8 @@
 
    public void testFile() throws Exception
    {
-      File resourcesDir = new File(System.getProperty("build.resources"));
+      String resourcePath = System.getProperty("build.resources");
+      File resourcesDir = new File(resourcePath);
       assertTrue(resourcesDir.exists());
       assertTrue(resourcesDir.isDirectory());
 

Modified: trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- trunk/tools/etc/buildfragments/buildmagic.ent	2006-09-14 23:21:53 UTC (rev 5205)
+++ trunk/tools/etc/buildfragments/buildmagic.ent	2006-09-14 23:36:20 UTC (rev 5206)
@@ -650,6 +650,7 @@
                usefile="${junit.formatter.usefile}"
                extension="${jboss-junit-configuration}.xml"/>
             <sysproperty key="build.resources" value="${build.resources}"/>
+            <sysproperty key="build.lib" value="${build.lib}"/>
             <!-- definition of the property for keeping results between configuration -->
             <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
             <x-sysproperty/>