Mercurial > hg > openjdk > lambda > jdk

changeset 7543:dbb23cb1711d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix test breakages
author mduigou
date Wed, 27 Feb 2013 16:47:51 -0800
parents b3e0b5001b69
children 575749b77035
files test/java/util/Collection/MOAT.java test/java/util/function/FunctionsTest.java test/java/util/function/PredicatesTest.java test/java/util/stream/Stream/EmployeeStreamTest.java test/java/util/stream/Stream/IntegerStreamTest.java test/java/util/stream/Stream/StringBuilderStreamTest.java
diffstat 6 files changed, 32 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/util/Collection/MOAT.java	Tue Feb 26 16:42:33 2013 -0800
+++ b/test/java/util/Collection/MOAT.java	Wed Feb 27 16:47:51 2013 -0800
@@ -50,6 +50,18 @@
  * simultaneously test all other implementations.
  */
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.NotSerializableException;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+
 import static java.util.Collections.EMPTY_LIST;
 import static java.util.Collections.EMPTY_MAP;
 import static java.util.Collections.EMPTY_SET;
--- a/test/java/util/function/FunctionsTest.java	Tue Feb 26 16:42:33 2013 -0800
+++ b/test/java/util/function/FunctionsTest.java	Wed Feb 27 16:47:51 2013 -0800
@@ -62,9 +62,9 @@
 
     @Test
     public void testToString() {
-        assertEquals("null", Functions.string().apply(null));
-        assertEquals("1", Functions.string().apply(1));
-        assertEquals("surprise!", Functions.string().apply(new Object() {
+        assertEquals("null", ((Function<Object,String>)String::valueOf).apply(null));
+        assertEquals("1", ((Function<Object,String>)String::valueOf).apply(1));
+        assertEquals("surprise!", ((Function<Object,String>)String::valueOf).apply(new Object() {
             public String toString() {return "surprise!";}
         }));
     }
@@ -96,7 +96,7 @@
 
     @Test
     public void testForPredicate() {
-        Function<Integer, String> mapper = Functions.<String, Integer>forPredicate(x -> x != 0, "true", "false");
+        Function<Integer, String> mapper = Functions.<Integer, String>forPredicate(x -> x != 0, "true", "false");
 
         assertEquals("false", mapper.apply(0));
         assertEquals("true", mapper.apply(1));
@@ -121,7 +121,7 @@
         truths.put(0, "sky");
         truths.put(1, "ice");
 
-        Function<Integer, String> mapper = Functions.<String, Integer>forMap(truths, "fire");
+        Function<Integer, String> mapper = Functions.<Integer, String>forMap(truths, "fire");
 
         assertEquals("sky", mapper.apply(0));
         assertEquals("ice", mapper.apply(1));
@@ -131,8 +131,8 @@
 
     @Test
     public void testChain() {
-        Function<Integer, Boolean> first = Functions.<Boolean, Integer>forPredicate(x -> x != 0, true, false);
-        Function<Boolean, String> second = Functions.<String, Boolean>forPredicate(x -> !x, "false", "true");
+        Function<Integer, Boolean> first = Functions.<Integer, Boolean>forPredicate(x -> x != 0, true, false);
+        Function<Boolean, String> second = Functions.<Boolean, String>forPredicate(x -> !x, "false", "true");
         Function<Integer, String> mapper = Functions.chain(first, second);
         Function<Integer, Integer> f1 = x -> x * 2;
         Function<Integer, Integer> f2 = x -> x * 3;
--- a/test/java/util/function/PredicatesTest.java	Tue Feb 26 16:42:33 2013 -0800
+++ b/test/java/util/function/PredicatesTest.java	Wed Feb 27 16:47:51 2013 -0800
@@ -52,12 +52,12 @@
     private static final Function<Integer, Integer> f2 = x -> x * 3;
 
     private void runNullTest(Object o, boolean expected) {
-        assertEquals(Predicates.isNull().test(o), expected);
-        assertEquals(Predicates.nonNull().test(o), !expected);
-        assertEquals(Predicates.isNull().negate().test(o), !expected);
-        assertEquals(Predicates.nonNull().negate().test(o), expected);
-        assertEquals(Predicates.alwaysFalse().test(o), false);
-        assertEquals(Predicates.alwaysTrue().test(o), true);
+        assertEquals(Objects::isNull.test(o), expected);
+        assertEquals(Objects::isNonNull.test(o), !expected);
+        assertEquals(Objects::isNull.negate().test(o), !expected);
+        assertEquals(Objects::isNonNull.negate().test(o), expected);
+        assertEquals(( t -> false ).test(o), false);
+        assertEquals(( t -> true ).test(o), true);
      }
 
     @Test
@@ -137,22 +137,6 @@
     }
 
     @Test
-    public void testAlwaysFalse() {
-        assertTrue(!Predicates.alwaysFalse().test(null));
-        assertTrue(!Predicates.alwaysFalse().test(1));
-        assertTrue(!Predicates.alwaysFalse().test("true"));
-        assertTrue(!Predicates.alwaysFalse().test(PredicatesTest.class));
-    }
-
-    @Test
-    public void testAlwaysTrue() {
-        assertTrue(Predicates.alwaysTrue().test(null));
-        assertTrue(Predicates.alwaysTrue().test(1));
-        assertTrue(Predicates.alwaysTrue().test("true"));
-        assertTrue(Predicates.alwaysTrue().test(PredicatesTest.class));
-    }
-
-    @Test
     public void testNegate() {
         Predicate<Integer> predicate = x->x != 0;
 
--- a/test/java/util/stream/Stream/EmployeeStreamTest.java	Tue Feb 26 16:42:33 2013 -0800
+++ b/test/java/util/stream/Stream/EmployeeStreamTest.java	Wed Feb 27 16:47:51 2013 -0800
@@ -355,7 +355,7 @@
             stream = (type == ParallelType.Parallel) ? l.parallelStream() : ((type == ParallelType.Sequential) ? l
                     .stream().sequential() : l.stream());
             result1.clear();
-            result1 = stream.filter(p1).filter(Predicates.alwaysTrue()).collect(Collectors.toCollection(LinkedList<Employee>::new));
+            result1 = stream.filter(p1).filter(e -> true).collect(Collectors.toCollection(LinkedList<Employee>::new));
             assertTrue(verifyMatch(result1, limit1, isUP1, true, rule));
 
             // filter with Predicates.alwaysFlase() will get nothing
@@ -363,7 +363,7 @@
                     .stream().sequential() : l.stream());
             result1.clear();
 
-            result1 = stream.filter(p1).filter(Predicates.alwaysFalse()).collect(Collectors.toCollection(LinkedList<Employee>::new));
+            result1 = stream.filter(p1).filter(e -> false).collect(Collectors.toCollection(LinkedList<Employee>::new));
             assertTrue(result1.isEmpty());
 
             Employee limit2 = generateData();
--- a/test/java/util/stream/Stream/IntegerStreamTest.java	Tue Feb 26 16:42:33 2013 -0800
+++ b/test/java/util/stream/Stream/IntegerStreamTest.java	Wed Feb 27 16:47:51 2013 -0800
@@ -253,15 +253,15 @@
                     ((type == ParallelType.Sequential) ? l.stream().sequential() :
                     l.stream());
             result1.clear();
-            result1 = stream.filter(p1).filter(Predicates.alwaysTrue()).collect(Collectors.toCollection(LinkedList<Integer>::new));
+            result1 = stream.filter(p1).filter(e -> true).collect(Collectors.toCollection(LinkedList<Integer>::new));
             assertTrue(verifyMatch(result1, limit1, isUP1, true));
 
-            //filter with Predicates.alwaysFlase() will get nothing
+            //filter with false will get nothing
             stream = (type == ParallelType.Parallel) ? l.parallelStream():
                     ((type == ParallelType.Sequential) ? l.stream().sequential() :
                     l.stream());
             result1.clear();
-            result1 = stream.filter(p1).filter(Predicates.alwaysFalse()).collect(Collectors.toCollection(LinkedList<Integer>::new));
+            result1 = stream.filter(p1).filter(e -> false).collect(Collectors.toCollection(LinkedList<Integer>::new));
             assertTrue(result1.size() == 0);
 
             int limit2 = rand.nextInt(2 * (END - START)) + 2 * START;
--- a/test/java/util/stream/Stream/StringBuilderStreamTest.java	Tue Feb 26 16:42:33 2013 -0800
+++ b/test/java/util/stream/Stream/StringBuilderStreamTest.java	Wed Feb 27 16:47:51 2013 -0800
@@ -297,7 +297,7 @@
                     ((type == ParallelType.Sequential) ? l.stream().sequential() :
                     l.stream());
             result1.clear();
-            result1 = stream.filter(p1).filter(Predicates.alwaysTrue()).collect(Collectors.toCollection(LinkedList<StringBuilder>::new));
+            result1 = stream.filter(p1).filter(e -> true).collect(Collectors.toCollection(LinkedList<StringBuilder>::new));
             assertTrue(verifyMatch(result1, charType, isFirst, true));
 
             //filter with Predicates.alwaysFlase() will get nothing
@@ -305,7 +305,7 @@
                     ((type == ParallelType.Sequential) ? l.stream().sequential() :
                     l.stream());
             result1.clear();
-            result1 = stream.filter(p1).filter(Predicates.alwaysFalse()).collect(Collectors.toCollection(LinkedList<StringBuilder>::new));
+            result1 = stream.filter(p1).filter(e -> false).collect(Collectors.toCollection(LinkedList<StringBuilder>::new));
             assertEquals(result1.size(), 0);
 
             EnumSet<LambdaUtilities.CharType> set2 = EnumSet.allOf(LambdaUtilities.CharType.class);