changeset 19490:f6eae37b568d

8022622: javac, two tests are failing with compile time error after class Collector was modified Reviewed-by: mcimadamore
author vromero
date Sat, 10 Aug 2013 16:26:50 +0100
parents 387a4dd51adf
children 887e13b16ccf
files langtools/test/tools/javac/lambda/TargetType59.java langtools/test/tools/javac/lambda/TargetType62.java
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/test/tools/javac/lambda/TargetType59.java	Sat Aug 10 13:27:38 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType59.java	Sat Aug 10 16:26:50 2013 +0100
@@ -34,15 +34,15 @@
 
 class TargetType59 {
 
-    <T, R> Collector<T, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) {
+    <T, R> Collector<T, String, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) {
         return null;
     }
 
-    <T, C extends Collection<T>> Collector<T,C> test1(Supplier<C> collectionFactory) {
+    <T, C extends Collection<T>> Collector<T, String, C> test1(Supplier<C> collectionFactory) {
         return m(collectionFactory, Collection::add);
     }
 
-    Collector<String, StringBuilder> test2(Supplier<StringBuilder> sb) {
+    Collector<String, String, StringBuilder> test2(Supplier<StringBuilder> sb) {
         return m(sb, StringBuilder::append);
     }
 }
--- a/langtools/test/tools/javac/lambda/TargetType62.java	Sat Aug 10 13:27:38 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType62.java	Sat Aug 10 16:26:50 2013 +0100
@@ -38,8 +38,8 @@
         return g(classifier, TreeMap::new, m(HashSet::new));
     }
 
-    <R> Collector<Integer, R> m(Supplier<R> s) { return null; }
+    <R> Collector<Integer, String, R> m(Supplier<R> s) { return null; }
 
     <T, K, D, M extends Map<K, D>>
-            Collector<T, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, D> downstream) { return null; }
+            Collector<T, String, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, String, D> downstream) { return null; }
 }