8022622: javac, two tests are failing with compile time error after class Collector was modified

Sat, 10 Aug 2013 16:26:50 +0100

author
vromero
date
Sat, 10 Aug 2013 16:26:50 +0100
changeset 1943
8f282dc58dfc
parent 1942
0d9bc764cac7
child 1944
aa6c6f8b5622

8022622: javac, two tests are failing with compile time error after class Collector was modified
Reviewed-by: mcimadamore

test/tools/javac/lambda/TargetType59.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType62.java file | annotate | diff | comparison | revisions
     1.1 --- a/test/tools/javac/lambda/TargetType59.java	Sat Aug 10 13:27:38 2013 +0100
     1.2 +++ b/test/tools/javac/lambda/TargetType59.java	Sat Aug 10 16:26:50 2013 +0100
     1.3 @@ -34,15 +34,15 @@
     1.4  
     1.5  class TargetType59 {
     1.6  
     1.7 -    <T, R> Collector<T, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) {
     1.8 +    <T, R> Collector<T, String, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) {
     1.9          return null;
    1.10      }
    1.11  
    1.12 -    <T, C extends Collection<T>> Collector<T,C> test1(Supplier<C> collectionFactory) {
    1.13 +    <T, C extends Collection<T>> Collector<T, String, C> test1(Supplier<C> collectionFactory) {
    1.14          return m(collectionFactory, Collection::add);
    1.15      }
    1.16  
    1.17 -    Collector<String, StringBuilder> test2(Supplier<StringBuilder> sb) {
    1.18 +    Collector<String, String, StringBuilder> test2(Supplier<StringBuilder> sb) {
    1.19          return m(sb, StringBuilder::append);
    1.20      }
    1.21  }
     2.1 --- a/test/tools/javac/lambda/TargetType62.java	Sat Aug 10 13:27:38 2013 +0100
     2.2 +++ b/test/tools/javac/lambda/TargetType62.java	Sat Aug 10 16:26:50 2013 +0100
     2.3 @@ -38,8 +38,8 @@
     2.4          return g(classifier, TreeMap::new, m(HashSet::new));
     2.5      }
     2.6  
     2.7 -    <R> Collector<Integer, R> m(Supplier<R> s) { return null; }
     2.8 +    <R> Collector<Integer, String, R> m(Supplier<R> s) { return null; }
     2.9  
    2.10      <T, K, D, M extends Map<K, D>>
    2.11 -            Collector<T, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, D> downstream) { return null; }
    2.12 +            Collector<T, String, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, String, D> downstream) { return null; }
    2.13  }

mercurial