From 463c38f1c4bda3ad19212e68cd13fa3be1fce2f1 Mon Sep 17 00:00:00 2001 From: aheritier Date: Mon, 29 Aug 2005 20:37:55 +0000 Subject: [PATCH] Fix junit tests (ressources paths) when launched in the reactor git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@264636 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/jxr/CodeTransformTest.java | 35 +++++++++++-------- .../org/apache/maven/jxr/JxrBeanTest.java | 30 +++++++++------- 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java b/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java index 165821f7..197cf3e5 100644 --- a/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java +++ b/jxr/src/test/org/apache/maven/jxr/CodeTransformTest.java @@ -6,30 +6,35 @@ import junit.framework.TestCase; 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", + // "", ""); } } diff --git a/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java b/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java index 9cee6cbb..4ff6db28 100644 --- a/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java +++ b/jxr/src/test/org/apache/maven/jxr/JxrBeanTest.java @@ -2,25 +2,31 @@ package org.apache.maven.jxr; 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(); }