You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by jk...@apache.org on 2006/02/02 20:38:48 UTC
svn commit: r374473 [1/2] - in
/ant/core/trunk/src/testcases/org/apache/tools: ant/ ant/filters/
ant/taskdefs/ ant/taskdefs/condition/ ant/taskdefs/optional/
ant/taskdefs/optional/depend/ ant/taskdefs/optional/jdepend/
ant/taskdefs/optional/junit/ ant/...
Author: jkf
Date: Thu Feb 2 11:37:46 2006
New Revision: 374473
URL: http://svn.apache.org/viewcvs?rev=374473&view=rev
Log:
Remove unused imports from testcases
Modified:
ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/ExecutorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/AddTypeTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/CommandlineTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/DescriptionTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileListTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/FilterSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/MapperTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/PathTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/PatternSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/PolyTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/PropertySetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
ant/core/trunk/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
ant/core/trunk/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
package org.apache.tools.ant;
import org.apache.tools.ant.taskdefs.condition.Os;
-import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.JavaEnvUtils;
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
+
import java.io.File;
import java.io.IOException;
import java.util.Set;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/ExecutorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/ExecutorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/ExecutorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/ExecutorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2005-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
import java.util.Vector;
-import org.apache.tools.ant.taskdefs.Exit;
/**
* Executor tests
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001,2003-2004 The Apache Software Foundation
+ * Copyright 2000-2001,2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
import java.io.File;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,12 +17,10 @@
package org.apache.tools.ant.filters;
-import java.io.File;
import java.io.Reader;
import java.io.FileReader;
import java.io.IOException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.util.FileUtils;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,11 +17,9 @@
package org.apache.tools.ant.filters;
-import java.io.File;
import java.io.IOException;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.util.FileUtils;
/** JUnit Testcases for No new line when filterchain used
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.filters;
-import java.io.File;
import java.io.Reader;
import java.io.FileReader;
import java.io.IOException;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002, 2004-2005 The Apache Software Foundation
+ * Copyright 2000-2002, 2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.JavaEnvUtils;
/**
* JUnit test for the Available task/condition.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.util.FileUtils;
-import java.io.IOException;
/**
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.File;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
import java.util.Vector;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.JavaEnvUtils;
/**
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001,2003-2005 The Apache Software Foundation
+ * Copyright 2001,2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
import org.apache.tools.ant.BuildFileTest;
import java.io.IOException;
-import java.io.File;
/**
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002, 2004-2005 The Apache Software Foundation
+ * Copyright 2002, 2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
*/
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
-import java.lang.reflect.InvocationTargetException;
/**
* @created 13 January 2002
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.File;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001,2004 The Apache Software Foundation
+ * Copyright 2000-2001,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.File;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
+ * Copyright 2002-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,9 +16,10 @@
*/
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.BuildFileTest;
import java.util.Random;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
/**
* A simple task that prints to System.out and System.err and then catches
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.File;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.taskdefs.condition.Os;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@
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.FileReader;
import java.io.IOException;
-import java.io.OutputStream;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
/**
* Unit test for the <apply> task.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001, 2004-2005 The Apache Software Foundation
+ * Copyright 2000-2001, 2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.File;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004-2005 The Apache Software Foundation
+ * Copyright 2000-2002,2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.File;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004-2005 The Apache Software Foundation
+ * Copyright 2001-2002,2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import java.io.InputStream;
import java.io.FileInputStream;
import org.apache.tools.ant.BuildFileTest;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004 The Apache Software Foundation
+ * Copyright 2001-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,10 +16,8 @@
*/
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
-import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
/**
* Test the load file task
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004-2005 The Apache Software Foundation
+ * Copyright 2002,2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.*;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,8 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildFileTest;
/**
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,7 @@
package org.apache.tools.ant.taskdefs;
-import java.lang.reflect.Method;
-
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.util.FileNameMapper;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
+ * Copyright 2002-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
*/
package org.apache.tools.ant.taskdefs;
import java.io.PrintStream;
+
import junit.framework.AssertionFailedError;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.DemuxOutputStream;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
/**
* Test of the parallel TaskContainer
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,9 +17,8 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
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.FileReader;
import java.io.IOException;
import java.io.Reader;
-import java.io.FileWriter;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.taskdefs.optional.XsltTest;
+import org.apache.tools.ant.util.FileUtils;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.input.InputHandler;
-import org.apache.tools.ant.types.Path;
/**
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2005 The Apache Software Foundation
+ * Copyright 2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
-import java.io.File;
public class SyncTest extends BuildFileTest {
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001,2004 The Apache Software Foundation
+ * Copyright 2000-2001,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import junit.framework.*;
-import java.io.*;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 The Apache Software Foundation
+ * Copyright 2000-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.zip.UnixStat;
-
import java.io.File;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import java.util.Enumeration;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.zip.UnixStat;
/**
*/
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
*/
package org.apache.tools.ant.taskdefs.condition;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
+ * Copyright 2002-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
*
*/
package org.apache.tools.ant.taskdefs.optional;
-
-import java.io.*;
-import java.util.Properties;
import org.apache.tools.ant.BuildFileTest;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
+ * Copyright 2002-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,16 +16,14 @@
*/
package org.apache.tools.ant.taskdefs.optional;
-import java.io.*;
-import java.util.Properties;
+import java.io.File;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
import org.apache.tools.ant.taskdefs.optional.jsp.Jasper41Mangler;
-import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
+import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler;
-import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory;
import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapter;
+import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory;
/**
* Tests the Jspc task.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
*/
package org.apache.tools.ant.taskdefs.optional;
-import org.apache.tools.ant.BuildFileTest;
-
-import java.util.Properties;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
+
+import org.apache.tools.ant.BuildFileTest;
/**
* JUnit testcase that excercises the optional PropertyFile task in ant.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001,2004 The Apache Software Foundation
+ * Copyright 2001,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.taskdefs.optional;
-import java.io.*;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
*
*/
package org.apache.tools.ant.taskdefs.optional;
-
-import java.io.*;
-import java.util.Properties;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
*/
package org.apache.tools.ant.taskdefs.optional;
-import java.io.*;
-import java.util.Properties;
-
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
/**
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,17 +17,11 @@
package org.apache.tools.ant.taskdefs.optional.depend;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Vector;
-import java.util.Enumeration;
import java.util.Hashtable;
+
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.FileSet;
/**
* Testcase for the Depend optional task.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,17 +17,7 @@
package org.apache.tools.ant.taskdefs.optional.jdepend;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Hashtable;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.DirectoryScanner;
/**
* Testcase for the JDepend optional task.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java Thu Feb 2 11:37:46 2006
@@ -19,9 +19,10 @@
import java.io.IOException;
import java.io.OutputStream;
-import java.text.NumberFormat;
+
import junit.framework.AssertionFailedError;
import junit.framework.Test;
+
import org.apache.tools.ant.BuildException;
public class TestFormatter implements JUnitResultFormatter {
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java Thu Feb 2 11:37:46 2006
@@ -20,7 +20,7 @@
import java.io.InputStream;
import junit.framework.TestCase;
-import org.apache.tools.ant.util.JavaEnvUtils;
+
import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile;
import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001,2003-2004 The Apache Software Foundation
+ * Copyright 2001,2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
package org.apache.tools.ant.taskdefs.optional.sitraka;
import java.util.Hashtable;
-import java.io.File;
import junit.framework.TestCase;
-import org.apache.tools.ant.types.Path;
+
import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
+import org.apache.tools.ant.types.Path;
/**
* Minimal testing for the classpath loader..
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
+import java.io.File;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
/**
* Base class for FileSetTest and DirSetTest.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/AddTypeTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/AddTypeTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/AddTypeTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/AddTypeTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/CommandlineTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/CommandlineTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/CommandlineTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/CommandlineTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,12 +17,9 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
+import org.apache.tools.ant.BuildException;
/**
* JUnit 3 testcases for org.apache.tools.ant.CommandLine
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/DescriptionTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/DescriptionTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/DescriptionTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/DescriptionTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004 The Apache Software Foundation
+ * Copyright 2001-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,14 +17,7 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildFileTest;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
-import java.io.*;
/**
* FilterSet testing
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001,2004 The Apache Software Foundation
+ * Copyright 2000-2001,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
+
+import org.apache.tools.ant.BuildException;
/**
* JUnit 3 testcases for org.apache.tools.ant.EnumeratedAttribute.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileListTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileListTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileListTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileListTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001,2004 The Apache Software Foundation
+ * Copyright 2001,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,14 +17,10 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.Project;
+import java.io.File;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
-import java.io.File;
/**
* Some tests for filelist.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/FileSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,6 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
-import java.io.File;
/**
* JUnit 3 testcases for org.apache.tools.ant.types.FileSet.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/FilterSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/FilterSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/FilterSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/FilterSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002, 2004-2005 The Apache Software Foundation
+ * Copyright 2001-2002, 2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,15 +17,12 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildFileTest;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.util.Hashtable;
+
+import org.apache.tools.ant.BuildFileTest;
/**
* FilterSet testing
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/MapperTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/MapperTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/MapperTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/MapperTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,17 +17,19 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildFileTest;
+import java.util.Arrays;
+import java.util.List;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
-import java.util.List;
-import java.util.Arrays;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.ChainedMapper;
+import org.apache.tools.ant.util.FileNameMapper;
+import org.apache.tools.ant.util.FlatFileNameMapper;
+import org.apache.tools.ant.util.GlobPatternMapper;
+import org.apache.tools.ant.util.MergingMapper;
/**
* JUnit 3 testcases for org.apache.tools.ant.types.Mapper.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/PathTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/PathTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/PathTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/PathTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.condition.Os;
+import java.io.File;
+import java.util.Locale;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
-import java.util.Locale;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.condition.Os;
/**
* JUnit 3 testcases for org.apache.tools.ant.types.Path
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/PatternSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/PatternSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/PatternSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/PatternSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
+import java.io.File;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
/**
* JUnit 3 testcases for org.apache.tools.ant.types.PatternSet.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/PolyTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/PolyTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/PolyTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/PolyTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,11 +17,9 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.condition.Condition;
public class PolyTest extends BuildFileTest {
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/PropertySetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/PropertySetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/PropertySetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/PropertySetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2005-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,11 +17,7 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.condition.Condition;
public class PropertySetTest extends BuildFileTest {
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2005-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,20 +19,17 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.UnknownServiceException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Zip;
-import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.resources.ImmutableResourceException;
+import org.apache.tools.ant.types.resources.PropertyResource;
+import org.apache.tools.ant.types.resources.StringResource;
import org.apache.tools.ant.types.resources.URLResource;
import org.apache.tools.ant.types.resources.ZipResource;
-import org.apache.tools.ant.types.resources.FileResource;
-import org.apache.tools.ant.types.resources.StringResource;
-import org.apache.tools.ant.types.resources.PropertyResource;
-import org.apache.tools.ant.types.resources.ImmutableResourceException;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.ResourceUtils;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2005-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,9 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
import java.io.File;
+
+import org.apache.tools.ant.BuildException;
/**
* JUnit 3 testcases for org.apache.tools.ant.types.TarFileSet.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002,2004-2005 The Apache Software Foundation
+ * Copyright 2001-2002,2004-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,12 +17,7 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildFileTest;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
/**
* BuildFileTest testcases for org.apache.tools.ant.types.XMLCatalog
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,24 +17,19 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DefaultLogger;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.JAXPUtils;
-
-import junit.framework.TestCase;
-
import java.io.File;
-
import java.net.MalformedURLException;
import java.net.URL;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import javax.xml.transform.Source;
import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.TransformerException;
+
+import junit.framework.TestCase;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.JAXPUtils;
+import org.xml.sax.InputSource;
/**
* JUnit testcases for org.apache.tools.ant.types.XMLCatalog
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,13 +17,9 @@
package org.apache.tools.ant.types;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
import java.io.File;
+
+import org.apache.tools.ant.BuildException;
/**
* JUnit 3 testcases for org.apache.tools.ant.types.ZipFileSet.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
package org.apache.tools.ant.types.optional.depend;
import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Vector;
-import java.util.Enumeration;
import java.util.Hashtable;
+
import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.DirectoryScanner;
/**
* Testcase for the Classfileset optional type.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
package org.apache.tools.ant.types.selectors;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildFileTest;
+import java.io.File;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
/**
* Base test case for Selectors. Provides a shared test as well as
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,14 +17,12 @@
package org.apache.tools.ant.types.selectors;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildFileTest;
+import java.io.File;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
public class ContainsRegexpTest extends TestCase {
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
+ * Copyright 2002-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.types.Parameter;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
/**
* Tests Contains Selectors.
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.types.Parameter;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
/**
* Tests Depth Selectors
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.types.Parameter;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
/**
* Tests Filename Selectors
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,24 +20,25 @@
// Java
import java.io.File;
+import java.text.RuleBasedCollator;
import java.util.Comparator;
import java.util.Iterator;
-import java.text.RuleBasedCollator;
-// Ant
+import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.Parameter;
-import org.apache.tools.ant.types.Path;
-
-// inside MockProject
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildEvent;
-
-// The classes to test
-import org.apache.tools.ant.types.selectors.modifiedselector.*;
+import org.apache.tools.ant.types.Parameter;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.selectors.modifiedselector.Algorithm;
+import org.apache.tools.ant.types.selectors.modifiedselector.Cache;
+import org.apache.tools.ant.types.selectors.modifiedselector.ChecksumAlgorithm;
+import org.apache.tools.ant.types.selectors.modifiedselector.DigestAlgorithm;
+import org.apache.tools.ant.types.selectors.modifiedselector.EqualComparator;
+import org.apache.tools.ant.types.selectors.modifiedselector.HashvalueAlgorithm;
+import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector;
+import org.apache.tools.ant.types.selectors.modifiedselector.PropertiesfileCache;
import org.apache.tools.ant.util.FileUtils;
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java?rev=374473&r1=374472&r2=374473&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java Thu Feb 2 11:37:46 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation
+ * Copyright 2000-2002,2004,2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.types.Parameter;
-
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
/**
* Tests Size Selectors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org