Author: aheritier
Date: Mon Aug 29 13:37:55 2005
New Revision: 264636

URL: http://svn.apache.org/viewcvs?rev=264636&view=rev
Log:
Fix junit tests (ressources paths) when launched in the reactor

Modified:
    
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java
    
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java

Modified: 
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java?rev=264636&r1=264635&r2=264636&view=diff
==============================================================================
--- 
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java
 (original)
+++ 
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java
 Mon Aug 29 13:37:55 2005
@@ -6,30 +6,35 @@
 

 import org.apache.maven.jxr.pacman.PackageManager;

 

-public class CodeTransformTest extends TestCase {

+public class CodeTransformTest

+    extends TestCase

+{

 

     private CodeTransform codeTransform;

 

     private PackageManager packageManager;

 

-    protected void setUp() throws Exception {

+    protected void setUp()

+        throws Exception

+    {

         super.setUp();

         packageManager = new PackageManager();

-        codeTransform = new CodeTransform(packageManager);

+        codeTransform = new CodeTransform( packageManager );

     }

 

-    public void testTransform() throws Exception {

-        File sourceFile = new File(

-                "src/test/org/apache/maven/jxr/CodeTransformTest.java");

-        assertTrue(sourceFile.exists());

-        codeTransform.transform(sourceFile.getAbsolutePath(),

-                "target/CodeTransformTest.html", "en", "ISO-8859-1",

-                "ISO-8859-1", "", "");

-//        sourceFile = new 
File("src/test/org/apache/maven/jxr/package-info.java");

-//        assertTrue(sourceFile.exists());

-//        codeTransform.transform(sourceFile.getAbsolutePath(),

-//                "target/pakage-info.html", "en", "ISO-8859-1", "ISO-8859-1",

-//                "", "");

+    public void testTransform()

+        throws Exception

+    {

+        File sourceFile = new File( System.getProperty( "basedir" )

+            + "/src/test/org/apache/maven/jxr/CodeTransformTest.java" );

+        assertTrue( sourceFile.exists() );

+        codeTransform.transform( sourceFile.getAbsolutePath(), 
System.getProperty( "basedir" )

+            + "/target/CodeTransformTest.html", "en", "ISO-8859-1", 
"ISO-8859-1", "", "" );

+        //        sourceFile = new 
File("src/test/org/apache/maven/jxr/package-info.java");

+        //        assertTrue(sourceFile.exists());

+        //        codeTransform.transform(sourceFile.getAbsolutePath(),

+        //                "target/pakage-info.html", "en", "ISO-8859-1", 
"ISO-8859-1",

+        //                "", "");

     }

 

 }


Modified: 
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java?rev=264636&r1=264635&r2=264636&view=diff
==============================================================================
--- 
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java 
(original)
+++ 
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java 
Mon Aug 29 13:37:55 2005
@@ -2,25 +2,31 @@
 

 import junit.framework.TestCase;

 

-public class JxrBeanTest extends TestCase {

+public class JxrBeanTest

+    extends TestCase

+{

 

     private JxrBean jxrBean;

 

-    protected void setUp() throws Exception {

+    protected void setUp()

+        throws Exception

+    {

         super.setUp();

         jxrBean = new JxrBean();

-        jxrBean.setSourceDir("src/test");

-        jxrBean.setDestDir("target");

-        jxrBean.setInputEncoding("ISO-8859-1");

-        jxrBean.setOutputEncoding("ISO-8859-1");

-        jxrBean.setTemplateDir("src/plugin-resources/templates");

-        jxrBean.setJavadocDir("");

-        jxrBean.setWindowTitle("title");

-        jxrBean.setDocTitle("title");

-        jxrBean.setBottom("copyright");

+        jxrBean.setSourceDir( System.getProperty( "basedir" ) + "/src/test" );

+        jxrBean.setDestDir( System.getProperty( "basedir" ) + "/target" );

+        jxrBean.setInputEncoding( "ISO-8859-1" );

+        jxrBean.setOutputEncoding( "ISO-8859-1" );

+        jxrBean.setTemplateDir( System.getProperty( "basedir" ) + 
"/src/plugin-resources/templates" );

+        jxrBean.setJavadocDir( "" );

+        jxrBean.setWindowTitle( "title" );

+        jxrBean.setDocTitle( "title" );

+        jxrBean.setBottom( "copyright" );

     }

 

-    public void testXref() throws Exception {

+    public void testXref()

+        throws Exception

+    {

         jxrBean.xref();

     }

 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to