You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/12/18 05:31:14 UTC
[03/10] ant git commit: Checkstyle: whitespace,
line continuation and modifier idiosyncrasies
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
index bddf729..a016d49 100644
--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
+++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
@@ -70,7 +70,7 @@ public class AntClassLoaderTest {
String extjarstring = buildRule.getProject().getProperty("ext.jar");
Path myPath = new Path(buildRule.getProject());
myPath.setLocation(new File(mainjarstring));
- buildRule.getProject().setUserProperty("build.sysclasspath","ignore");
+ buildRule.getProject().setUserProperty("build.sysclasspath", "ignore");
loader = buildRule.getProject().createClassLoader(myPath);
String path = loader.getClasspath();
assertEquals(mainjarstring + File.pathSeparator + extjarstring, path);
@@ -82,7 +82,7 @@ public class AntClassLoaderTest {
String extjarstring = buildRule.getProject().getProperty("ext.jar.nonascii");
Path myPath = new Path(buildRule.getProject());
myPath.setLocation(new File(mainjarstring));
- buildRule.getProject().setUserProperty("build.sysclasspath","ignore");
+ buildRule.getProject().setUserProperty("build.sysclasspath", "ignore");
loader = buildRule.getProject().createClassLoader(myPath);
String path = loader.getClasspath();
assertEquals(mainjarstring + File.pathSeparator + extjarstring, path);
@@ -129,7 +129,7 @@ public class AntClassLoaderTest {
buildRule.executeTarget("prepareGetPackageTest");
Path myPath = new Path(buildRule.getProject());
myPath.setLocation(new File(buildRule.getProject().getProperty("test.jar")));
- buildRule.getProject().setUserProperty("build.sysclasspath","ignore");
+ buildRule.getProject().setUserProperty("build.sysclasspath", "ignore");
loader = buildRule.getProject().createClassLoader(myPath);
assertNotNull("should find class", loader.findClass("org.example.Foo"));
assertNotNull("should find package",
@@ -142,7 +142,7 @@ public class AntClassLoaderTest {
Path myPath = new Path(buildRule.getProject());
File testJar = new File(buildRule.getProject().getProperty("test.jar"));
myPath.setLocation(testJar);
- buildRule.getProject().setUserProperty("build.sysclasspath","ignore");
+ buildRule.getProject().setUserProperty("build.sysclasspath", "ignore");
loader = buildRule.getProject().createClassLoader(myPath);
Class<?> foo = loader.findClass("org.example.Foo");
URL codeSourceLocation =
@@ -158,7 +158,7 @@ public class AntClassLoaderTest {
Path myPath = new Path(buildRule.getProject());
myPath.setLocation(jar);
- buildRule.getProject().setUserProperty("build.sysclasspath","ignore");
+ buildRule.getProject().setUserProperty("build.sysclasspath", "ignore");
loader = buildRule.getProject().createClassLoader(myPath);
Class<?> foo = loader.findClass("org.example.Foo");
@@ -182,7 +182,7 @@ public class AntClassLoaderTest {
Path myPath = new Path(buildRule.getProject());
myPath.setLocation(jar);
- buildRule.getProject().setUserProperty("build.sysclasspath","ignore");
+ buildRule.getProject().setUserProperty("build.sysclasspath", "ignore");
loader = buildRule.getProject().createClassLoader(myPath);
PrintStream sysErr = System.err;
try {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/BuildFileRule.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/BuildFileRule.java b/src/tests/junit/org/apache/tools/ant/BuildFileRule.java
index 2611cb2..c5a71c7 100644
--- a/src/tests/junit/org/apache/tools/ant/BuildFileRule.java
+++ b/src/tests/junit/org/apache/tools/ant/BuildFileRule.java
@@ -222,7 +222,7 @@ public class BuildFileRule extends ExternalResource {
}
public void write(int b) {
- buffer.append((char)b);
+ buffer.append((char) b);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/BuildFileTest.java b/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
index 681cef3..e821bae 100644
--- a/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
@@ -400,7 +400,7 @@ public abstract class BuildFileTest extends TestCase {
public void expectSpecificBuildException(String target, String cause, String msg) {
try {
executeTarget(target);
- } catch (org.apache.tools.ant.BuildException ex) {
+ } catch (BuildException ex) {
buildException = ex;
if ((null != msg) && (!ex.getMessage().equals(msg))) {
fail("Should throw BuildException because '" + cause
@@ -453,7 +453,7 @@ public abstract class BuildFileTest extends TestCase {
*/
public void assertPropertyEquals(String property, String value) {
String result = project.getProperty(property);
- assertEquals("property " + property,value,result);
+ assertEquals("property " + property, value, result);
}
/**
@@ -461,7 +461,7 @@ public abstract class BuildFileTest extends TestCase {
*
* @param property property name
*/
- public void assertPropertySet(String property) {
+ public void assertPropertySet(String property) {
assertPropertyEquals(property, "true");
}
@@ -484,7 +484,7 @@ public abstract class BuildFileTest extends TestCase {
* @param target build file target
* @param property property name
*/
- public void expectPropertySet(String target, String property) {
+ public void expectPropertySet(String target, String property) {
expectPropertySet(target, property, "true");
}
@@ -494,7 +494,7 @@ public abstract class BuildFileTest extends TestCase {
* @param target build file target
* @param property property name
*/
- public void expectPropertyUnset(String target, String property) {
+ public void expectPropertyUnset(String target, String property) {
expectPropertySet(target, property, null);
}
@@ -523,7 +523,7 @@ public abstract class BuildFileTest extends TestCase {
}
public void write(int b) {
- buffer.append((char)b);
+ buffer.append((char) b);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
index 3691d94..819d4e5 100644
--- a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
+++ b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
@@ -104,7 +104,7 @@ public class DirectoryScannerTest {
ds.setIncludes(new String[] {"alpha/beta/gamma/GAMMA.XML"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
- new String[] {});
+ new String[] {});
}
@Test
@@ -114,9 +114,8 @@ public class DirectoryScannerTest {
ds.setIncludes(new String[] {"ALPHA/"});
ds.setCaseSensitive(false);
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/beta.xml",
- "alpha/beta/gamma/gamma.xml"},
- new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
+ compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"},
+ new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
}
@Test
@@ -130,14 +129,13 @@ public class DirectoryScannerTest {
ds.setIncludes(new String[] {"alpha/beta/gamma/"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
- new String[] {"alpha/beta/gamma"});
+ new String[] {"alpha/beta/gamma"});
}
@Test
public void testProhibitSymlinks() {
assumeTrue("Current system does not support Symlinks", supportsSymlinks);
-
buildRule.getProject().executeTarget("symlink-setup");
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
@@ -150,9 +148,9 @@ public class DirectoryScannerTest {
// father and child pattern test
@Test
public void testOrderOfIncludePatternsIrrelevant() {
- String [] expectedFiles = {"alpha/beta/beta.xml",
+ String[] expectedFiles = {"alpha/beta/beta.xml",
"alpha/beta/gamma/gamma.xml"};
- String [] expectedDirectories = {"alpha/beta", "alpha/beta/gamma" };
+ String[] expectedDirectories = {"alpha/beta", "alpha/beta/gamma" };
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/be?a/**", "alpha/beta/gamma/"});
@@ -172,9 +170,8 @@ public class DirectoryScannerTest {
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/", "ALPHA/"});
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/beta.xml",
- "alpha/beta/gamma/gamma.xml"},
- new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
+ compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"},
+ new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
}
@Test
@@ -184,36 +181,27 @@ public class DirectoryScannerTest {
ds.setIncludes(new String[] {"alpha/", "ALPHA/"});
ds.setCaseSensitive(false);
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/beta.xml",
- "alpha/beta/gamma/gamma.xml"},
- new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
+ compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"},
+ new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
}
@Test
public void testFullpathDiffersInCaseScanningSensitive() {
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
- ds.setIncludes(new String[] {
- "alpha/beta/gamma/gamma.xml",
- "alpha/beta/gamma/GAMMA.XML"
- });
+ ds.setIncludes(new String[] {"alpha/beta/gamma/gamma.xml", "alpha/beta/gamma/GAMMA.XML"});
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
- new String[] {});
+ compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"}, new String[] {});
}
@Test
public void testFullpathDiffersInCaseScanningInsensitive() {
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
- ds.setIncludes(new String[] {
- "alpha/beta/gamma/gamma.xml",
- "alpha/beta/gamma/GAMMA.XML"
- });
+ ds.setIncludes(new String[] {"alpha/beta/gamma/gamma.xml", "alpha/beta/gamma/GAMMA.XML"});
ds.setCaseSensitive(false);
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
- new String[] {});
+ compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"}, new String[] {});
}
@Test
@@ -222,9 +210,8 @@ public class DirectoryScannerTest {
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
ds.setIncludes(new String[] {"alpha/", "ALPHA/beta/"});
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/beta.xml",
- "alpha/beta/gamma/gamma.xml"},
- new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
+ compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"},
+ new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
}
@Test
@@ -234,9 +221,8 @@ public class DirectoryScannerTest {
ds.setIncludes(new String[] {"alpha/", "ALPHA/beta/"});
ds.setCaseSensitive(false);
ds.scan();
- compareFiles(ds, new String[] {"alpha/beta/beta.xml",
- "alpha/beta/gamma/gamma.xml"},
- new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
+ compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"},
+ new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"});
}
/**
@@ -254,13 +240,10 @@ public class DirectoryScannerTest {
try {
// add conditions and more commands as soon as the need arises
- String[] command = new String[] {
- "ln", "-s", "ant", linkFile.getAbsolutePath()
- };
+ String[] command = new String[] {"ln", "-s", "ant", linkFile.getAbsolutePath()};
Process process = Runtime.getRuntime().exec(command);
assertEquals("0 return code expected for external process", 0, process.waitFor());
-
File dir = new File(System.getProperty("root"), "src/main/org/apache/tools");
DirectoryScanner ds = new DirectoryScanner();
@@ -280,9 +263,7 @@ public class DirectoryScannerTest {
for (String included : includeds) {
if (included.equals("zip")) {
haveZipPackage = true;
- } else if (included.equals("ThisIsALink"
- + File.separator
- + "taskdefs")) {
+ } else if (included.equals("ThisIsALink" + File.separator + "taskdefs")) {
haveTaskdefsPackage = true;
}
}
@@ -306,9 +287,7 @@ public class DirectoryScannerTest {
for (String included : includeds) {
if (included.equals("zip")) {
haveZipPackage = true;
- } else if (included.equals("ThisIsALink"
- + File.separator
- + "taskdefs")) {
+ } else if (included.equals("ThisIsALink" + File.separator + "taskdefs")) {
haveTaskdefsPackage = true;
}
}
@@ -329,65 +308,44 @@ public class DirectoryScannerTest {
public void testExcludeOneFile() {
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
- ds.setIncludes(new String[] {
- "**/*.xml"
- });
- ds.setExcludes(new String[] {
- "alpha/beta/b*xml"
- });
+ ds.setIncludes(new String[] {"**/*.xml"});
+ ds.setExcludes(new String[] {"alpha/beta/b*xml"});
ds.scan();
compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"},
- new String[] {});
+ new String[] {});
}
@Test
public void testExcludeHasPrecedence() {
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
- ds.setIncludes(new String[] {
- "alpha/**"
- });
- ds.setExcludes(new String[] {
- "alpha/**"
- });
+ ds.setIncludes(new String[] {"alpha/**"});
+ ds.setExcludes(new String[] {"alpha/**"});
ds.scan();
compareFiles(ds, new String[] {},
- new String[] {});
-
+ new String[] {});
}
@Test
public void testAlternateIncludeExclude() {
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
- ds.setIncludes(new String[] {
- "alpha/**",
- "alpha/beta/gamma/**"
- });
- ds.setExcludes(new String[] {
- "alpha/beta/**"
- });
+ ds.setIncludes(new String[] {"alpha/**", "alpha/beta/gamma/**"});
+ ds.setExcludes(new String[] {"alpha/beta/**"});
ds.scan();
compareFiles(ds, new String[] {},
- new String[] {"alpha"});
-
+ new String[] {"alpha"});
}
@Test
public void testAlternateExcludeInclude() {
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
- ds.setExcludes(new String[] {
- "alpha/**",
- "alpha/beta/gamma/**"
- });
- ds.setIncludes(new String[] {
- "alpha/beta/**"
- });
+ ds.setExcludes(new String[] {"alpha/**", "alpha/beta/gamma/**"});
+ ds.setIncludes(new String[] {"alpha/beta/**"});
ds.scan();
compareFiles(ds, new String[] {},
- new String[] {});
-
+ new String[] {});
}
/**
@@ -424,9 +382,9 @@ public class DirectoryScannerTest {
// a sysproperty with name tests.and.ant.share.classloader and value
// ${tests.and.ant.share.classloader} will be set
// we are trying to catch this here.
- assumeFalse("cannot execute testIsExcludedDirectoryScanned when tests are forked, " +
- "package private method called", shareclassloader == null
- || (shareclassloader != null && shareclassloader.indexOf("${") == 0));
+ assumeFalse("cannot execute testIsExcludedDirectoryScanned when tests are forked, "
+ + "package private method called", shareclassloader == null
+ || shareclassloader.indexOf("${") == 0);
buildRule.getProject().executeTarget("children-of-excluded-dir-setup");
DirectoryScanner ds = new DirectoryScanner();
ds.setBasedir(new File(buildRule.getProject().getProperty("output")));
@@ -448,13 +406,14 @@ public class DirectoryScannerTest {
File.separatorChar, '/');
ds.setIncludes(new String[] {tmpdir + "/**/*"});
ds.scan();
- compareFiles(ds, new String[] {tmpdir + "/alpha/beta/beta.xml",
- tmpdir + "/alpha/beta/gamma/gamma.xml",
- tmpdir + "/delta/delta.xml"},
- new String[] {tmpdir + "/alpha",
- tmpdir + "/alpha/beta",
- tmpdir + "/alpha/beta/gamma",
- tmpdir + "/delta"});
+ compareFiles(ds,
+ new String[] {tmpdir + "/alpha/beta/beta.xml",
+ tmpdir + "/alpha/beta/gamma/gamma.xml",
+ tmpdir + "/delta/delta.xml"},
+ new String[] {tmpdir + "/alpha",
+ tmpdir + "/alpha/beta",
+ tmpdir + "/alpha/beta/gamma",
+ tmpdir + "/delta"});
}
@Test
@@ -473,14 +432,14 @@ public class DirectoryScannerTest {
String tmpdir = buildRule.getProject().getProperty("output").replace(
File.separatorChar, '/');
ds.setIncludes(new String[] {tmpdir + "/**/*"});
- ds.setExcludes(new String[] {"**/alpha",
- "**/delta/*"});
+ ds.setExcludes(new String[] {"**/alpha", "**/delta/*"});
ds.scan();
- compareFiles(ds, new String[] {tmpdir + "/alpha/beta/beta.xml",
- tmpdir + "/alpha/beta/gamma/gamma.xml"},
- new String[] {tmpdir + "/alpha/beta",
- tmpdir + "/alpha/beta/gamma",
- tmpdir + "/delta"});
+ compareFiles(ds,
+ new String[] {tmpdir + "/alpha/beta/beta.xml",
+ tmpdir + "/alpha/beta/gamma/gamma.xml"},
+ new String[] {tmpdir + "/alpha/beta",
+ tmpdir + "/alpha/beta/gamma",
+ tmpdir + "/delta"});
}
@Test
@@ -489,19 +448,20 @@ public class DirectoryScannerTest {
DirectoryScanner ds = new DirectoryScanner();
String tmpdir = buildRule.getProject().getProperty("output").replace(
File.separatorChar, '/');
- ds.setIncludes(new String[] {tmpdir + "/alpha/beta/**/*",
- tmpdir + "/delta/*"});
+ ds.setIncludes(new String[] {tmpdir + "/alpha/beta/**/*", tmpdir + "/delta/*"});
ds.setExcludes(new String[] {"**/beta.xml"});
ds.scan();
- compareFiles(ds, new String[] {tmpdir + "/alpha/beta/gamma/gamma.xml",
- tmpdir + "/delta/delta.xml"},
- new String[] {tmpdir + "/alpha/beta/gamma"});
+ compareFiles(ds,
+ new String[] {tmpdir + "/alpha/beta/gamma/gamma.xml",
+ tmpdir + "/delta/delta.xml"},
+ new String[] {tmpdir + "/alpha/beta/gamma"});
}
@Test
public void testAbsolute5() {
//testing drive letter search from root:
- assumeTrue("Can't use drive letters on non DOS or Netware systems", (Os.isFamily("dos") || Os.isFamily("netware")));
+ assumeTrue("Can't use drive letters on non DOS or Netware systems",
+ Os.isFamily("dos") || Os.isFamily("netware"));
DirectoryScanner ds = new DirectoryScanner();
String pattern = new File(File.separator).getAbsolutePath().toUpperCase() + "*";
ds.setIncludes(new String[] {pattern});
@@ -526,8 +486,7 @@ public class DirectoryScannerTest {
}
TreeSet<String> directories = new TreeSet<String>();
for (String includedDirectory : includedDirectories) {
- directories.add(includedDirectory
- .replace(File.separatorChar, '/'));
+ directories.add(includedDirectory.replace(File.separatorChar, '/'));
}
String currentfile;
@@ -556,19 +515,16 @@ public class DirectoryScannerTest {
ds.scan();
List<String> dirs = Arrays.asList(ds.getExcludedDirectories());
assertEquals(2, dirs.size());
- assertTrue("beta is excluded",
- dirs.contains("alpha/beta".replace('/', File.separatorChar)));
- assertTrue("gamma is excluded",
- dirs.contains("alpha/beta/gamma".replace('/',
- File.separatorChar)));
+ assertTrue("beta is excluded", dirs.contains("alpha/beta"
+ .replace('/', File.separatorChar)));
+ assertTrue("gamma is excluded", dirs.contains("alpha/beta/gamma"
+ .replace('/', File.separatorChar)));
List<String> files = Arrays.asList(ds.getExcludedFiles());
assertEquals(2, files.size());
- assertTrue("beta.xml is excluded",
- files.contains("alpha/beta/beta.xml"
- .replace('/', File.separatorChar)));
- assertTrue("gamma.xml is excluded",
- files.contains("alpha/beta/gamma/gamma.xml"
- .replace('/', File.separatorChar)));
+ assertTrue("beta.xml is excluded", files.contains("alpha/beta/beta.xml"
+ .replace('/', File.separatorChar)));
+ assertTrue("gamma.xml is excluded", files.contains("alpha/beta/gamma/gamma.xml"
+ .replace('/', File.separatorChar)));
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/FileUtilities.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/FileUtilities.java b/src/tests/junit/org/apache/tools/ant/FileUtilities.java
index 79b5716..321d8d4 100644
--- a/src/tests/junit/org/apache/tools/ant/FileUtilities.java
+++ b/src/tests/junit/org/apache/tools/ant/FileUtilities.java
@@ -70,7 +70,7 @@ public class FileUtilities {
return;
}
- assumeTrue(file.setLastModified(file.lastModified() - (seconds * 1000)));
+ assumeTrue(file.setLastModified(file.lastModified() - seconds * 1000));
if (file.isDirectory()) {
File[] children = file.listFiles();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/ImmutableTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/ImmutableTest.java b/src/tests/junit/org/apache/tools/ant/ImmutableTest.java
index 933bd28..eb8c4cc 100644
--- a/src/tests/junit/org/apache/tools/ant/ImmutableTest.java
+++ b/src/tests/junit/org/apache/tools/ant/ImmutableTest.java
@@ -41,7 +41,7 @@ public class ImmutableTest {
@Test
public void test1() {
buildRule.executeTarget("test1");
- assertEquals("override",buildRule.getProject().getProperty("test"));
+ assertEquals("override", buildRule.getProject().getProperty("test"));
}
// ensure <tstamp>'s new prefix attribute is working
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
index 157438e..34cd928 100644
--- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -551,11 +551,11 @@ public class IntrospectionHelperTest {
assertAttrMethod("sixteen", "setSixteen", Character.class,
new Character('a'), new Character('b'));
assertAttrMethod("seventeen", "setSeventeen", Byte.TYPE,
- new Byte((byte)17), new Byte((byte)10));
+ new Byte((byte) 17), new Byte((byte) 10));
assertAttrMethod("eightteen", "setEightteen", Short.TYPE,
- new Short((short)18), new Short((short)10));
+ new Short((short) 18), new Short((short) 10));
assertAttrMethod("nineteen", "setNineteen", Double.TYPE,
- new Double(19), new Double((short)10));
+ new Double(19), new Double((short) 10));
try {
assertAttrMethod("onehundred", null, null, null, null);
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/PropertyExpansionTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/PropertyExpansionTest.java b/src/tests/junit/org/apache/tools/ant/PropertyExpansionTest.java
index 601391e..c943d3e 100644
--- a/src/tests/junit/org/apache/tools/ant/PropertyExpansionTest.java
+++ b/src/tests/junit/org/apache/tools/ant/PropertyExpansionTest.java
@@ -47,17 +47,17 @@ public class PropertyExpansionTest {
*/
@Test
public void testPropertyExpansion() {
- assertExpandsTo("","");
- assertExpandsTo("$","$");
- assertExpandsTo("$$-","$-");
- assertExpandsTo("$$","$");
- buildRule.getProject().setProperty("expanded","EXPANDED");
- assertExpandsTo("a${expanded}b","aEXPANDEDb");
- assertExpandsTo("${expanded}${expanded}","EXPANDEDEXPANDED");
- assertExpandsTo("$$$","$$");
- assertExpandsTo("$$$$-","$$-");
- assertExpandsTo("","");
- assertExpandsTo("Class$$subclass","Class$subclass");
+ assertExpandsTo("", "");
+ assertExpandsTo("$", "$");
+ assertExpandsTo("$$-", "$-");
+ assertExpandsTo("$$", "$");
+ buildRule.getProject().setProperty("expanded", "EXPANDED");
+ assertExpandsTo("a${expanded}b", "aEXPANDEDb");
+ assertExpandsTo("${expanded}${expanded}", "EXPANDEDEXPANDED");
+ assertExpandsTo("$$$", "$$");
+ assertExpandsTo("$$$$-", "$$-");
+ assertExpandsTo("", "");
+ assertExpandsTo("Class$$subclass", "Class$subclass");
}
/**
@@ -65,13 +65,13 @@ public class PropertyExpansionTest {
*/
@Test
public void testDollarPassthru() {
- assertExpandsTo("$-","$-");
- assertExpandsTo("Class$subclass","Class$subclass");
- assertExpandsTo("$$$-","$$-");
- assertExpandsTo("$$$$$","$$$");
- assertExpandsTo("${unassigned.property}","${unassigned.property}");
- assertExpandsTo("a$b","a$b");
- assertExpandsTo("$}}","$}}");
+ assertExpandsTo("$-", "$-");
+ assertExpandsTo("Class$subclass", "Class$subclass");
+ assertExpandsTo("$$$-", "$$-");
+ assertExpandsTo("$$$$$", "$$$");
+ assertExpandsTo("${unassigned.property}", "${unassigned.property}");
+ assertExpandsTo("a$b", "a$b");
+ assertExpandsTo("$}}", "$}}");
}
@@ -81,10 +81,10 @@ public class PropertyExpansionTest {
@Test
@Ignore("Previously disabled through naming convention")
public void oldtestQuirkyLegacyBehavior() {
- assertExpandsTo("Class$subclass","Classsubclass");
- assertExpandsTo("$$$-","$-");
- assertExpandsTo("a$b","ab");
- assertExpandsTo("$}}","}}");
+ assertExpandsTo("Class$subclass", "Classsubclass");
+ assertExpandsTo("$$$-", "$-");
+ assertExpandsTo("a$b", "ab");
+ assertExpandsTo("$}}", "}}");
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java b/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java
index 38835c4..b07abe0 100644
--- a/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/filters/TokenFilterTest.java
@@ -265,10 +265,10 @@ public class TokenFilterTest {
public static class Capitalize implements TokenFilter.Filter {
public String filter(String token) {
- if (token.length() == 0)
+ if (token.length() == 0) {
return token;
- return token.substring(0, 1).toUpperCase() +
- token.substring(1);
+ }
+ return token.substring(0, 1).toUpperCase() + token.substring(1);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java b/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
index 3184589..b8dffae 100644
--- a/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
@@ -33,8 +33,8 @@ public class LocatorTest {
private boolean windows;
private boolean unix;
private static final String LAUNCHER_JAR = "//morzine/slo/Java/Apache/ant/lib/ant-launcher.jar";
- private static final String SHARED_JAR_URI = "jar:file:" + LAUNCHER_JAR +
- "!/org/apache/tools/ant/launch/Launcher.class";
+ private static final String SHARED_JAR_URI = "jar:file:" + LAUNCHER_JAR
+ + "!/org/apache/tools/ant/launch/Launcher.class";
@Before
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
index 1d7c252..d3bb33c 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
@@ -126,9 +126,7 @@ public class AntTest {
File dir1 = buildRule.getProject().getBaseDir();
File dir2 = buildRule.getProject().resolveFile("..");
testBaseDirs("explicitBasedir1",
- new String[] {dir1.getAbsolutePath(),
- dir2.getAbsolutePath()
- });
+ new String[] {dir1.getAbsolutePath(), dir2.getAbsolutePath()});
}
@Test
@@ -136,9 +134,7 @@ public class AntTest {
File dir1 = buildRule.getProject().getBaseDir();
File dir2 = buildRule.getProject().resolveFile("..");
testBaseDirs("explicitBasedir2",
- new String[] {dir1.getAbsolutePath(),
- dir2.getAbsolutePath()
- });
+ new String[] {dir1.getAbsolutePath(), dir2.getAbsolutePath()});
}
@Test
@@ -152,9 +148,7 @@ public class AntTest {
File dir1 = buildRule.getProject().getBaseDir();
File dir2 = buildRule.getProject().resolveFile("ant");
testBaseDirs("doNotInheritBasedir",
- new String[] {dir1.getAbsolutePath(),
- dir2.getAbsolutePath()
- });
+ new String[] {dir1.getAbsolutePath(), dir2.getAbsolutePath()});
}
@Test
@@ -162,10 +156,7 @@ public class AntTest {
File dir1 = buildRule.getProject().getBaseDir();
File dir2 = buildRule.getProject().resolveFile("ant");
testBaseDirs("tripleCall",
- new String[] {dir1.getAbsolutePath(),
- dir2.getAbsolutePath(),
- dir1.getAbsolutePath()
- });
+ new String[] {dir1.getAbsolutePath(), dir2.getAbsolutePath(), dir1.getAbsolutePath()});
}
protected void testBaseDirs(String target, String[] dirs) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
index b85af3f..d080fae 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
@@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileRule;
import org.apache.tools.bzip2.CBZip2InputStream;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java
index faa830f..d44f514 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java
@@ -57,7 +57,7 @@ public class ExecTaskTest {
private File logFile;
private MonitoredBuild myBuild = null;
- volatile private boolean buildFinished = false;
+ private volatile boolean buildFinished = false;
@Before
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
index 9e87af0..06beab4 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
@@ -35,10 +35,9 @@ import static org.junit.Assert.assertTrue;
*/
public class ExecuteJavaTest {
- private final static int TIME_OUT = 5000;
-
- private final static int CLOCK_ERROR = 200;
- private final static int TIME_OUT_TEST = TIME_OUT - CLOCK_ERROR;
+ private static final int TIME_OUT = 5000;
+ private static final int CLOCK_ERROR = 200;
+ private static final int TIME_OUT_TEST = TIME_OUT - CLOCK_ERROR;
private ExecuteJava ej;
private Project project;
@@ -47,7 +46,7 @@ public class ExecuteJavaTest {
@Before
public void setUp() {
ej = new ExecuteJava();
- ej.setTimeout((long)TIME_OUT);
+ ej.setTimeout((long) TIME_OUT);
project = new Project();
project.setBasedir(".");
project.setProperty(MagicNames.ANT_HOME, System.getProperty(MagicNames.ANT_HOME));
@@ -121,7 +120,7 @@ public class ExecuteJavaTest {
private static String getTestClassPath() {
String classpath = System.getProperty("build.tests");
if (classpath == null) {
- System.err.println("WARNING: 'build.tests' property is not available !");
+ System.err.println("WARNING: 'build.tests' property is not available!");
classpath = System.getProperty("java.class.path");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
index f23ea3b..b557e76 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
@@ -36,12 +36,11 @@ import static org.junit.Assert.assertTrue;
*/
public class ExecuteWatchdogTest {
- private final static long TIME_OUT = 5000;
+ private static final String TEST_CLASSPATH = getTestClassPath();
- private final static String TEST_CLASSPATH = getTestClassPath();
-
- private final static int CLOCK_ERROR = 200;
- private final static long TIME_OUT_TEST = TIME_OUT - CLOCK_ERROR;
+ private static final long TIME_OUT = 5000;
+ private static final int CLOCK_ERROR = 200;
+ private static final long TIME_OUT_TEST = TIME_OUT - CLOCK_ERROR;
private ExecuteWatchdog watchdog;
@@ -57,7 +56,7 @@ public class ExecuteWatchdogTest {
private static String getTestClassPath() {
String classpath = System.getProperty("build.tests");
if (classpath == null) {
- System.err.println("WARNING: 'build.tests' property is not available !");
+ System.err.println("WARNING: 'build.tests' property is not available!");
classpath = System.getProperty("java.class.path");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
index 0a26606..3b916b6 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
@@ -54,7 +54,8 @@ public class JarTest {
private static String tempJar = "tmp.jar";
private static String tempDir = "jartmp/";
- private Reader r1, r2;
+ private Reader r1;
+ private Reader r2;
@Before
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
index ea1bdbf..5579f85 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
import org.junit.internal.AssumptionViolatedException;
import static org.apache.tools.ant.AntAssert.assertContains;
-import org.apache.tools.ant.types.Path;
import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -498,7 +497,7 @@ public class JavaTest {
* test class for spawn
*/
public static class SpawnEntryPoint {
- public static void main(String [] argv) throws InterruptedException {
+ public static void main(String[] argv) throws InterruptedException {
int sleepTime = 10;
String logFile = "spawn.log";
if (argv.length >= 1) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
index 7f78b7b..cfdbf11 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
@@ -106,30 +106,30 @@ public class ManifestClassPathTest {
public void testParentLevel1() {
buildRule.executeTarget("test-parent-level1");
- assertEquals(buildRule.getProject().getProperty("jar.classpath"), "dsp-core/ " +
- "dsp-pres/ " +
- "dsp-void/ " +
- "../generated/dsp-core/ " +
- "../generated/dsp-pres/ " +
- "../generated/dsp-void/ " +
- "../resources/dsp-core/ " +
- "../resources/dsp-pres/ " +
- "../resources/dsp-void/");
+ assertEquals(buildRule.getProject().getProperty("jar.classpath"), "dsp-core/ "
+ + "dsp-pres/ "
+ + "dsp-void/ "
+ + "../generated/dsp-core/ "
+ + "../generated/dsp-pres/ "
+ + "../generated/dsp-void/ "
+ + "../resources/dsp-core/ "
+ + "../resources/dsp-pres/ "
+ + "../resources/dsp-void/");
}
@Test
public void testParentLevel2() {
buildRule.executeTarget("test-parent-level2");
- assertEquals(buildRule.getProject().getProperty("jar.classpath"), "../dsp-core/ " +
- "../dsp-pres/ " +
- "../dsp-void/ " +
- "../../generated/dsp-core/ " +
- "../../generated/dsp-pres/ " +
- "../../generated/dsp-void/ " +
- "../../resources/dsp-core/ " +
- "../../resources/dsp-pres/ " +
- "../../resources/dsp-void/");
+ assertEquals(buildRule.getProject().getProperty("jar.classpath"), "../dsp-core/ "
+ + "../dsp-pres/ "
+ + "../dsp-void/ "
+ + "../../generated/dsp-core/ "
+ + "../../generated/dsp-pres/ "
+ + "../../generated/dsp-void/ "
+ + "../../resources/dsp-core/ "
+ + "../../resources/dsp-pres/ "
+ + "../../resources/dsp-void/");
}
@Test
@@ -148,12 +148,12 @@ public class ManifestClassPathTest {
Assume.assumeTrue("No regexp matcher is present", RegexpMatcherFactory.regexpMatcherPresent(buildRule.getProject()));
buildRule.executeTarget("test-pseudo-tahoe-refid");
- assertEquals(buildRule.getProject().getProperty("jar.classpath"), "classes/dsp-core/ " +
- "classes/dsp-pres/ " +
- "classes/dsp-void/ " +
- "generated/dsp-core/ " +
- "resources/dsp-core/ " +
- "resources/dsp-pres/");
+ assertEquals(buildRule.getProject().getProperty("jar.classpath"), "classes/dsp-core/ "
+ + "classes/dsp-pres/ "
+ + "classes/dsp-void/ "
+ + "generated/dsp-core/ "
+ + "resources/dsp-core/ "
+ + "resources/dsp-pres/");
}
@Test
@@ -161,29 +161,29 @@ public class ManifestClassPathTest {
Assume.assumeTrue("No regexp matcher is present", RegexpMatcherFactory.regexpMatcherPresent(buildRule.getProject()));
buildRule.executeTarget("test-pseudo-tahoe-nested");
- assertEquals(buildRule.getProject().getProperty("jar.classpath"), "classes/dsp-core/ " +
- "classes/dsp-pres/ " +
- "classes/dsp-void/ " +
- "generated/dsp-core/ " +
- "resources/dsp-core/ " +
- "resources/dsp-pres/");
+ assertEquals(buildRule.getProject().getProperty("jar.classpath"), "classes/dsp-core/ "
+ + "classes/dsp-pres/ "
+ + "classes/dsp-void/ "
+ + "generated/dsp-core/ "
+ + "resources/dsp-core/ "
+ + "resources/dsp-pres/");
}
@Test
public void testParentLevel2WithJars() {
buildRule.executeTarget("test-parent-level2-with-jars");
- assertEquals(buildRule.getProject().getProperty("jar.classpath"), "../../lib/acme-core.jar " +
- "../../lib/acme-pres.jar " +
- "../dsp-core/ " +
- "../dsp-pres/ " +
- "../dsp-void/ " +
- "../../generated/dsp-core/ " +
- "../../generated/dsp-pres/ " +
- "../../generated/dsp-void/ " +
- "../../resources/dsp-core/ " +
- "../../resources/dsp-pres/ " +
- "../../resources/dsp-void/");
+ assertEquals(buildRule.getProject().getProperty("jar.classpath"), "../../lib/acme-core.jar "
+ + "../../lib/acme-pres.jar "
+ + "../dsp-core/ "
+ + "../dsp-pres/ "
+ + "../dsp-void/ "
+ + "../../generated/dsp-core/ "
+ + "../../generated/dsp-pres/ "
+ + "../../generated/dsp-void/ "
+ + "../../resources/dsp-core/ "
+ + "../../resources/dsp-pres/ "
+ + "../../resources/dsp-void/");
}
@Test
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
index e5a1aa7..ca1a94d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
@@ -301,14 +301,14 @@ public class ManifestTest {
fin.close();
}
- assertTrue("Manifest file should have contained string ", set
- .remove(" NOT_LONG"));
- assertTrue("Manifest file should have contained string ", set
- .remove(" NG"));
- assertTrue("Manifest file should have contained string ", set
- .remove(LONG_70_NAME + ": "));
- assertTrue("Manifest file should have contained string ", set
- .remove(NOT_LONG_NAME + ": NOT_LO"));
+ assertTrue("Manifest file should have contained string ",
+ set.remove(" NOT_LONG"));
+ assertTrue("Manifest file should have contained string ",
+ set.remove(" NG"));
+ assertTrue("Manifest file should have contained string ",
+ set.remove(LONG_70_NAME + ": "));
+ assertTrue("Manifest file should have contained string ",
+ set.remove(NOT_LONG_NAME + ": NOT_LO"));
}
/**
@@ -320,15 +320,15 @@ public class ManifestTest {
Manifest manifest = getManifest(expandedManifest);
Enumeration e = manifest.getSectionNames();
- String section1 = (String)e.nextElement();
- String section2 = (String)e.nextElement();
+ String section1 = (String) e.nextElement();
+ String section2 = (String) e.nextElement();
assertEquals("First section name unexpected", "Test1", section1);
assertEquals("Second section name unexpected", "Test2", section2);
Manifest.Section section = manifest.getSection("Test1");
e = section.getAttributeKeys();
- String attr1Key = (String)e.nextElement();
- String attr2Key = (String)e.nextElement();
+ String attr1Key = (String) e.nextElement();
+ String attr2Key = (String) e.nextElement();
String attr1 = section.getAttribute(attr1Key).getName();
String attr2 = section.getAttribute(attr2Key).getName();
assertEquals("First attribute name unexpected", "TestAttr1", attr1);
@@ -344,15 +344,15 @@ public class ManifestTest {
Manifest manifest = getManifest(expandedManifest);
Enumeration e = manifest.getSectionNames();
- String section1 = (String)e.nextElement();
- String section2 = (String)e.nextElement();
+ String section1 = (String) e.nextElement();
+ String section2 = (String) e.nextElement();
assertEquals("First section name unexpected", "Test2", section1);
assertEquals("Second section name unexpected", "Test1", section2);
Manifest.Section section = manifest.getSection("Test1");
e = section.getAttributeKeys();
- String attr1Key = (String)e.nextElement();
- String attr2Key = (String)e.nextElement();
+ String attr1Key = (String) e.nextElement();
+ String attr2Key = (String) e.nextElement();
String attr1 = section.getAttribute(attr1Key).getName();
String attr2 = section.getAttribute(attr2Key).getName();
assertEquals("First attribute name unexpected", "TestAttr2", attr1);
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ParallelTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ParallelTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ParallelTest.java
index 4f7a4d0..0da5978 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ParallelTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ParallelTest.java
@@ -40,16 +40,14 @@ public class ParallelTest {
public final BuildFileRule buildRule = new BuildFileRule();
/** Standard property value for the basic test */
- public final static String DIRECT_MESSAGE = "direct";
+ public static final String DIRECT_MESSAGE = "direct";
/** Standard property value for the basic and fail test */
- public final static String DELAYED_MESSAGE = "delayed";
+ public static final String DELAYED_MESSAGE = "delayed";
/** Standard property value for the fail test */
- public final static String FAILURE_MESSAGE = "failure";
+ public static final String FAILURE_MESSAGE = "failure";
/** the build file associated with this test */
- public final static String TEST_BUILD_FILE
- = "src/etc/testcases/taskdefs/parallel.xml";
-
+ public static final String TEST_BUILD_FILE = "src/etc/testcases/taskdefs/parallel.xml";
/** The JUnit setup method */
@Before
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
index 4e40c28..4a9691e 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
@@ -134,7 +134,7 @@ public class ReplaceTest {
buildRule.executeTarget("lastModifiedSetup");
File testFile = new File(buildRule.getOutputDir(), "test.txt");
assumeTrue("Could not change file modification time",
- testFile.setLastModified(testFile.lastModified() - (FileUtils.getFileUtils().getFileTimestampGranularity() * 5)));
+ testFile.setLastModified(testFile.lastModified() - FileUtils.getFileUtils().getFileTimestampGranularity() * 5));
long ts1 = testFile.lastModified();
buildRule.executeTarget("testNoPreserve");
assertTrue(ts1 < new File(buildRule.getOutputDir(), "test.txt").lastModified());
@@ -145,8 +145,9 @@ public class ReplaceTest {
buildRule.executeTarget("lastModifiedSetup");
File testFile = new File(buildRule.getOutputDir(), "test.txt");
assumeTrue("Could not change file modification time",
- testFile.setLastModified(testFile.lastModified() - (FileUtils.getFileUtils().getFileTimestampGranularity() * 5)));
- long ts1 = testFile.lastModified();buildRule.executeTarget("testPreserve");
+ testFile.setLastModified(testFile.lastModified() - FileUtils.getFileUtils().getFileTimestampGranularity() * 5));
+ long ts1 = testFile.lastModified();
+ buildRule.executeTarget("testPreserve");
assertTrue(ts1 == new File(buildRule.getOutputDir(), "test.txt").lastModified());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
index 604e683..138712d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.fail;
*/
public class RmicAdvancedTest {
- private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/rmic/";
+ private static final String TASKDEFS_DIR = "src/etc/testcases/taskdefs/rmic/";
@Rule
public BuildFileRule buildRule = new BuildFileRule();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/RmicTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicTest.java
index a8ef90c..eb81857 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicTest.java
@@ -88,7 +88,7 @@ public class RmicTest {
// check defaults
String compiler = rmic.getCompiler();
assertNotNull(compiler);
- assertEquals("expected sun or kaffe, but found " + compiler, compiler,"default");
+ assertEquals("expected sun or kaffe, but found " + compiler, compiler, "default");
project.setNewProperty("build.rmic", "weblogic");
compiler = rmic.getCompiler();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
index 979ec23..24b042d 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
@@ -50,17 +50,17 @@ import static org.junit.Assert.fail;
public class SQLExecTest {
// some database keys, see #getProperties(int)
- public final static int NULL = 0;
- public final static int ORACLE = 1;
- public final static int MYSQL = 2;
+ public static final int NULL = 0;
+ public static final int ORACLE = 1;
+ public static final int MYSQL = 2;
// keys used in properties.
- public final static String DRIVER = "driver";
- public final static String USER = "user";
- public final static String PASSWORD = "password";
- public final static String URL = "url";
- public final static String PATH = "path";
- public final static String SQL = "sql";
+ public static final String DRIVER = "driver";
+ public static final String USER = "user";
+ public static final String PASSWORD = "password";
+ public static final String URL = "url";
+ public static final String PATH = "path";
+ public static final String SQL = "sql";
@Before
public void setUp() throws Exception {
@@ -223,7 +223,7 @@ public class SQLExecTest {
//--- NULL JDBC driver just for simple test since there are no db driver
// available as a default in Ant :)
- public final static String NULL_DRIVER = NullDriver.class.getName();
+ public static final String NULL_DRIVER = NullDriver.class.getName();
public static class NullDriver implements Driver {
public Connection connect(String url, Properties info)
@@ -326,8 +326,7 @@ public class SQLExecTest {
assertEquals(0, s.lastDelimiterPosition(new StringBuffer("; "), "; "));
assertEquals(1, s.lastDelimiterPosition(new StringBuffer("ab"), ";"));
s.setDelimiter("GO");
- assertEquals(1,
- s.lastDelimiterPosition(new StringBuffer("abcd"), "GO "));
+ assertEquals(1, s.lastDelimiterPosition(new StringBuffer("abcd"), "GO "));
assertEquals(0, s.lastDelimiterPosition(new StringBuffer("go"), "go"));
assertEquals(0, s.lastDelimiterPosition(new StringBuffer("ab"), "GO"));
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/SleepTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SleepTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SleepTest.java
index e9db64b..3d6ce87 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SleepTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SleepTest.java
@@ -32,8 +32,8 @@ public class SleepTest {
@Rule
public final BuildFileRule buildRule = new BuildFileRule();
- private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/";
- private final static int ERROR_RANGE = 1000;
+ private static final String TASKDEFS_DIR = "src/etc/testcases/taskdefs/";
+ private static final int ERROR_RANGE = 1000;
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
index a45a098..9fd4667 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
@@ -156,40 +156,55 @@ public class StyleTest {
@Test
public void testWithFileResource() throws Exception {
- expectFileContains("testWithFileResource", buildRule.getOutputDir().getAbsoluteFile() + "/out.xml", "set='value'");
+ expectFileContains("testWithFileResource", buildRule.getOutputDir().getAbsoluteFile()
+ + "/out.xml", "set='value'");
}
@Test
public void testWithUrlResource() throws Exception {
- expectFileContains("testWithUrlResource", buildRule.getOutputDir().getAbsoluteFile() + "/out.xml", "set='value'");
+ expectFileContains("testWithUrlResource", buildRule.getOutputDir().getAbsoluteFile()
+ + "/out.xml", "set='value'");
}
@Test
public void testFilenameAsParam() throws Exception {
buildRule.executeTarget("testFilenameAsParam");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt", "filename='one.xml'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/two.txt", "filename='two.xml'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/three.txt", "filename='three.xml'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filename='four.xml'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filedir ='-not-set-'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt",
+ "filename='one.xml'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/two.txt",
+ "filename='two.xml'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/three.txt",
+ "filename='three.xml'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt",
+ "filename='four.xml'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt",
+ "filedir ='-not-set-'");
}
@Test
public void testFilenameAsParamNoSetting() throws Exception {
buildRule.executeTarget("testFilenameAsParamNoSetting");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt", "filename='-not-set-'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/two.txt", "filename='-not-set-'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/three.txt", "filename='-not-set-'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filename='-not-set-'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt",
+ "filename='-not-set-'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/two.txt",
+ "filename='-not-set-'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/three.txt",
+ "filename='-not-set-'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt",
+ "filename='-not-set-'");
}
@Test
public void testFilenameAndFiledirAsParam() throws Exception {
buildRule.executeTarget("testFilenameAndFiledirAsParam");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt", "filename='one.xml'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt", "filedir ='.'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filename='four.xml'");
- assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filedir ='dir'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt",
+ "filename='one.xml'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/one.txt",
+ "filedir ='.'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt",
+ "filename='four.xml'");
+ assertFileContains(buildRule.getOutputDir().getAbsoluteFile() + "/dir/four.txt",
+ "filedir ='dir'");
}
@@ -205,8 +220,7 @@ public class StyleTest {
return FileUtilities.getFileContents(new File(filename));
}
- private void expectFileContains(
- String target, String filename, String contains)
+ private void expectFileContains(String target, String filename, String contains)
throws IOException {
buildRule.executeTarget(target);
assertFileContains(filename, contains);
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/SubAntTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SubAntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SubAntTest.java
index 7489015..0a7321f 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SubAntTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SubAntTest.java
@@ -48,7 +48,7 @@ public class SubAntTest {
@Test
public void testnodirs() {
buildRule.executeTarget("testnodirs");
- assertEquals("No sub-builds to iterate on",buildRule.getLog());
+ assertEquals("No sub-builds to iterate on", buildRule.getLog());
}
// target must be specified
@@ -59,11 +59,9 @@ public class SubAntTest {
File dir3 = buildRule.getProject().resolveFile("subant/subant-test2");
testBaseDirs("testgenericantfile",
- new String[] { dir1.getAbsolutePath(),
- dir2.getAbsolutePath(),
- dir3.getAbsolutePath()
-
- });
+ new String[] {dir1.getAbsolutePath(),
+ dir2.getAbsolutePath(),
+ dir3.getAbsolutePath()});
}
@Test
@@ -77,11 +75,9 @@ public class SubAntTest {
File dir3 = buildRule.getProject().resolveFile("subant");
testBaseDirs("testantfile",
- new String[] { dir1.getAbsolutePath(),
- dir2.getAbsolutePath(),
- dir3.getAbsolutePath()
-
- });
+ new String[] {dir1.getAbsolutePath(),
+ dir2.getAbsolutePath(),
+ dir3.getAbsolutePath()});
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
index fe6902f..0f90146 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java
@@ -97,7 +97,7 @@ public class TouchTest {
long now = System.currentTimeMillis();
buildRule.executeTarget("testNow");
long time = getTargetTime();
- assertTimesNearlyMatch(time,now,5000);
+ assertTimesNearlyMatch(time, now, 5000);
}
/**
* verify that the millis test sets things up
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
index bf8f28d..aac89ae 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
@@ -124,16 +124,14 @@ public class TypeAdapterTest {
try {
Method execMethod = proxyClass.getMethod(execMethodName);
if (!Void.TYPE.equals(execMethod.getReturnType())) {
- String message =
- "return type of " + execMethodName + "() should be "
- + "void but was \"" + execMethod.getReturnType() +
- "\" in " + proxyClass;
+ String message = "return type of " + execMethodName + "() should be "
+ + "void but was \"" + execMethod.getReturnType()
+ + "\" in " + proxyClass;
log(message, Project.MSG_WARN);
}
return execMethod;
} catch (NoSuchMethodException e) {
- String message = "No public " + execMethodName + "() method in "
- + proxyClass;
+ String message = "No public " + execMethodName + "() method in " + proxyClass;
log(message, Project.MSG_ERR);
throw new BuildException(message);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java
index 661d6e9..55d4c8b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/UnzipTest.java
@@ -107,8 +107,10 @@ public class UnzipTest {
@Test
public void testPatternSetExcludeOnly() {
buildRule.executeTarget("testPatternSetExcludeOnly");
- assertFileMissing("1/foo is excluded", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("2/bar is not excluded", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is excluded",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is not excluded",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -117,8 +119,10 @@ public class UnzipTest {
@Test
public void testPatternSetIncludeOnly() {
buildRule.executeTarget("testPatternSetIncludeOnly");
- assertFileMissing("1/foo is not included", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("2/bar is included", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is not included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -127,8 +131,10 @@ public class UnzipTest {
@Test
public void testPatternSetIncludeAndExclude() {
buildRule.executeTarget("testPatternSetIncludeAndExclude");
- assertFileMissing("1/foo is not included", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileMissing("2/bar is excluded", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is not included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileMissing("2/bar is excluded",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -137,8 +143,10 @@ public class UnzipTest {
@Test
public void testTwoPatternSets() {
buildRule.executeTarget("testTwoPatternSets");
- assertFileMissing("1/foo is not included", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("2/bar is included", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is not included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -147,8 +155,10 @@ public class UnzipTest {
@Test
public void testTwoPatternSetsWithExcludes() {
buildRule.executeTarget("testTwoPatternSetsWithExcludes");
- assertFileMissing("1/foo is not included", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileMissing("2/bar is excluded", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is not included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileMissing("2/bar is excluded",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
/*
@@ -169,8 +179,10 @@ public class UnzipTest {
@Test
public void testPatternSetSlashOnly() {
buildRule.executeTarget("testPatternSetSlashOnly");
- assertFileMissing("1/foo is not included", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("\"2/bar is included", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is not included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("\"2/bar is included",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
@@ -180,7 +192,8 @@ public class UnzipTest {
@Test
public void testEncoding() {
buildRule.executeTarget("encodingTest");
- assertFileExists("foo has been properly named", buildRule.getProject().getProperty("output") + "/unziptestout/foo");
+ assertFileExists("foo has been properly named",
+ buildRule.getProject().getProperty("output") + "/unziptestout/foo");
}
/*
@@ -189,8 +202,10 @@ public class UnzipTest {
@Test
public void testFlattenMapper() {
buildRule.executeTarget("testFlattenMapper");
- assertFileMissing("1/foo is not flattened", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("foo is flattened", buildRule.getProject().getProperty("output") + "/unziptestout/foo");
+ assertFileMissing("1/foo is not flattened",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("foo is flattened",
+ buildRule.getProject().getProperty("output") + "/unziptestout/foo");
}
/**
@@ -220,8 +235,10 @@ public class UnzipTest {
@Test
public void testGlobMapper() {
buildRule.executeTarget("testGlobMapper");
- assertFileMissing("1/foo is not mapped", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("1/foo is mapped", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo.txt");
+ assertFileMissing("1/foo is not mapped",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("1/foo is mapped",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo.txt");
}
@Test
@@ -244,7 +261,9 @@ public class UnzipTest {
@Test
public void testDocumentationClaimsOnCopy() {
buildRule.executeTarget("testDocumentationClaimsOnCopy");
- assertFileMissing("1/foo is excluded", buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
- assertFileExists("2/bar is not excluded", buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
+ assertFileMissing("1/foo is excluded",
+ buildRule.getProject().getProperty("output") + "/unziptestout/1/foo");
+ assertFileExists("2/bar is not excluded",
+ buildRule.getProject().getProperty("output") + "/unziptestout/2/bar");
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
index 1cb722f..d833f75 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
@@ -219,7 +219,7 @@ public class XmlPropertyTest {
String propertyValue = properties.getProperty(currentKey);
- String xmlValue = (String)xmlproperties.get(currentKey);
+ String xmlValue = (String) xmlproperties.get(currentKey);
if (propertyValue.startsWith("ID.")) {
// The property is an id's thing -- either a property
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
index 276157d..2a754ae 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -136,7 +136,8 @@ public class ZipTest {
public void testZipgroupfileset() throws IOException {
buildRule.executeTarget("testZipgroupfileset");
- ZipFile zipFile = new ZipFile(new File(buildRule.getProject().getProperty("output"), "zipgroupfileset.zip"));
+ ZipFile zipFile = new ZipFile(new File(buildRule.getProject().getProperty("output"),
+ "zipgroupfileset.zip"));
assertTrue(zipFile.getEntry("ant.xml") != null);
assertTrue(zipFile.getEntry("optional/jspc.xml") != null);
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
index 1d93b92..4ea079c 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
@@ -238,8 +238,8 @@ public class DefaultCompilerAdapterTest {
try {
final File src = new File(workDir, "src");
src.mkdir();
- final File java1 = createFile(src,"org/apache/ant/tests/J1.java");
- final File java2 = createFile(src,"org/apache/ant/tests/J2.java");
+ final File java1 = createFile(src, "org/apache/ant/tests/J1.java");
+ final File java2 = createFile(src, "org/apache/ant/tests/J2.java");
final File modules = new File(workDir, "modules");
modules.mkdir();
final Project prj = new Project();
@@ -277,8 +277,7 @@ public class DefaultCompilerAdapterTest {
//J1.java & J2.java has to be in files list
final Set<String> expected = new TreeSet<String>();
Collections.addAll(expected, java1.getAbsolutePath(), java2.getAbsolutePath());
- final Set<String> actual = new TreeSet<String>();
- actual.addAll(cmdLine.subList(cmdLine.size() - 2, cmdLine.size()));
+ final Set<String> actual = new TreeSet<String>(cmdLine.subList(cmdLine.size() - 2, cmdLine.size()));
assertEquals(expected, actual);
} finally {
delete(workDir);
@@ -291,9 +290,9 @@ public class DefaultCompilerAdapterTest {
try {
final File src = new File(workDir, "src");
src.mkdir();
- final File java1 = createFile(src,"main/m1/lin64/classes/org/apache/ant/tests/J1.java");
- final File java2 = createFile(src,"main/m2/lin32/classes/org/apache/ant/tests/J2.java");
- final File java3 = createFile(src,"main/m3/sol/classes/org/apache/ant/tests/J3.java");
+ final File java1 = createFile(src, "main/m1/lin64/classes/org/apache/ant/tests/J1.java");
+ final File java2 = createFile(src, "main/m2/lin32/classes/org/apache/ant/tests/J2.java");
+ final File java3 = createFile(src, "main/m3/sol/classes/org/apache/ant/tests/J3.java");
final File modules = new File(workDir, "modules");
modules.mkdir();
final File build = new File(workDir, "build");
@@ -343,8 +342,7 @@ public class DefaultCompilerAdapterTest {
java1.getAbsolutePath(),
java2.getAbsolutePath(),
java3.getAbsolutePath());
- final Set<String> actualFiles = new TreeSet<String>();
- actualFiles.addAll(cmdLine.subList(cmdLine.size() - 3, cmdLine.size()));
+ final Set<String> actualFiles = new TreeSet<String>(cmdLine.subList(cmdLine.size() - 3, cmdLine.size()));
assertEquals(expectedFiles, actualFiles);
} finally {
delete(workDir);
@@ -357,10 +355,10 @@ public class DefaultCompilerAdapterTest {
try {
final File src = new File(workDir, "src");
src.mkdir();
- final File java1 = createFile(src,"main/m1/lin/classes/org/apache/ant/tests/J1.java");
- final File java2 = createFile(src,"main/m3/sol/classes/org/apache/ant/tests/J2.java");
+ final File java1 = createFile(src, "main/m1/lin/classes/org/apache/ant/tests/J1.java");
+ final File java2 = createFile(src, "main/m3/sol/classes/org/apache/ant/tests/J2.java");
@SuppressWarnings("unused")
- final File java3 = createFile(src,"main/m3/sol/classes/org/apache/ant/invisible/J3.java");
+ final File java3 = createFile(src, "main/m3/sol/classes/org/apache/ant/invisible/J3.java");
final File build = new File(workDir, "build");
build.mkdirs();
final Project prj = new Project();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriterTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriterTest.java
index ba464a9..19b37a4 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriterTest.java
@@ -45,7 +45,7 @@ public class ChangeLogWriterTest {
CVSEntry entry = new CVSEntry(new Date(), "Se\u00f1orita", "2003 < 2004 && 3 > 5");
entry.addFile("Medicare & review.doc", "1.1");
entry.addFile("El\u00e8ments de style", "1.2");
- CVSEntry[] entries = { entry };
+ CVSEntry[] entries = {entry};
ByteArrayOutputStream output = new ByteArrayOutputStream();
PrintWriter pwriter = new PrintWriter(new OutputStreamWriter(output, "UTF-8"));
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/dir2/A.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/dir2/A.java b/src/tests/junit/org/apache/tools/ant/taskdefs/dir2/A.java
index 437e0bc..82b2048 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/dir2/A.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/dir2/A.java
@@ -19,7 +19,7 @@
package org.apache.tools.ant.taskdefs.dir2;
public class A {
- public static void main(String [] args) {
+ public static void main(String[] args) {
System.out.println("MAIN");
System.out.println(a);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
index 127de51..f57e418 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
*/
public class ANTLRTest {
- private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/antlr/";
+ private static final String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/antlr/";
@Rule
public BuildFileRule buildRule = new BuildFileRule();
@@ -207,10 +207,10 @@ public class ANTLRTest {
}
-}
-
-class HTMLFilter implements FilenameFilter {
- public boolean accept(File dir, String name) {
- return name.endsWith("html");
+ class HTMLFilter implements FilenameFilter {
+ public boolean accept(File dir, String name) {
+ return name.endsWith("html");
+ }
}
+
}