Use streams Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/43e6fdc7 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/43e6fdc7 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/43e6fdc7
Branch: refs/heads/master Commit: 43e6fdc7b2dbfc1a5f59b50d18fbb170e8bd5de9 Parents: cc88acc Author: Gintas Grigelionis <gin...@apache.org> Authored: Tue Apr 24 07:06:08 2018 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Tue Apr 24 07:08:44 2018 +0200 ---------------------------------------------------------------------- .../org/apache/tools/ant/DirectoryScannerTest.java | 16 ++++++++-------- .../junit/org/apache/tools/ant/FileUtilities.java | 5 ++--- .../tools/ant/taskdefs/DefaultExcludesTest.java | 14 ++++---------- .../compilers/DefaultCompilerAdapterTest.java | 13 +++++-------- .../ant/taskdefs/optional/junit/JUnitTaskTest.java | 6 ++---- .../tools/ant/taskdefs/optional/net/FTPTest.java | 16 +++++----------- .../tools/ant/types/EnumeratedAttributeTest.java | 7 +++---- .../tools/ant/types/mappers/MapperResult.java | 2 +- 8 files changed, 30 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/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 773d33a..c29590a 100644 --- a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java @@ -34,6 +34,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Collectors; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.selectors.TokenizedPath; @@ -486,14 +487,13 @@ public class DirectoryScannerTest { assertEquals("directories present: ", expectedDirectories.length, includedDirectories.length); - TreeSet<String> files = new TreeSet<>(); - for (String includedFile : includedFiles) { - files.add(includedFile.replace(File.separatorChar, '/')); - } - TreeSet<String> directories = new TreeSet<>(); - for (String includedDirectory : includedDirectories) { - directories.add(includedDirectory.replace(File.separatorChar, '/')); - } + TreeSet<String> files = Arrays.stream(includedFiles) + .map(includedFile -> includedFile.replace(File.separatorChar, '/')) + .collect(Collectors.toCollection(TreeSet::new)); + + TreeSet<String> directories = Arrays.stream(includedDirectories) + .map(includedDirectory -> includedDirectory.replace(File.separatorChar, '/')) + .collect(Collectors.toCollection(TreeSet::new)); String currentfile; Iterator<String> i = files.iterator(); http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/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 0b7e0ce..3f0eff2 100644 --- a/src/tests/junit/org/apache/tools/ant/FileUtilities.java +++ b/src/tests/junit/org/apache/tools/ant/FileUtilities.java @@ -23,6 +23,7 @@ import org.apache.tools.ant.util.FileUtils; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.util.Arrays; import static org.junit.Assume.assumeTrue; @@ -71,9 +72,7 @@ public class FileUtilities { if (children == null) { return; } - for (File child : children) { - rollbackTimestamps(child, seconds); - } + Arrays.stream(children).forEach(child -> rollbackTimestamps(child, seconds)); } } http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java index c1392d2..36a04b5 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java @@ -25,6 +25,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import java.util.Arrays; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -158,16 +160,8 @@ public class DefaultExcludesTest { // check that both arrays have the same size assertEquals(message + " : string array length match", expected.length, actual.length); for (String element : expected) { - boolean found = false; - for (String member : actual) { - found |= element.equals(member); - if (found) { - break; - } - } - assertTrue(message + " : didn't find element " - + element + " in array match", found); + assertTrue(message + " : didn't find element " + element + " in array match", + Arrays.stream(actual).anyMatch(member -> member.equals(element))); } - } } http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/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 139a53c..b5a051e 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 @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Collectors; + import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.types.Commandline; @@ -397,11 +399,8 @@ public class DefaultCompilerAdapterTest { Collections.addAll(expectedFiles, java1.getAbsolutePath(), java2.getAbsolutePath()); - final Set<String> actualFiles = new TreeSet<>(); - for (File compileFile : compileList) { - actualFiles.add(compileFile.getAbsolutePath()); - } - assertEquals(expectedFiles, actualFiles); + assertEquals(expectedFiles, Arrays.stream(compileList) + .map(File::getAbsolutePath).collect(Collectors.toCollection(TreeSet::new))); } finally { delete(workDir); } @@ -525,9 +524,7 @@ public class DefaultCompilerAdapterTest { if (f.isDirectory()) { final File[] clds = f.listFiles(); if (clds != null) { - for (File cld : clds) { - delete(cld); - } + Arrays.stream(clds).forEach(this::delete); } } f.delete(); http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java index 1f2c0d7..c9aed1a 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java @@ -593,7 +593,7 @@ public class JUnitTaskTest { } @Test - public void testCheckNonDuplicateAntJar() throws Exception { + public void testCheckNonDuplicateAntJar() { setupCheckDuplicateTest(); buildRule.getProject().setProperty("includeantruntime", "no"); buildRule.executeTarget("testCheckForkedPath"); @@ -605,9 +605,7 @@ public class JUnitTaskTest { if (f.isDirectory()) { final File[] clds = f.listFiles(); if (clds != null) { - for (File cld : clds) { - delete(cld); - } + Arrays.stream(clds).forEach(this::delete); } } f.delete(); http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java index 3e552f2..24cb97b 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java @@ -63,20 +63,18 @@ public class FTPTest { private String loginFailureMessage; - private String tmpDir = null; private String remoteTmpDir = null; - private String ftpFileSep = null; - private myFTP myFTPTask = new myFTP(); + private myFTP myFTPTask = new myFTP(); @Before public void setUp() { buildRule.configureProject("src/etc/testcases/taskdefs/optional/net/ftp.xml"); Project project = buildRule.getProject(); project.executeTarget("setup"); - tmpDir = project.getProperty("tmp.dir"); + String tmpDir = project.getProperty("tmp.dir"); ftp = new FTPClient(); - ftpFileSep = project.getProperty("ftp.filesep"); + String ftpFileSep = project.getProperty("ftp.filesep"); myFTPTask.setSeparator(ftpFileSep); myFTPTask.setProject(project); remoteTmpDir = myFTPTask.resolveFile(tmpDir); @@ -643,9 +641,7 @@ public class FTPTest { "custom config: server language code = de" }; LogCounter counter = new LogCounter(); - for (String message : messages) { - counter.addLogMessageToSearch(message); - } + Arrays.stream(messages).forEach(counter::addLogMessageToSearch); buildRule.getProject().addBuildListener(counter); buildRule.getProject().executeTarget(target); @@ -795,9 +791,7 @@ public class FTPTest { "Failed to issue Site Command: umask 222", }; LogCounter counter = new LogCounter(); - for (String message : messages) { - counter.addLogMessageToSearch(message); - } + Arrays.stream(messages).forEach(counter::addLogMessageToSearch); buildRule.getProject().addBuildListener(counter); buildRule.getProject().executeTarget(target); http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java b/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java index 86d40cb..cb0bebf 100644 --- a/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java @@ -21,6 +21,8 @@ package org.apache.tools.ant.types; import org.apache.tools.ant.BuildException; import org.junit.Test; +import java.util.Arrays; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -57,10 +59,7 @@ public class EnumeratedAttributeTest { @Test public void testExceptionsNormal() { - EnumeratedAttribute t1 = new TestNormal(); - for (String value : expected) { - t1.setValue(value); - } + Arrays.stream(expected).forEach(new TestNormal()::setValue); } /** http://git-wip-us.apache.org/repos/asf/ant/blob/43e6fdc7/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java b/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java index 1f85a88..cf69d51 100644 --- a/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java +++ b/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java @@ -83,7 +83,7 @@ public class MapperResult extends Task { if (result == null) { flattened = NULL_MAPPER_RESULT; } else { - flattened = Arrays.asList(result).stream().collect(Collectors.joining("|")); + flattened = Arrays.stream(result).collect(Collectors.joining("|")); } if (!flattened.equals(output)) { throw new BuildException(failMessage + " got " + flattened + " expected " + output);
