You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by an...@apache.org on 2014/03/31 01:40:54 UTC
svn commit: r1583223 [2/2] - in /ant/core/trunk: ./ src/etc/testcases/
src/etc/testcases/core/ src/etc/testcases/core/loaderref/
src/etc/testcases/filters/ src/etc/testcases/taskdefs/
src/etc/testcases/taskdefs/javadoc/ src/etc/testcases/taskdefs/optio...
Added: ant/core/trunk/src/main/org/apache/tools/ant/util/ProcessUtil.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/ProcessUtil.java?rev=1583223&view=auto
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/ProcessUtil.java (added)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/ProcessUtil.java Sun Mar 30 23:40:53 2014
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.tools.ant.util;
+
+import java.lang.management.ManagementFactory;
+
+/**
+ * Process Utilities
+ */
+public class ProcessUtil {
+ /**
+ * provide id of the current process
+ * @param fallback
+ * @return current process id
+ */
+ public static String getProcessId(final String fallback) {
+ // Note: may fail in some JVM implementations
+ // therefore fallback has to be provided
+
+ // something like '<pid>@<hostname>', at least in SUN / Oracle JVMs
+ final String jvmName = ManagementFactory.getRuntimeMXBean().getName();
+ final int index = jvmName.indexOf('@');
+
+ if (index < 1) {
+ // part before '@' empty (index = 0) / '@' not found (index = -1)
+ return fallback;
+ }
+
+ try {
+ return Long.toString(Long.parseLong(jvmName.substring(0, index)));
+ } catch (NumberFormatException e) {
+ // ignore
+ }
+ return fallback;
+ }
+ public static void main(String [] args) {
+ System.out.println(getProcessId("<PID>"));
+ try {
+ Thread.sleep(120000);
+ } catch (Exception exc) {}
+ }
+}
Propchange: ant/core/trunk/src/main/org/apache/tools/ant/util/ProcessUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java Sun Mar 30 23:40:53 2014
@@ -30,7 +30,6 @@ import org.apache.tools.ant.util.FileUti
*/
public class AntClassLoaderTest extends BuildFileTest {
- private Project p;
private AntClassLoader loader;
public AntClassLoaderTest(String name) {
@@ -38,17 +37,19 @@ public class AntClassLoaderTest extends
}
public void setUp() {
- p = new Project();
- p.init();
- configureProject("src/etc/testcases/core/antclassloader.xml");
- getProject().executeTarget("setup");
+ super.configureProject("src/etc/testcases/core/antclassloader.xml");
+ getProject().executeTarget("setUp");
}
public void tearDown() {
if (loader != null) {
loader.cleanup();
}
- getProject().executeTarget("cleanup");
+ try {
+ super.tearDown();
+ } catch ( Exception e) {
+ System.err.println(e.getMessage());
+ }
}
//test inspired by bug report 37085
public void testJarWithManifestInDirWithSpace() {
@@ -72,8 +73,8 @@ public class AntClassLoaderTest extends
assertEquals(mainjarstring + File.pathSeparator + extjarstring, path);
}
public void testCleanup() throws BuildException {
- Path path = new Path(p, ".");
- loader = p.createClassLoader(path);
+ Path path = new Path(project, ".");
+ loader = project.createClassLoader(path);
try {
// we don't expect to find this
loader.findClass("fubar");
@@ -94,7 +95,7 @@ public class AntClassLoaderTest extends
}
// tell the build it is finished
- p.fireBuildFinished(null);
+ project.fireBuildFinished(null);
try {
// we don't expect to find this
loader.findClass("fubar");
@@ -149,7 +150,9 @@ public class AntClassLoaderTest extends
}
/**
- * @see https://issues.apache.org/bugzilla/show_bug.cgi?id=47593
+ * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=47593">
+ * bug 47593, request to log the name of corrupt zip files from which
+ * classes cannot be loaded</a>
*/
public void testInvalidZipException() throws Exception {
executeTarget("createNonJar");
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java Sun Mar 30 23:40:53 2014
@@ -23,6 +23,7 @@ import java.io.PrintStream;
import java.net.URL;
import junit.framework.TestCase;
+import org.apache.tools.ant.util.ProcessUtil;
/**
* A BuildFileTest is a TestCase which executes targets from an Ant buildfile
@@ -296,6 +297,9 @@ public abstract class BuildFileTest exte
project.init();
File antFile = new File(System.getProperty("root"), filename);
project.setUserProperty("ant.file" , antFile.getAbsolutePath());
+ // set two new properties to allow to build unique names when running multithreaded tests
+ project.setProperty("ant.processid", ProcessUtil.getProcessId("<Process>"));
+ project.setProperty("ant.threadname", Thread.currentThread().getName());
project.addBuildListener(new AntTestListener(logLevel));
ProjectHelper.configureProject(project, antFile);
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java Sun Mar 30 23:40:53 2014
@@ -43,16 +43,13 @@ public class DirectoryScannerTest extend
public void setUp() {
configureProject("src/etc/testcases/core/directoryscanner.xml");
- getProject().executeTarget("setup");
+ getProject().executeTarget("setUp");
}
- public void tearDown() {
- getProject().executeTarget("cleanup");
- }
public void test1() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha"});
ds.scan();
compareFiles(ds, new String[] {} ,new String[] {"alpha"});
@@ -60,7 +57,7 @@ public class DirectoryScannerTest extend
public void test2() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/beta.xml",
@@ -70,7 +67,7 @@ public class DirectoryScannerTest extend
public void test3() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/beta.xml",
"alpha/beta/gamma/gamma.xml"},
@@ -80,7 +77,7 @@ public class DirectoryScannerTest extend
public void testFullPathMatchesCaseSensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/beta/gamma/GAMMA.XML"});
ds.scan();
compareFiles(ds, new String[] {}, new String[] {});
@@ -89,7 +86,7 @@ public class DirectoryScannerTest extend
public void testFullPathMatchesCaseInsensitive() {
DirectoryScanner ds = new DirectoryScanner();
ds.setCaseSensitive(false);
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/beta/gamma/GAMMA.XML"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
@@ -98,7 +95,7 @@ public class DirectoryScannerTest extend
public void test2ButCaseInsensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"ALPHA/"});
ds.setCaseSensitive(false);
ds.scan();
@@ -114,7 +111,7 @@ public class DirectoryScannerTest extend
getProject().executeTarget("symlink-setup");
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/beta/gamma/"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
@@ -128,7 +125,7 @@ public class DirectoryScannerTest extend
getProject().executeTarget("symlink-setup");
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/beta/gamma/"});
ds.setFollowSymlinks(false);
ds.scan();
@@ -141,13 +138,13 @@ public class DirectoryScannerTest extend
"alpha/beta/gamma/gamma.xml"};
String [] expectedDirectories = {"alpha/beta", "alpha/beta/gamma" };
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/be?a/**", "alpha/beta/gamma/"});
ds.scan();
compareFiles(ds, expectedFiles, expectedDirectories);
// redo the test, but the 2 include patterns are inverted
ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/beta/gamma/", "alpha/be?a/**"});
ds.scan();
compareFiles(ds, expectedFiles, expectedDirectories);
@@ -155,7 +152,7 @@ public class DirectoryScannerTest extend
public void testPatternsDifferInCaseScanningSensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/", "ALPHA/"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/beta.xml",
@@ -165,7 +162,7 @@ public class DirectoryScannerTest extend
public void testPatternsDifferInCaseScanningInsensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/", "ALPHA/"});
ds.setCaseSensitive(false);
ds.scan();
@@ -176,7 +173,7 @@ public class DirectoryScannerTest extend
public void testFullpathDiffersInCaseScanningSensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {
"alpha/beta/gamma/gamma.xml",
"alpha/beta/gamma/GAMMA.XML"
@@ -188,7 +185,7 @@ public class DirectoryScannerTest extend
public void testFullpathDiffersInCaseScanningInsensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {
"alpha/beta/gamma/gamma.xml",
"alpha/beta/gamma/GAMMA.XML"
@@ -201,7 +198,7 @@ public class DirectoryScannerTest extend
public void testParentDiffersInCaseScanningSensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/", "ALPHA/beta/"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/beta.xml",
@@ -211,7 +208,7 @@ public class DirectoryScannerTest extend
public void testParentDiffersInCaseScanningInsensitive() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/", "ALPHA/beta/"});
ds.setCaseSensitive(false);
ds.scan();
@@ -318,7 +315,7 @@ public class DirectoryScannerTest extend
public void testExcludeOneFile() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {
"**/*.xml"
});
@@ -332,7 +329,7 @@ public class DirectoryScannerTest extend
public void testExcludeHasPrecedence() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {
"alpha/**"
});
@@ -347,7 +344,7 @@ public class DirectoryScannerTest extend
public void testAlternateIncludeExclude() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setIncludes(new String[] {
"alpha/**",
"alpha/beta/gamma/**"
@@ -363,7 +360,7 @@ public class DirectoryScannerTest extend
public void testAlternateExcludeInclude() {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setExcludes(new String[] {
"alpha/**",
"alpha/beta/gamma/**"
@@ -383,7 +380,7 @@ public class DirectoryScannerTest extend
public void testChildrenOfExcludedDirectory() {
getProject().executeTarget("children-of-excluded-dir-setup");
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setExcludes(new String[] {"alpha/**"});
ds.setFollowSymlinks(false);
ds.scan();
@@ -391,7 +388,7 @@ public class DirectoryScannerTest extend
new String[] {"", "delta"});
ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setExcludes(new String[] {"alpha"});
ds.setFollowSymlinks(false);
ds.scan();
@@ -417,7 +414,7 @@ public class DirectoryScannerTest extend
}
getProject().executeTarget("children-of-excluded-dir-setup");
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setExcludes(new String[] {"**/gamma/**"});
ds.setFollowSymlinks(false);
ds.scan();
@@ -430,8 +427,8 @@ public class DirectoryScannerTest extend
public void testAbsolute1() {
getProject().executeTarget("extended-setup");
DirectoryScanner ds = new DirectoryScanner();
- String tmpdir = getProject().getBaseDir().getAbsolutePath().replace(
- File.separatorChar, '/') + "/tmp";
+ String tmpdir = getProject().getProperty("output").replace(
+ File.separatorChar, '/');
ds.setIncludes(new String[] {tmpdir + "/**/*"});
ds.scan();
compareFiles(ds, new String[] {tmpdir + "/alpha/beta/beta.xml",
@@ -444,7 +441,6 @@ public class DirectoryScannerTest extend
}
public void testAbsolute2() {
- getProject().executeTarget("setup");
DirectoryScanner ds = new DirectoryScanner();
ds.setIncludes(new String[] {"alpha/**", "alpha/beta/gamma/**"});
ds.scan();
@@ -455,8 +451,8 @@ public class DirectoryScannerTest extend
public void testAbsolute3() {
getProject().executeTarget("extended-setup");
DirectoryScanner ds = new DirectoryScanner();
- String tmpdir = getProject().getBaseDir().getAbsolutePath().replace(
- File.separatorChar, '/') + "/tmp";
+ String tmpdir = getProject().getProperty("output").replace(
+ File.separatorChar, '/');
ds.setIncludes(new String[] {tmpdir + "/**/*"});
ds.setExcludes(new String[] {"**/alpha",
"**/delta/*"});
@@ -471,8 +467,8 @@ public class DirectoryScannerTest extend
public void testAbsolute4() {
getProject().executeTarget("extended-setup");
DirectoryScanner ds = new DirectoryScanner();
- String tmpdir = getProject().getBaseDir().getAbsolutePath().replace(
- File.separatorChar, '/') + "/tmp";
+ String tmpdir = getProject().getProperty("output").replace(
+ File.separatorChar, '/') ;
ds.setIncludes(new String[] {tmpdir + "/alpha/beta/**/*",
tmpdir + "/delta/*"});
ds.setExcludes(new String[] {"**/beta.xml"});
@@ -535,7 +531,7 @@ public class DirectoryScannerTest extend
public void testRecursiveExcludes() throws Exception {
DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+ ds.setBasedir(new File(getProject().getProperty("output")));
ds.setExcludes(new String[] {"**/beta/**"});
ds.scan();
List dirs = Arrays.asList(ds.getExcludedDirectories());
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/LoaderRefTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/LoaderRefTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/LoaderRefTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/LoaderRefTest.java Sun Mar 30 23:40:53 2014
@@ -30,10 +30,7 @@ public class LoaderRefTest extends Build
public void setUp() {
configureProject("src/etc/testcases/core/loaderref/loaderref.xml");
- }
-
- public void tearDown() {
- executeTarget("clean");
+ executeTarget("setUp");
}
// override allowed on <available>
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/TaskContainerTest.java Sun Mar 30 23:40:53 2014
@@ -28,10 +28,6 @@ public class TaskContainerTest extends B
configureProject("src/etc/testcases/core/taskcontainer.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testPropertyExpansion() {
executeTarget("testPropertyExpansion");
assertTrue("attribute worked",
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ConcatFilterTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ConcatFilterTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ConcatFilterTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ConcatFilterTest.java Sun Mar 30 23:40:53 2014
@@ -74,14 +74,11 @@ public class ConcatFilterTest extends Bu
configureProject("src/etc/testcases/filters/concat.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
public void testFilterReaderNoArgs() throws IOException {
executeTarget("testFilterReaderNoArgs");
- File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"input/concatfilter.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/concat.FilterReaderNoArgs.test");
+ File expected = new File(getProject().getProperty("output"), "concatfilter.test");
+ File result = new File(getProject().getProperty("output"), "concat.FilterReaderNoArgs.test");
assertTrue("testFilterReaderNoArgs: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
@@ -124,7 +121,7 @@ public class ConcatFilterTest extends Bu
*/
protected void doTest(String target, String expectedStart, String expectedEnd) {
executeTarget(target);
- String resultContent = read("result/concat." + target.substring(4) + ".test");
+ String resultContent = read(getProject().getProperty("output") + "/concat." + target.substring(4) + ".test");
assertTrue("First 5 lines differs.", resultContent.startsWith(expectedStart));
assertTrue("Last 5 lines differs.", resultContent.endsWith(expectedEnd));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java Sun Mar 30 23:40:53 2014
@@ -37,14 +37,11 @@ public class DynamicFilterTest extends B
public void setUp() {
configureProject("src/etc/testcases/filters/dynamicfilter.xml");
- executeTarget("init");
+ executeTarget("setUp");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
public void testCustomFilter() throws IOException {
- expectFileContains("dynamicfilter", "result/dynamicfilter",
+ expectFileContains("dynamicfilter", getProject().getProperty("output") + "/dynamicfilter",
"hellO wOrld");
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/EscapeUnicodeTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/EscapeUnicodeTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/EscapeUnicodeTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/EscapeUnicodeTest.java Sun Mar 30 23:40:53 2014
@@ -38,14 +38,10 @@ public class EscapeUnicodeTest extends B
configureProject("src/etc/testcases/filters/build.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testEscapeUnicode() throws IOException {
executeTarget("testEscapeUnicode");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(), "expected/escapeunicode.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/escapeunicode.test");
+ File result = new File(getProject().getProperty("output"), "escapeunicode.test");
assertTrue(FILE_UTILS.contentEquals(expected, result));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/HeadTailTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/HeadTailTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/HeadTailTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/HeadTailTest.java Sun Mar 30 23:40:53 2014
@@ -41,35 +41,31 @@ public class HeadTailTest extends BuildF
configureProject("src/etc/testcases/filters/head-tail.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testHead() throws IOException {
executeTarget("testHead");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(), "expected/head-tail.head.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/head-tail.head.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.head.test");
assertTrue("testHead: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
public void testHeadLines() throws IOException {
executeTarget("testHeadLines");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(), "expected/head-tail.headLines.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/head-tail.headLines.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.headLines.test");
assertTrue("testHeadLines: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
public void testHeadSkip() throws IOException {
executeTarget("testHeadSkip");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.headSkip.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.headSkip.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.headSkip.test");
assertTrue("testHeadSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
public void testHeadLinesSkip() throws IOException {
executeTarget("testHeadLinesSkip");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.headLinesSkip.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.headLinesSkip.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.headLinesSkip.test");
assertTrue("testHeadLinesSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
@@ -77,8 +73,7 @@ public class HeadTailTest extends BuildF
executeTarget("testFilterReaderHeadLinesSkip");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),
"expected/head-tail.headLinesSkip.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),
- "result/head-tail.filterReaderHeadLinesSkip.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.filterReaderHeadLinesSkip.test");
assertTrue("testFilterReaderHeadLinesSkip: Result not like expected",
FILE_UTILS.contentEquals(expected, result));
}
@@ -86,28 +81,28 @@ public class HeadTailTest extends BuildF
public void testTail() throws IOException {
executeTarget("testTail");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tail.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tail.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.tail.test");
assertTrue("testTail: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
public void testTailLines() throws IOException {
executeTarget("testTailLines");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tailLines.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tailLines.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.tailLines.test");
assertTrue("testTailLines: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
public void testTailSkip() throws IOException {
executeTarget("testTailSkip");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tailSkip.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tailSkip.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.tailSkip.test");
assertTrue("testTailSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
public void testTailLinesSkip() throws IOException {
executeTarget("testTailLinesSkip");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tailLinesSkip.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tailLinesSkip.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.tailLinesSkip.test");
assertTrue("testTailLinesSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
@@ -115,8 +110,7 @@ public class HeadTailTest extends BuildF
executeTarget("testFilterReaderTailLinesSkip");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),
"expected/head-tail.tailLinesSkip.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),
- "result/head-tail.filterReaderTailLinesSkip.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.filterReaderTailLinesSkip.test");
assertTrue("testFilterReaderTailLinesSkip: Result not like expected",
FILE_UTILS.contentEquals(expected, result));
}
@@ -124,7 +118,7 @@ public class HeadTailTest extends BuildF
public void testHeadTail() throws IOException {
executeTarget("testHeadTail");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.headtail.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.headtail.test");
+ File result = new File(getProject().getProperty("output") + "/head-tail.headtail.test");
assertTrue("testHeadTail: Result not like expected", FILE_UTILS.contentEquals(expected, result));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/LineContainsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/LineContainsTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/LineContainsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/LineContainsTest.java Sun Mar 30 23:40:53 2014
@@ -38,14 +38,10 @@ public class LineContainsTest extends Bu
configureProject("src/etc/testcases/filters/build.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testLineContains() throws IOException {
executeTarget("testLineContains");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/linecontains.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/linecontains.test");
+ File result = new File(getProject().getProperty("output"),"linecontains.test");
assertTrue(FILE_UTILS.contentEquals(expected, result));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/NoNewLineTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/NoNewLineTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/NoNewLineTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/NoNewLineTest.java Sun Mar 30 23:40:53 2014
@@ -36,10 +36,6 @@ public class NoNewLineTest extends Build
configureProject("src/etc/testcases/filters/build.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testNoAddNewLine() throws IOException {
executeTarget("testNoAddNewLine");
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ReplaceTokensTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ReplaceTokensTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ReplaceTokensTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/ReplaceTokensTest.java Sun Mar 30 23:40:53 2014
@@ -38,21 +38,17 @@ public class ReplaceTokensTest extends B
configureProject("src/etc/testcases/filters/build.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testReplaceTokens() throws IOException {
executeTarget("testReplaceTokens");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/replacetokens.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/replacetokens.test");
+ File result = new File(getProject().getProperty("output"), "replacetokens.test");
assertTrue(FILE_UTILS.contentEquals(expected, result));
}
public void testReplaceTokensPropertyFile() throws IOException {
executeTarget("testReplaceTokensPropertyFile");
File expected = FILE_UTILS.resolveFile(getProjectDir(), "expected/replacetokens.test");
- File result = FILE_UTILS.resolveFile(getProjectDir(), "result/replacetokensPropertyFile.test");
+ File result = new File(getProject().getProperty("output"), "replacetokensPropertyFile.test");
assertTrue(FILE_UTILS.contentEquals(expected, result));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/StripJavaCommentsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/StripJavaCommentsTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/StripJavaCommentsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/StripJavaCommentsTest.java Sun Mar 30 23:40:53 2014
@@ -38,14 +38,10 @@ public class StripJavaCommentsTest exten
configureProject("src/etc/testcases/filters/build.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testStripJavaComments() throws IOException {
executeTarget("testStripJavaComments");
File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/stripjavacomments.test");
- File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/stripjavacomments.test");
+ File result = new File(getProject().getProperty("output"), "stripjavacomments.test");
assertTrue(FILE_UTILS.contentEquals(expected, result));
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java Sun Mar 30 23:40:53 2014
@@ -37,11 +37,7 @@ public class TokenFilterTest extends Bui
public void setUp() {
configureProject("src/etc/testcases/filters/tokenfilter.xml");
- executeTarget("init");
- }
-
- public void tearDown() {
- executeTarget("cleanup");
+ executeTarget("setUp");
}
/** make sure tokenfilter exists */
@@ -60,26 +56,26 @@ public class TokenFilterTest extends Bui
public void testUnixLineOutput() throws IOException {
expectFileContains(
- "unixlineoutput", "result/unixlineoutput",
+ "unixlineoutput", getProject().getProperty("output") + "/unixlineoutput",
"\nThis\nis\na\nnumber\nof\nwords\n");
}
public void testDosLineOutput() throws IOException {
expectFileContains(
- "doslineoutput", "result/doslineoutput",
+ "doslineoutput", getProject().getProperty("output") + "/doslineoutput",
"\r\nThis\r\nis\r\na\r\nnumber\r\nof\r\nwords\r\n");
}
public void testFileTokenizer() throws IOException {
String contents = getFileString(
- "filetokenizer", "result/filetokenizer");
+ "filetokenizer", getProject().getProperty("output") + "/filetokenizer");
assertStringContains(contents, " of words");
assertStringNotContains(contents, " This is");
}
public void testReplaceString() throws IOException {
expectFileContains(
- "replacestring", "result/replacestring",
+ "replacestring", getProject().getProperty("output") + "/replacestring",
"this is the moon");
}
@@ -89,7 +85,7 @@ public class TokenFilterTest extends Bui
public void testContainsString() throws IOException {
String contents = getFileString(
- "containsstring", "result/containsstring");
+ "containsstring", getProject().getProperty("output") + "/containsstring");
assertStringContains(contents, "this is a line contains foo");
assertStringNotContains(contents, "this line does not");
}
@@ -98,7 +94,7 @@ public class TokenFilterTest extends Bui
if (! hasRegex("testReplaceRegex"))
return;
String contents = getFileString(
- "replaceregex", "result/replaceregex");
+ "replaceregex", getProject().getProperty("output") + "/replaceregex");
assertStringContains(contents, "world world world world");
assertStringContains(contents, "dog Cat dog");
assertStringContains(contents, "moon Sun Sun");
@@ -111,7 +107,7 @@ public class TokenFilterTest extends Bui
if (! hasRegex("testFilterReplaceRegex"))
return;
String contents = getFileString(
- "filterreplaceregex", "result/filterreplaceregex");
+ "filterreplaceregex", getProject().getProperty("output") + "/filterreplaceregex");
assertStringContains(contents, "world world world world");
}
@@ -123,7 +119,7 @@ public class TokenFilterTest extends Bui
public void testTrimFile() throws IOException {
String contents = getFileString(
- "trimfile", "result/trimfile");
+ "trimfile", getProject().getProperty("output") + "/trimfile");
assertTrue("no ws at start", contents.startsWith("This is th"));
assertTrue("no ws at end", contents.endsWith("second line."));
assertStringContains(contents, " This is the second");
@@ -131,7 +127,7 @@ public class TokenFilterTest extends Bui
public void testTrimFileByLine() throws IOException {
String contents = getFileString(
- "trimfilebyline", "result/trimfilebyline");
+ "trimfilebyline", getProject().getProperty("output") + "/trimfilebyline");
assertFalse("no ws at start", contents.startsWith("This is th"));
assertFalse("no ws at end", contents.endsWith("second line."));
assertStringNotContains(contents, " This is the second");
@@ -140,7 +136,7 @@ public class TokenFilterTest extends Bui
public void testFilterReplaceString() throws IOException {
String contents = getFileString(
- "filterreplacestring", "result/filterreplacestring");
+ "filterreplacestring", getProject().getProperty("output") + "/filterreplacestring");
assertStringContains(contents, "This is the moon");
}
@@ -152,7 +148,7 @@ public class TokenFilterTest extends Bui
if (! hasRegex("testContainsRegex"))
return;
String contents = getFileString(
- "containsregex", "result/containsregex");
+ "containsregex", getProject().getProperty("output") + "/containsregex");
assertStringContains(contents, "hello world");
assertStringNotContains(contents, "this is the moon");
assertStringContains(contents, "World here");
@@ -162,7 +158,7 @@ public class TokenFilterTest extends Bui
if (! hasRegex("testFilterContainsRegex"))
return;
String contents = getFileString(
- "filtercontainsregex", "result/filtercontainsregex");
+ "filtercontainsregex", getProject().getProperty("output") + "/filtercontainsregex");
assertStringContains(contents, "hello world");
assertStringNotContains(contents, "this is the moon");
assertStringContains(contents, "World here");
@@ -172,13 +168,13 @@ public class TokenFilterTest extends Bui
if (! hasRegex("testContainsRegex2"))
return;
String contents = getFileString(
- "containsregex2", "result/containsregex2");
+ "containsregex2", getProject().getProperty("output") + "/containsregex2");
assertStringContains(contents, "void register_bits();");
}
public void testDeleteCharacters() throws IOException {
String contents = getFileString(
- "deletecharacters", "result/deletechars");
+ "deletecharacters", getProject().getProperty("output") + "/deletechars");
assertStringNotContains(contents, "#");
assertStringNotContains(contents, "*");
assertStringContains(contents, "This is some ");
@@ -188,7 +184,7 @@ public class TokenFilterTest extends Bui
if (! hasScript("testScriptFilter"))
return;
- expectFileContains("scriptfilter", "result/scriptfilter",
+ expectFileContains("scriptfilter", getProject().getProperty("output") + "/scriptfilter",
"HELLO WORLD");
}
@@ -197,12 +193,12 @@ public class TokenFilterTest extends Bui
if (! hasScript("testScriptFilter"))
return;
- expectFileContains("scriptfilter2", "result/scriptfilter2",
+ expectFileContains("scriptfilter2", getProject().getProperty("output") + "/scriptfilter2",
"HELLO MOON");
}
public void testCustomTokenFilter() throws IOException {
- expectFileContains("customtokenfilter", "result/custom",
+ expectFileContains("customtokenfilter", getProject().getProperty("output") + "/custom",
"Hello World");
}
@@ -224,7 +220,7 @@ public class TokenFilterTest extends Bui
private boolean hasRegex(String test) {
try {
executeTarget("hasregex");
- expectFileContains("result/replaceregexp", "bye world");
+ expectFileContains(getProject().getProperty("output") + "/replaceregexp", "bye world");
}
catch (Throwable ex) {
System.out.println(test + ": skipped - regex not present "
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java Sun Mar 30 23:40:53 2014
@@ -35,27 +35,20 @@ public class AbstractCvsTaskTest extends
public void setUp() {
configureProject("src/etc/testcases/taskdefs/abstractcvstask.xml");
- }
-
- public void tearDown() {
- executeTarget("cleanup");
- }
-
- public void testAbstractCvsTask() {
- executeTarget( "all" );
+ executeTarget("setUp");
}
public void testPackageAttribute() {
- File f = getProject().resolveFile("tmpdir/ant/build.xml");
+ File f = new File(getProject().getProperty("output") + "/src/Makefile");
assertTrue("starting empty", !f.exists());
- expectLogContaining("package-attribute", "U ant/build.xml");
+ expectLogContaining("package-attribute", "U src/Makefile");
assertTrue("now it is there", f.exists());
}
public void testTagAttribute() {
- File f = getProject().resolveFile("tmpdir/ant/build.xml");
+ File f = new File(getProject().getProperty("output") + "/src/Makefile");
assertTrue("starting empty", !f.exists());
- expectLogContaining("tag-attribute", "ANT_141 (revision: 1.175.2.13)");
+ expectLogContaining("tag-attribute", "OPENBSD_5_3");
assertTrue("now it is there", f.exists());
}
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MultiMapTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MultiMapTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MultiMapTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MultiMapTest.java Sun Mar 30 23:40:53 2014
@@ -34,10 +34,6 @@ public class MultiMapTest extends BuildF
configureProject("src/etc/testcases/taskdefs/multimap.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testMultiCopy() {
executeTarget("multicopy");
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java Sun Mar 30 23:40:53 2014
@@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs;
import java.io.IOException;
import java.io.File;
import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.util.FileUtils;
/**
@@ -33,6 +34,7 @@ public class TarTest extends BuildFileTe
public void setUp() {
configureProject("src/etc/testcases/taskdefs/tar.xml");
+ executeTarget("setUp");
}
public void test1() {
@@ -54,7 +56,7 @@ public class TarTest extends BuildFileTe
public void test5() {
executeTarget("test5");
File f
- = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/test5.tar");
+ = new File(getProject().getProperty("output"), "test5.tar");
if (!f.exists()) {
fail("Tarring a directory failed");
@@ -80,14 +82,14 @@ public class TarTest extends BuildFileTe
private void test7(String target) {
executeTarget(target);
File f1
- = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/test7-prefix");
+ = new File(getProject().getProperty("output"), "untar/test7-prefix");
if (!(f1.exists() && f1.isDirectory())) {
fail("The prefix attribute is not working properly.");
}
File f2
- = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/test7dir");
+ = new File(getProject().getProperty("output"), "untar/test7dir");
if (!(f2.exists() && f2.isDirectory())) {
fail("The prefix attribute is not working properly.");
@@ -117,7 +119,7 @@ public class TarTest extends BuildFileTe
private void test8(String target) {
executeTarget(target);
File f1
- = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/test8.xml");
+ = new File(getProject().getProperty("output"), "untar/test8.xml");
if (! f1.exists()) {
fail("The fullpath attribute or the preserveLeadingSlashes attribute does not work propertly");
}
@@ -130,7 +132,7 @@ public class TarTest extends BuildFileTe
public void test10() {
executeTarget("test10");
File f1
- = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/test10.xml");
+ = new File(getProject().getProperty("output"), "untar/test10.xml");
if (! f1.exists()) {
fail("The fullpath attribute or the preserveLeadingSlashes attribute does not work propertly");
}
@@ -139,7 +141,7 @@ public class TarTest extends BuildFileTe
public void test11() {
executeTarget("test11");
File f1
- = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/test11.xml");
+ = new File(getProject().getProperty("output"), "untar/test11.xml");
if (! f1.exists()) {
fail("The fullpath attribute or the preserveLeadingSlashes attribute does not work propertly");
}
@@ -149,10 +151,8 @@ public class TarTest extends BuildFileTe
executeTarget("testGZipResource");
assertTrue(FileUtils.getFileUtils()
.contentEquals(getProject().resolveFile("../asf-logo.gif"),
- getProject().resolveFile("testout/asf-logo.gif.gz")));
+ new File(getProject().getProperty("output"), "untar/asf-logo.gif.gz")));
}
- public void tearDown() {
- executeTarget("cleanup");
- }
+
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UntarTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UntarTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UntarTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UntarTest.java Sun Mar 30 23:40:53 2014
@@ -20,6 +20,8 @@ package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.util.FileUtils;
+import java.io.File;
+
/**
*/
public class UntarTest extends BuildFileTest {
@@ -35,10 +37,6 @@ public class UntarTest extends BuildFile
configureProject("src/etc/testcases/taskdefs/untar.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void testRealTest() throws java.io.IOException {
testLogoExtraction("realTest");
}
@@ -81,12 +79,13 @@ public class UntarTest extends BuildFile
private void testLogoExtraction(String target) throws java.io.IOException {
executeTarget(target);
assertTrue(FILE_UTILS.contentEquals(project.resolveFile("../asf-logo.gif"),
- project.resolveFile("asf-logo.gif")));
+ new File(getProject().getProperty("output"), "untar/" +
+ "asf-logo.gif")));
}
public void testDocumentationClaimsOnCopy() {
executeTarget("testDocumentationClaimsOnCopy");
- assertFalse(getProject().resolveFile("untartestout/1/foo").exists());
- assertTrue(getProject().resolveFile("untartestout/2/bar").exists());
+ assertFalse(new File(getProject().getProperty("output"), "untar/1/foo").exists());
+ assertTrue(new File(getProject().getProperty("output"), "untar/2/bar").exists());
}
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java Sun Mar 30 23:40:53 2014
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.util.FileUtils;
+import java.io.File;
import java.io.IOException;
/**
@@ -37,10 +38,6 @@ public class UnzipTest extends BuildFile
configureProject("src/etc/testcases/taskdefs/unzip.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void test1() {
expectBuildException("test1", "required argument not specified");
}
@@ -65,7 +62,7 @@ public class UnzipTest extends BuildFile
*/
private void assertLogoUncorrupted() throws IOException {
assertTrue(FILE_UTILS.contentEquals(project.resolveFile("../asf-logo.gif"),
- project.resolveFile("asf-logo.gif")));
+ new File(getProject().getProperty("output"), "asf-logo.gif")));
}
public void testTestZipTask() throws java.io.IOException {
@@ -83,8 +80,8 @@ public class UnzipTest extends BuildFile
*/
public void testPatternSetExcludeOnly() {
executeTarget("testPatternSetExcludeOnly");
- assertFileMissing("1/foo is excluded", "unziptestout/1/foo");
- assertFileExists("2/bar is not excluded", "unziptestout/2/bar");
+ assertFileMissing("1/foo is excluded", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is not excluded", getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -92,8 +89,8 @@ public class UnzipTest extends BuildFile
*/
public void testPatternSetIncludeOnly() {
executeTarget("testPatternSetIncludeOnly");
- assertFileMissing("1/foo is not included", "unziptestout/1/foo");
- assertFileExists("2/bar is included", "unziptestout/2/bar");
+ assertFileMissing("1/foo is not included", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is included", getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -101,8 +98,8 @@ public class UnzipTest extends BuildFile
*/
public void testPatternSetIncludeAndExclude() {
executeTarget("testPatternSetIncludeAndExclude");
- assertFileMissing("1/foo is not included", "unziptestout/1/foo");
- assertFileMissing("2/bar is excluded", "unziptestout/2/bar");
+ assertFileMissing("1/foo is not included", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileMissing("2/bar is excluded", getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -110,8 +107,8 @@ public class UnzipTest extends BuildFile
*/
public void testTwoPatternSets() {
executeTarget("testTwoPatternSets");
- assertFileMissing("1/foo is not included", "unziptestout/1/foo");
- assertFileExists("2/bar is included", "unziptestout/2/bar");
+ assertFileMissing("1/foo is not included", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is included", getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -119,8 +116,8 @@ public class UnzipTest extends BuildFile
*/
public void testTwoPatternSetsWithExcludes() {
executeTarget("testTwoPatternSetsWithExcludes");
- assertFileMissing("1/foo is not included", "unziptestout/1/foo");
- assertFileMissing("2/bar is excluded", "unziptestout/2/bar");
+ assertFileMissing("1/foo is not included", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileMissing("2/bar is excluded", getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -138,8 +135,8 @@ public class UnzipTest extends BuildFile
*/
public void testPatternSetSlashOnly() {
executeTarget("testPatternSetSlashOnly");
- assertFileMissing("1/foo is not included", "unziptestout/1/foo");
- assertFileExists("\"2/bar is included", "unziptestout/2/bar");
+ assertFileMissing("1/foo is not included", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("\"2/bar is included", getProject().getProperty("output") + "/unziptestout/2/bar");
}
@@ -148,7 +145,7 @@ public class UnzipTest extends BuildFile
*/
public void testEncoding() {
executeTarget("encodingTest");
- assertFileExists("foo has been properly named", "unziptestout/foo");
+ assertFileExists("foo has been properly named", getProject().getProperty("output") + "/unziptestout/foo");
}
/*
@@ -156,8 +153,8 @@ public class UnzipTest extends BuildFile
*/
public void testFlattenMapper() {
executeTarget("testFlattenMapper");
- assertFileMissing("1/foo is not flattened", "unziptestout/1/foo");
- assertFileExists("foo is flattened", "unziptestout/foo");
+ assertFileMissing("1/foo is not flattened", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("foo is flattened", getProject().getProperty("output") + "/unziptestout/foo");
}
/**
@@ -186,8 +183,8 @@ public class UnzipTest extends BuildFile
*/
public void testGlobMapper() {
executeTarget("testGlobMapper");
- assertFileMissing("1/foo is not mapped", "unziptestout/1/foo");
- assertFileExists("1/foo is mapped", "unziptestout/1/foo.txt");
+ assertFileMissing("1/foo is not mapped", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("1/foo is mapped", getProject().getProperty("output") + "/unziptestout/1/foo.txt");
}
public void testTwoMappers() {
@@ -197,12 +194,12 @@ public class UnzipTest extends BuildFile
public void testResourceCollections() {
executeTarget("testResourceCollection");
assertFileExists("junit.jar has been extracted",
- "unziptestout/junit/framework/Assert.class");
+ getProject().getProperty("output") + "/unziptestout/junit/framework/Assert.class");
}
public void testDocumentationClaimsOnCopy() {
executeTarget("testDocumentationClaimsOnCopy");
- assertFileMissing("1/foo is excluded", "unziptestout/1/foo");
- assertFileExists("2/bar is not excluded", "unziptestout/2/bar");
+ assertFileMissing("1/foo is excluded", getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is not excluded", getProject().getProperty("output") + "/unziptestout/2/bar");
}
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java Sun Mar 30 23:40:53 2014
@@ -38,6 +38,7 @@ public class ZipTest extends BuildFileTe
public void setUp() {
configureProject("src/etc/testcases/taskdefs/zip.xml");
+ executeTarget("setUp");
}
public void test1() {
@@ -65,7 +66,11 @@ public class ZipTest extends BuildFileTe
} catch (IOException e) {
//ignored
}
- executeTarget("cleanup");
+ try {
+ super.tearDown();
+ } catch (Exception exc) {
+ System.err.println(exc.getMessage());
+ }
}
public void test5() {
@@ -89,7 +94,7 @@ public class ZipTest extends BuildFileTe
public void testZipgroupfileset() throws IOException {
executeTarget("testZipgroupfileset");
- ZipFile zipFile = new ZipFile(new File(getProjectDir(), "zipgroupfileset.zip"));
+ ZipFile zipFile = new ZipFile(new File(getProject().getProperty("output"), "zipgroupfileset.zip"));
assertTrue(zipFile.getEntry("ant.xml") != null);
assertTrue(zipFile.getEntry("optional/jspc.xml") != null);
@@ -113,7 +118,7 @@ public class ZipTest extends BuildFileTe
// Bugzilla Report 18403
public void testPrefixAddsDir() throws IOException {
executeTarget("testPrefixAddsDir");
- File archive = getProject().resolveFile("test3.zip");
+ File archive = new File(getProject().getProperty("output"), "test3.zip");
zfPrefixAddsDir = new ZipFile(archive);
ZipEntry ze = zfPrefixAddsDir.getEntry("test/");
assertNotNull("test/ has been added", ze);
@@ -124,10 +129,10 @@ public class ZipTest extends BuildFileTe
public void testFilesOnlyDoesntCauseRecreate()
throws InterruptedException {
executeTarget("testFilesOnlyDoesntCauseRecreateSetup");
- long l = getProject().resolveFile("test3.zip").lastModified();
+ long l = new File(getProject().getProperty("output"), "test3.zip").lastModified();
Thread.sleep(3000);
executeTarget("testFilesOnlyDoesntCauseRecreate");
- assertEquals(l, getProject().resolveFile("test3.zip").lastModified());
+ assertEquals(l, new File(getProject().getProperty("output"), "test3.zip").lastModified());
}
// Bugzilla Report 22865
@@ -156,7 +161,7 @@ public class ZipTest extends BuildFileTe
executeTarget("testDefaultExcludesAndUpdate");
ZipFile f = null;
try {
- f = new ZipFile(getProject().resolveFile("test3.zip"));
+ f = new ZipFile(new File(getProject().getProperty("output"), "test3.zip"));
assertNotNull("ziptest~ should be included",
f.getEntry("ziptest~"));
} finally {
@@ -178,8 +183,7 @@ public class ZipTest extends BuildFileTe
executeTarget("testTarFileSet");
org.apache.tools.zip.ZipFile zf = null;
try {
- zf = new org.apache.tools.zip.ZipFile(getProject()
- .resolveFile("test3.zip"));
+ zf = new org.apache.tools.zip.ZipFile(new File(getProject().getProperty("output"), "test3.zip"));
org.apache.tools.zip.ZipEntry ze = zf.getEntry("asf-logo.gif");
assertEquals(UnixStat.FILE_FLAG | 0446, ze.getUnixMode());
} finally {
@@ -193,8 +197,7 @@ public class ZipTest extends BuildFileTe
executeTarget("rewriteZeroPermissions");
org.apache.tools.zip.ZipFile zf = null;
try {
- zf = new org.apache.tools.zip.ZipFile(getProject()
- .resolveFile("test3.zip"));
+ zf = new org.apache.tools.zip.ZipFile(new File(getProject().getProperty("output"), "test3.zip"));
org.apache.tools.zip.ZipEntry ze = zf.getEntry("testdir/test.txt");
assertEquals(UnixStat.FILE_FLAG | 0644, ze.getUnixMode());
} finally {
@@ -208,8 +211,7 @@ public class ZipTest extends BuildFileTe
executeTarget("acceptZeroPermissions");
org.apache.tools.zip.ZipFile zf = null;
try {
- zf = new org.apache.tools.zip.ZipFile(getProject()
- .resolveFile("test3.zip"));
+ zf = new org.apache.tools.zip.ZipFile(new File(getProject().getProperty("output"), "test3.zip"));
org.apache.tools.zip.ZipEntry ze = zf.getEntry("testdir/test.txt");
assertEquals(0000, ze.getUnixMode());
} finally {
@@ -223,8 +225,7 @@ public class ZipTest extends BuildFileTe
executeTarget("testForBugzilla34764");
org.apache.tools.zip.ZipFile zf = null;
try {
- zf = new org.apache.tools.zip.ZipFile(getProject()
- .resolveFile("test3.zip"));
+ zf = new org.apache.tools.zip.ZipFile(new File(getProject().getProperty("output"), "test3.zip"));
org.apache.tools.zip.ZipEntry ze = zf.getEntry("file1");
assertEquals(UnixStat.FILE_FLAG | 0644, ze.getUnixMode());
} finally {
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JavahTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JavahTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JavahTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/JavahTest.java Sun Mar 30 23:40:53 2014
@@ -19,6 +19,8 @@ package org.apache.tools.ant.taskdefs.op
import org.apache.tools.ant.BuildFileTest;
+import java.io.File;
+
public class JavahTest extends BuildFileTest {
private final static String BUILD_XML =
@@ -32,19 +34,15 @@ public class JavahTest extends BuildFile
configureProject(BUILD_XML);
}
- public void tearDown() {
- executeTarget("tearDown");
- }
-
public void testSimpleCompile() {
executeTarget("simple-compile");
- assertTrue(getProject().resolveFile("output/org_example_Foo.h")
- .exists());
+ assertTrue(new File(getProject().getProperty("output"), "org_example_Foo.h")
+ .exists());
}
public void testCompileFileset() {
executeTarget("test-fileset");
- assertTrue(getProject().resolveFile("output/org_example_Foo.h")
+ assertTrue(new File(getProject().getProperty("output"), "org_example_Foo.h")
.exists());
}
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/Native2AsciiTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/Native2AsciiTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/Native2AsciiTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/Native2AsciiTest.java Sun Mar 30 23:40:53 2014
@@ -35,14 +35,10 @@ public class Native2AsciiTest extends Bu
configureProject(BUILD_XML);
}
- public void tearDown() {
- executeTarget("tearDown");
- }
-
public void testIso8859_1() throws java.io.IOException {
executeTarget("testIso8859-1");
File in = getProject().resolveFile("expected/iso8859-1.test");
- File out = getProject().resolveFile("output/iso8859-1.test");
+ File out = new File(getProject().getProperty("output"), "iso8859-1.test");
assertTrue(FileUtils.getFileUtils().contentEquals(in, out, true));
}
}
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java Sun Mar 30 23:40:53 2014
@@ -32,10 +32,6 @@ public class AssertionsTest extends Buil
configureProject("src/etc/testcases/types/assertions.xml");
}
- protected void tearDown() throws Exception {
- executeTarget("teardown");
- }
-
/**
* runs a test and expects an assertion thrown in forked code
* @param target
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/resources/TarResourceTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/resources/TarResourceTest.java?rev=1583223&r1=1583222&r2=1583223&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/resources/TarResourceTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/resources/TarResourceTest.java Sun Mar 30 23:40:53 2014
@@ -20,6 +20,8 @@ package org.apache.tools.ant.types.resou
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.util.FileUtils;
+import java.io.File;
+
public class TarResourceTest extends BuildFileTest {
private static final FileUtils FU = FileUtils.getFileUtils();
@@ -32,13 +34,9 @@ public class TarResourceTest extends Bui
configureProject("src/etc/testcases/types/resources/tarentry.xml");
}
- protected void tearDown() throws Exception {
- executeTarget("tearDown");
- }
-
public void testUncompressSource() throws java.io.IOException {
executeTarget("uncompressSource");
assertTrue(FU.contentEquals(project.resolveFile("../../asf-logo.gif"),
- project.resolveFile("testout/asf-logo.gif")));
+ new File(getProject().getProperty("output"), "asf-logo.gif")));
}
}