diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java index 7d0600e64..683774c08 100644 --- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/ExecutorTest.java b/src/testcases/org/apache/tools/ant/ExecutorTest.java index 22298edd1..899560252 100755 --- a/src/testcases/org/apache/tools/ant/ExecutorTest.java +++ b/src/testcases/org/apache/tools/ant/ExecutorTest.java @@ -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 @@ package org.apache.tools.ant; import java.util.Vector; -import org.apache.tools.ant.taskdefs.Exit; /** * Executor tests diff --git a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java index 6041141fc..4b3b29a84 100644 --- a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java +++ b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java @@ -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 junit.framework.AssertionFailedError; 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; diff --git a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java index 5d5c84dbc..edc94cc23 100644 --- a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java +++ b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java b/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java index 1e486c90e..37be95dcb 100644 --- a/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java +++ b/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java @@ -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 */ diff --git a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java index 676021f21..b8e46f705 100644 --- a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java +++ b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java index c18288301..2aa1dada5 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java index a622697e5..4075f0b14 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java @@ -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 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.util.FileUtils; -import java.io.IOException; /** */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java b/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java index c02250440..1bcc7d02b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java index c15dd4858..2f6fcc92c 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java @@ -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 @@ package org.apache.tools.ant.taskdefs; import java.util.Vector; import org.apache.tools.ant.BuildFileTest; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.JavaEnvUtils; /** */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java index c6d3eed92..563821eb1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java @@ -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 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; import java.io.IOException; -import java.io.File; /** */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java index ba436555d..27066726a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java index 505d6c001..cbdbf179b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java index c25a1c4eb..a6f99689b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java index 8417e42f4..94e26be23 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java @@ -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,11 @@ */ 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 * the output which it then checks. If the output does not match, an diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java index b95243843..4c8ee7661 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java index e518d0f68..97636991f 100755 --- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java index 2a3bc55b5..f8e6eca5c 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java index da1df5839..fbc3bd521 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java b/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java index b64200000..38e0837f0 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java index 7278bee91..282d5f30a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java index 8775b1533..df59e7f3f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java index 3c701d904..e97970e07 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java @@ -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; /** */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java index 70288e81c..7782dc590 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java index 9b86c502f..2e67c3554 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java index ca82f7860..5b07f94f1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java index ef63f0eb0..f4af42e9d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java index ce4248372..3ddd089a5 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java @@ -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 junit.framework.AssertionFailedError; 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; /** */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java index 5fffdacc2..e165c4f22 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java @@ -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 { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java index e5dd6f9ab..2c97e8ec7 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java index 4b122f9f2..cfad8d827 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java index 36fb63065..d325c462f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java index b362c9a16..a5389e7f3 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java @@ -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; /** */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java index 81876a5f1..b457ca74f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java index 1fd2de471..a399e5434 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java @@ -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. @@ -16,9 +16,6 @@ */ package org.apache.tools.ant.taskdefs.optional; -import java.io.*; -import java.util.Properties; - import org.apache.tools.ant.BuildFileTest; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java index f3537bf9d..a8b602eb6 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java index b1c4131cd..c20be4b70 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java index cc6402970..9f169b6b1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java index 787a8f81f..a03eb486d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java @@ -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,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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java index d91f339a2..56bdab33b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java @@ -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; /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java index 021d3fa25..d2cf8fc79 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java index 37c7a12fd..e27450022 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java index 96fb36510..cf3656e05 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java @@ -19,9 +19,10 @@ package org.apache.tools.ant.taskdefs.optional.junit; 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 { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java index f9845f2a4..16353b32c 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java @@ -20,7 +20,7 @@ import java.io.IOException; 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; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java index c31c82fd8..e53cf5b68 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java @@ -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.. diff --git a/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java b/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java index 1ad40685d..774790ff6 100644 --- a/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/types/AddTypeTest.java b/src/testcases/org/apache/tools/ant/types/AddTypeTest.java index f34509efa..7df3f6ec8 100644 --- a/src/testcases/org/apache/tools/ant/types/AddTypeTest.java +++ b/src/testcases/org/apache/tools/ant/types/AddTypeTest.java @@ -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; diff --git a/src/testcases/org/apache/tools/ant/types/CommandlineTest.java b/src/testcases/org/apache/tools/ant/types/CommandlineTest.java index cec75ef33..4903b8649 100644 --- a/src/testcases/org/apache/tools/ant/types/CommandlineTest.java +++ b/src/testcases/org/apache/tools/ant/types/CommandlineTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/types/DescriptionTest.java b/src/testcases/org/apache/tools/ant/types/DescriptionTest.java index 76b56f415..d99803805 100644 --- a/src/testcases/org/apache/tools/ant/types/DescriptionTest.java +++ b/src/testcases/org/apache/tools/ant/types/DescriptionTest.java @@ -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,15 +17,8 @@ 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 * diff --git a/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java b/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java index c9ff4b753..d0d9f2678 100644 --- a/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java +++ b/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/types/FileListTest.java b/src/testcases/org/apache/tools/ant/types/FileListTest.java index 119683e8e..429aa2085 100644 --- a/src/testcases/org/apache/tools/ant/types/FileListTest.java +++ b/src/testcases/org/apache/tools/ant/types/FileListTest.java @@ -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,15 +17,11 @@ 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. */ diff --git a/src/testcases/org/apache/tools/ant/types/FileSetTest.java b/src/testcases/org/apache/tools/ant/types/FileSetTest.java index edbee3b21..25eb4aa03 100644 --- a/src/testcases/org/apache/tools/ant/types/FileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/FileSetTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/types/FilterSetTest.java b/src/testcases/org/apache/tools/ant/types/FilterSetTest.java index 108420f7a..8db916cf3 100644 --- a/src/testcases/org/apache/tools/ant/types/FilterSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/FilterSetTest.java @@ -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,16 +17,13 @@ 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 * diff --git a/src/testcases/org/apache/tools/ant/types/MapperTest.java b/src/testcases/org/apache/tools/ant/types/MapperTest.java index d377275c4..ea85499f7 100644 --- a/src/testcases/org/apache/tools/ant/types/MapperTest.java +++ b/src/testcases/org/apache/tools/ant/types/MapperTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/types/PathTest.java b/src/testcases/org/apache/tools/ant/types/PathTest.java index e0d95cc08..c91c218cb 100644 --- a/src/testcases/org/apache/tools/ant/types/PathTest.java +++ b/src/testcases/org/apache/tools/ant/types/PathTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/types/PatternSetTest.java b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java index be973055f..334035870 100644 --- a/src/testcases/org/apache/tools/ant/types/PatternSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/types/PolyTest.java b/src/testcases/org/apache/tools/ant/types/PolyTest.java index 98c108575..1efca453c 100644 --- a/src/testcases/org/apache/tools/ant/types/PolyTest.java +++ b/src/testcases/org/apache/tools/ant/types/PolyTest.java @@ -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 { diff --git a/src/testcases/org/apache/tools/ant/types/PropertySetTest.java b/src/testcases/org/apache/tools/ant/types/PropertySetTest.java index 28164e7c4..b7ce9d8eb 100644 --- a/src/testcases/org/apache/tools/ant/types/PropertySetTest.java +++ b/src/testcases/org/apache/tools/ant/types/PropertySetTest.java @@ -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 { diff --git a/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java b/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java index 4c20b5121..7d0a8da53 100755 --- a/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java +++ b/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java @@ -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 @@ package org.apache.tools.ant.types; 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; diff --git a/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java b/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java index 1f9245d47..9e3e0959a 100755 --- a/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java @@ -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,14 +17,10 @@ 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. * diff --git a/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java b/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java index c5a3e6717..2a9ba3f27 100644 --- a/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java +++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java @@ -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,13 +17,8 @@ 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 * diff --git a/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java index 1927235e6..c5f4687e2 100644 --- a/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java +++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java b/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java index 450a5bc22..40990fa9d 100644 --- a/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java @@ -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,10 @@ 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. * diff --git a/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java index 89f695f59..cb4e24f85 100644 --- a/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java @@ -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. diff --git a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java index 53074b5a9..ec3ff9366 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java @@ -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 diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java index dd95c18af..c354fd601 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java @@ -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 { diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java index 9bf9f13ea..16773bd34 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java @@ -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,13 +19,8 @@ package org.apache.tools.ant.types.selectors; 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. * diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java index c5243d619..8ab4097d7 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java @@ -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,13 +19,8 @@ package org.apache.tools.ant.types.selectors; 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 * diff --git a/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java index 37aec2541..963a7909e 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java @@ -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,13 +19,8 @@ package org.apache.tools.ant.types.selectors; 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 * diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java index d023e81cf..1c927359c 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java @@ -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 @@ package org.apache.tools.ant.types.selectors; // 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; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java index ae0991d6d..143c0370a 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java @@ -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,13 +19,8 @@ package org.apache.tools.ant.types.selectors; 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 * diff --git a/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java index 64343efeb..001dd97ac 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java @@ -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,17 +18,6 @@ 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 org.apache.tools.ant.types.Parameter; -import org.apache.tools.ant.util.JavaEnvUtils; - -import java.text.SimpleDateFormat; -import java.text.ParsePosition; -import java.util.Date; - -import junit.framework.TestCase; -import junit.framework.AssertionFailedError; /** * Tests Type Selectors. diff --git a/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java b/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java index 4fdca9843..e46639429 100644 --- a/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java @@ -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,9 +17,9 @@ package org.apache.tools.ant.util; -import java.io.File; import java.io.IOException; import java.util.Enumeration; + import junit.framework.TestCase; import org.apache.tools.ant.BuildException; diff --git a/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java b/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java index c4cbf031a..9db42df89 100644 --- a/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java +++ b/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java @@ -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. @@ -19,9 +19,9 @@ package org.apache.tools.ant.util; import java.io.IOException; import java.io.StringWriter; -import junit.framework.Test; + import junit.framework.TestCase; -import junit.framework.TestSuite; + import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java b/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java index 915ef4088..92fa83d9a 100644 --- a/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java @@ -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,7 +16,6 @@ */ package org.apache.tools.ant.util; -import java.util.Date; import java.util.Calendar; import java.util.TimeZone; diff --git a/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java b/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java index 5ebfb7e76..6901355e2 100644 --- a/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java +++ b/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java @@ -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,9 +17,7 @@ package org.apache.tools.ant.util; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Tests for org.apache.tools.ant.util;GlobPatternMapper. diff --git a/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java b/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java index 16ecc6ea2..1679dae17 100644 --- a/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java @@ -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,15 +17,13 @@ package org.apache.tools.ant.util; +import junit.framework.TestCase; + import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Echo; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceFactory; -import java.io.File; - -import junit.framework.TestCase; - /** * Tests for org.apache.tools.ant.util.ResourceUtils. */ diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java index bd85324ec..93256d7c3 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java @@ -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. @@ -21,8 +21,6 @@ import java.io.IOException; import junit.framework.AssertionFailedError; -import org.apache.tools.ant.taskdefs.condition.Os; - /** * Tests for the jakarta-regexp implementation of the RegexpMatcher interface. * diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java index 003dc56a9..c50943757 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java @@ -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. @@ -21,8 +21,6 @@ import java.io.IOException; import junit.framework.AssertionFailedError; -import org.apache.tools.ant.taskdefs.condition.Os; - /** * Tests for the jakarta-regexp implementation of the Regexp interface. * diff --git a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java index 675629d02..56b21c99c 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java @@ -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,12 +17,10 @@ package org.apache.tools.ant.util.regexp; -import java.io.*; +import java.io.IOException; import java.util.Vector; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Tests for all implementations of the RegexpMatcher interface. diff --git a/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java b/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java index 3fc45555a..8370e2518 100644 --- a/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java +++ b/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java @@ -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,11 @@ package org.apache.tools.zip; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import java.util.Calendar; import java.util.Date; +import junit.framework.TestCase; + public class ZipOutputStreamTest extends TestCase { private Date time;