You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/04/26 14:09:33 UTC
ant git commit: More uses for streams
Repository: ant
Updated Branches:
refs/heads/master 97ac63abc -> 3f74fc257
More uses for streams
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3f74fc25
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3f74fc25
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3f74fc25
Branch: refs/heads/master
Commit: 3f74fc257af92492f6dfefa3e1ef9fd165ae81ec
Parents: 97ac63a
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Thu Apr 26 16:09:58 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Thu Apr 26 16:09:58 2018 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/IntrospectionHelperTest.java | 14 ++++++--------
.../tools/ant/taskdefs/ExecuteWatchdogTest.java | 8 ++------
.../junit/org/apache/tools/ant/taskdefs/JarTest.java | 12 +++---------
.../apache/tools/ant/taskdefs/XmlPropertyTest.java | 12 +++---------
4 files changed, 14 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/3f74fc25/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 dc2bfab..8f746aa 100644
--- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -267,13 +267,12 @@ public class IntrospectionHelperTest {
public void testGetNestedElementMap() {
Map<String, Class<?>> elemMap = getExpectedNestedElements();
Map<String, Class<?>> actualMap = ih.getNestedElementMap();
- for (Map.Entry<String, Class<?>> entry : actualMap.entrySet()) {
- String elemName = entry.getKey();
+ actualMap.forEach((elemName, value) -> {
Class<?> elemClass = elemMap.get(elemName);
assertNotNull("Support for " + elemName + " in IntrospectionHelperTest?", elemClass);
- assertEquals("Type of " + elemName, elemClass, entry.getValue());
+ assertEquals("Type of " + elemName, elemClass, value);
elemMap.remove(elemName);
- }
+ });
assertTrue("Found all", elemMap.isEmpty());
// Check it's a read-only map.
@@ -607,13 +606,12 @@ public class IntrospectionHelperTest {
public void testGetAttributeMap() {
Map<String, Class<?>> attrMap = getExpectedAttributes();
Map<String, Class<?>> actualMap = ih.getAttributeMap();
- for (Map.Entry<String, Class<?>> entry : actualMap.entrySet()) {
- String attrName = entry.getKey();
+ actualMap.forEach((attrName, value) -> {
Class<?> attrClass = attrMap.get(attrName);
assertNotNull("Support for " + attrName + " in IntrospectionHelperTest?", attrClass);
- assertEquals("Type of " + attrName, attrClass, entry.getValue());
+ assertEquals("Type of " + attrName, attrClass, value);
attrMap.remove(attrName);
- }
+ });
attrMap.remove("name");
assertTrue("Found all", attrMap.isEmpty());
http://git-wip-us.apache.org/repos/asf/ant/blob/3f74fc25/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 25c5231..4d91271 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs;
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.util.stream.Collectors;
import org.apache.tools.ant.util.JavaEnvUtils;
import org.junit.Before;
@@ -75,12 +76,7 @@ public class ExecuteWatchdogTest {
private String getErrorOutput(Process p) throws Exception {
BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream()));
- StringBuilder buf = new StringBuilder();
- String line;
- while ((line = err.readLine()) != null) {
- buf.append(line);
- }
- return buf.toString();
+ return err.lines().collect(Collectors.joining());
}
private int waitForEnd(Process p) throws Exception {
http://git-wip-us.apache.org/repos/asf/ant/blob/3f74fc25/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 53f63dd..a3f8520 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
@@ -24,6 +24,7 @@ import java.io.FileReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -239,15 +240,8 @@ public class JarTest {
public void testNoDuplicateIndex() throws IOException {
buildRule.executeTarget("testIndexTests");
try (ZipFile archive = new ZipFile(new File(getOutputDir(), tempJar))) {
- Enumeration<? extends ZipEntry> e = archive.entries();
- int numberOfIndexLists = 0;
- while (e.hasMoreElements()) {
- ZipEntry ze = e.nextElement();
- if (ze.getName().equals("META-INF/INDEX.LIST")) {
- numberOfIndexLists++;
- }
- }
- assertEquals(1, numberOfIndexLists);
+ assertEquals(1, (int) Collections.list(archive.entries()).stream()
+ .filter(ze -> ze.getName().equals("META-INF/INDEX.LIST")).count());
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/3f74fc25/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 391c45c..25e83ac 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
@@ -24,7 +24,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Map;
import java.util.List;
import java.util.Properties;
@@ -159,7 +158,6 @@ public class XmlPropertyTest {
workingDir = FILE_UTILS.resolveFile(new File("."), ".");
}
-
File propertyFile = getGoldfile(inputFile, keepRoot, collapse,
semantic, include, localRoot);
if (!propertyFile.exists()) {
@@ -269,13 +267,9 @@ public class XmlPropertyTest {
*/
private static void ensureReferences(String msg, File inputFile,
Hashtable<String, Object> references) {
- for (Map.Entry<String, Object> entry : references.entrySet()) {
- String currentKey = entry.getKey();
- Object currentValue = entry.getValue();
- assertTrue(msg + "-" + inputFile.getName() + " Key=" + currentKey
- + " is not a recognized type.", currentValue instanceof Path
- || currentValue instanceof String || currentKey.startsWith("ant."));
- }
+ references.forEach((key, value) -> assertTrue(msg + "-" + inputFile.getName()
+ + " Key=" + key + " is not a recognized type.",
+ value instanceof Path || value instanceof String || key.startsWith("ant.")));
}
/**