Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/test/tools/javac/defaultMethodExecution/DefaultMethodRegressionTests.java	Tue Nov 20 09:58:55 2012 -0800
     1.3 @@ -0,0 +1,137 @@
     1.4 +/*
     1.5 + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
     1.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.7 + *
     1.8 + * This code is free software; you can redistribute it and/or modify it
     1.9 + * under the terms of the GNU General Public License version 2 only, as
    1.10 + * published by the Free Software Foundation.  Oracle designates this
    1.11 + * particular file as subject to the "Classpath" exception as provided
    1.12 + * by Oracle in the LICENSE file that accompanied this code.
    1.13 + *
    1.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    1.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.17 + * version 2 for more details (a copy is included in the LICENSE file that
    1.18 + * accompanied this code).
    1.19 + *
    1.20 + * You should have received a copy of the GNU General Public License version
    1.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    1.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.23 + *
    1.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.25 + * or visit www.oracle.com if you need additional information or have any
    1.26 + * questions.
    1.27 + */
    1.28 +
    1.29 +/**
    1.30 + * @test
    1.31 + * @bug 8003639
    1.32 + * @summary convert lambda testng tests to jtreg and add them
    1.33 + * @run testng DefaultMethodRegressionTests
    1.34 + */
    1.35 +
    1.36 +import java.util.ArrayList;
    1.37 +import java.util.Arrays;
    1.38 +import java.util.List;
    1.39 +import org.testng.annotations.Test;
    1.40 +
    1.41 +import static org.testng.Assert.*;
    1.42 +
    1.43 +/**
    1.44 + * This set of classes/interfaces (K/I/C) is specially designed to expose a
    1.45 + * bug in the JVM where it did not find some overloaded methods in some
    1.46 + * specific situations. (fixed by hotspot changeset ffb9316fd9ed)
    1.47 + */
    1.48 +interface K {
    1.49 +    int bbb(Long l);
    1.50 +}
    1.51 +
    1.52 +interface I extends K {
    1.53 +    default void aaa() {}
    1.54 +    default void aab() {}
    1.55 +    default void aac() {}
    1.56 +
    1.57 +    default int bbb(Integer i) { return 22; }
    1.58 +    default int bbb(Float f) { return 33; }
    1.59 +    default int bbb(Long l) { return 44; }
    1.60 +    default int bbb(Double d) { return 55; }
    1.61 +    default int bbb(String s) { return 66; }
    1.62 +
    1.63 +    default void caa() {}
    1.64 +    default void cab() {}
    1.65 +    default void cac() {}
    1.66 +}
    1.67 +
    1.68 +class C implements I {}
    1.69 +
    1.70 +public class DefaultMethodRegressionTests {
    1.71 +
    1.72 +    @Test(groups = "vm")
    1.73 +    public void testLostOverloadedMethod() {
    1.74 +        C c = new C();
    1.75 +        assertEquals(c.bbb(new Integer(1)), 22);
    1.76 +        assertEquals(c.bbb(new Float(1.1)), 33);
    1.77 +        assertEquals(c.bbb(new Long(1L)), 44);
    1.78 +        assertEquals(c.bbb(new Double(0.01)), 55);
    1.79 +        assertEquals(c.bbb(new String("")), 66);
    1.80 +    }
    1.81 +
    1.82 +    // Test to ensure that the inference verifier accepts older classfiles
    1.83 +    // with classes that implement interfaces with defaults.
    1.84 +    @Test(groups = "vm")
    1.85 +    public void testInferenceVerifier() {
    1.86 +        // interface I { int m() default { return 99; } }
    1.87 +        byte I_bytes[] = {
    1.88 +            (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x33,
    1.89 +            0x00, 0x08, 0x07, 0x00, 0x06, 0x07, 0x00, 0x07,
    1.90 +            0x01, 0x00, 0x03, 0x66, 0x6f, 0x6f, 0x01, 0x00,
    1.91 +            0x03, 0x28, 0x29, 0x49, 0x01, 0x00, 0x04, 0x43,
    1.92 +            0x6f, 0x64, 0x65, 0x01, 0x00, 0x01, 0x49, 0x01,
    1.93 +            0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
    1.94 +            0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
    1.95 +            0x63, 0x74, 0x06, 0x00, 0x00, 0x01, 0x00, 0x02,
    1.96 +            0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01,
    1.97 +            0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05,
    1.98 +            0x00, 0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x01,
    1.99 +            0x00, 0x00, 0x00, 0x03, 0x10, 0x63, (byte)0xac, 0x00,
   1.100 +            0x00, 0x00, 0x00, 0x00, 0x00
   1.101 +        };
   1.102 +        // public class C implements I {}  /* -target 1.5 */
   1.103 +        byte C_bytes[] = {
   1.104 +            (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x31,
   1.105 +            0x00, 0x0c, 0x0a, 0x00, 0x03, 0x00, 0x08, 0x07,
   1.106 +            0x00, 0x09, 0x07, 0x00, 0x0a, 0x07, 0x00, 0x0b,
   1.107 +            0x01, 0x00, 0x06, 0x3c, 0x69, 0x6e, 0x69, 0x74,
   1.108 +            0x3e, 0x01, 0x00, 0x03, 0x28, 0x29, 0x56, 0x01,
   1.109 +            0x00, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x0c, 0x00,
   1.110 +            0x05, 0x00, 0x06, 0x01, 0x00, 0x01, 0x43, 0x01,
   1.111 +            0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
   1.112 +            0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
   1.113 +            0x63, 0x74, 0x01, 0x00, 0x01, 0x49, 0x00, 0x21,
   1.114 +            0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04,
   1.115 +            0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05,
   1.116 +            0x00, 0x06, 0x00, 0x01, 0x00, 0x07, 0x00, 0x00,
   1.117 +            0x00, 0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
   1.118 +            0x00, 0x05, 0x2a, (byte)0xb7, 0x00, 0x01, (byte)0xb1, 0x00,
   1.119 +            0x00, 0x00, 0x00, 0x00, 0x00
   1.120 +        };
   1.121 +
   1.122 +        ClassLoader cl = new ClassLoader() {
   1.123 +            protected Class<?> findClass(String name) {
   1.124 +                if (name.equals("I")) {
   1.125 +                    return defineClass("I", I_bytes, 0, I_bytes.length);
   1.126 +                } else if (name.equals("C")) {
   1.127 +                    return defineClass("C", C_bytes, 0, C_bytes.length);
   1.128 +                } else {
   1.129 +                    return null;
   1.130 +                }
   1.131 +            }
   1.132 +        };
   1.133 +        try {
   1.134 +            Class.forName("C", true, cl);
   1.135 +        } catch (Exception e) {
   1.136 +            // unmodified verifier will throw VerifyError
   1.137 +            fail("No exception should be thrown");
   1.138 +        }
   1.139 +    }
   1.140 +}

     2.1 --- a/test/tools/javac/defaultMethods/fd/FDTest.java	Tue Nov 20 15:43:28 2012 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,147 +0,0 @@
     2.4 -/*
     2.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 - *
     2.8 - * This code is free software; you can redistribute it and/or modify it
     2.9 - * under the terms of the GNU General Public License version 2 only, as
    2.10 - * published by the Free Software Foundation.
    2.11 - *
    2.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 - * version 2 for more details (a copy is included in the LICENSE file that
    2.16 - * accompanied this code).
    2.17 - *
    2.18 - * You should have received a copy of the GNU General Public License version
    2.19 - * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 - *
    2.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 - * or visit www.oracle.com if you need additional information or have any
    2.24 - * questions.
    2.25 - */
    2.26 -
    2.27 -/*
    2.28 - * @test
    2.29 - * @summary Automatic test for checking correctness of default resolution
    2.30 - */
    2.31 -
    2.32 -import shapegen.*;
    2.33 -
    2.34 -import com.sun.source.util.JavacTask;
    2.35 -
    2.36 -import java.net.URI;
    2.37 -import java.util.Arrays;
    2.38 -import java.util.ArrayList;
    2.39 -import java.util.Collection;
    2.40 -import java.util.List;
    2.41 -
    2.42 -import javax.tools.Diagnostic;
    2.43 -import javax.tools.JavaCompiler;
    2.44 -import javax.tools.JavaFileObject;
    2.45 -import javax.tools.SimpleJavaFileObject;
    2.46 -import javax.tools.StandardJavaFileManager;
    2.47 -import javax.tools.ToolProvider;
    2.48 -
    2.49 -public class FDTest {
    2.50 -
    2.51 -    enum TestKind {
    2.52 -        POSITIVE,
    2.53 -        NEGATIVE;
    2.54 -
    2.55 -        Collection<Hierarchy> getHierarchy(HierarchyGenerator hg) {
    2.56 -            return this == POSITIVE ?
    2.57 -                    hg.getOK() : hg.getErr();
    2.58 -        }
    2.59 -    }
    2.60 -
    2.61 -    public static void main(String[] args) throws Exception {
    2.62 -        //create default shared JavaCompiler - reused across multiple compilations
    2.63 -        JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
    2.64 -        StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
    2.65 -
    2.66 -        HierarchyGenerator hg = new HierarchyGenerator();
    2.67 -        for (TestKind tk : TestKind.values()) {
    2.68 -            for (Hierarchy hs : tk.getHierarchy(hg)) {
    2.69 -                new FDTest(tk, hs).run(comp, fm);
    2.70 -            }
    2.71 -        }
    2.72 -    }
    2.73 -
    2.74 -    TestKind tk;
    2.75 -    Hierarchy hs;
    2.76 -    DefenderTestSource source;
    2.77 -    DiagnosticChecker diagChecker;
    2.78 -
    2.79 -    FDTest(TestKind tk, Hierarchy hs) {
    2.80 -        this.tk = tk;
    2.81 -        this.hs = hs;
    2.82 -        this.source = new DefenderTestSource();
    2.83 -        this.diagChecker = new DiagnosticChecker();
    2.84 -    }
    2.85 -
    2.86 -    void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
    2.87 -        JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
    2.88 -                null, null, Arrays.asList(source));
    2.89 -        try {
    2.90 -            ct.analyze();
    2.91 -        } catch (Throwable ex) {
    2.92 -            throw new AssertionError("Error thrown when analyzing the following source:\n" + source.getCharContent(true));
    2.93 -        }
    2.94 -        check();
    2.95 -    }
    2.96 -
    2.97 -    void check() {
    2.98 -        boolean errorExpected = tk == TestKind.NEGATIVE;
    2.99 -        if (errorExpected != diagChecker.errorFound) {
   2.100 -            throw new AssertionError("problem in source: \n" +
   2.101 -                    "\nerror found = " + diagChecker.errorFound +
   2.102 -                    "\nerror expected = " + errorExpected +
   2.103 -                    "\n" + dumpHierarchy() +
   2.104 -                    "\n" + source.getCharContent(true));
   2.105 -        }
   2.106 -    }
   2.107 -
   2.108 -    String dumpHierarchy() {
   2.109 -        StringBuilder buf = new StringBuilder();
   2.110 -        buf.append("root = " + hs.root + "\n");
   2.111 -        for (ClassCase cc : hs.all) {
   2.112 -            buf.append("  class name = " + cc.getName() + "\n");
   2.113 -            buf.append("    class OK = " + cc.get_OK() + "\n");
   2.114 -            buf.append("    prov = " + cc.get_mprov() + "\n");
   2.115 -
   2.116 -        }
   2.117 -        return buf.toString();
   2.118 -    }
   2.119 -
   2.120 -    class DefenderTestSource extends SimpleJavaFileObject {
   2.121 -
   2.122 -        String source;
   2.123 -
   2.124 -        public DefenderTestSource() {
   2.125 -            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
   2.126 -            StringBuilder buf = new StringBuilder();
   2.127 -            List<ClassCase> defaultRef = new ArrayList<>();
   2.128 -            for (ClassCase cc : hs.all) {
   2.129 -                hs.genClassDef(buf, cc, null, defaultRef);
   2.130 -            }
   2.131 -            source = buf.toString();
   2.132 -        }
   2.133 -
   2.134 -        @Override
   2.135 -        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
   2.136 -            return source;
   2.137 -        }
   2.138 -    }
   2.139 -
   2.140 -    static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
   2.141 -
   2.142 -        boolean errorFound;
   2.143 -
   2.144 -        public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
   2.145 -            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
   2.146 -                errorFound = true;
   2.147 -            }
   2.148 -        }
   2.149 -    }
   2.150 -}

     3.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/ClassCase.java	Tue Nov 20 15:43:28 2012 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,310 +0,0 @@
     3.4 -/*
     3.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 - *
     3.8 - * This code is free software; you can redistribute it and/or modify it
     3.9 - * under the terms of the GNU General Public License version 2 only, as
    3.10 - * published by the Free Software Foundation.  Oracle designates this
    3.11 - * particular file as subject to the "Classpath" exception as provided
    3.12 - * by Oracle in the LICENSE file that accompanied this code.
    3.13 - *
    3.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    3.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.17 - * version 2 for more details (a copy is included in the LICENSE file that
    3.18 - * accompanied this code).
    3.19 - *
    3.20 - * You should have received a copy of the GNU General Public License version
    3.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    3.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.23 - *
    3.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.25 - * or visit www.oracle.com if you need additional information or have any
    3.26 - * questions.
    3.27 - */
    3.28 -
    3.29 -package shapegen;
    3.30 -
    3.31 -import java.util.ArrayList;
    3.32 -import java.util.HashSet;
    3.33 -import java.util.List;
    3.34 -import java.util.Map;
    3.35 -import java.util.Set;
    3.36 -
    3.37 -/**
    3.38 - *
    3.39 - * @author Robert Field
    3.40 - */
    3.41 -public class ClassCase {
    3.42 -
    3.43 -    public enum Kind {
    3.44 -        IVAC        (true,  "v"),
    3.45 -        IPRESENT    (true,  "p"),
    3.46 -        IDEFAULT    (true,  "d"),
    3.47 -        CNONE       (false, "n"),
    3.48 -        CABSTRACT   (false, "a"),
    3.49 -        CCONCRETE   (false, "c");
    3.50 -
    3.51 -        private final String prefix;
    3.52 -        public final boolean isInterface;
    3.53 -
    3.54 -        Kind(boolean isInterface, String prefix) {
    3.55 -            this.isInterface = isInterface;
    3.56 -            this.prefix = prefix;
    3.57 -        }
    3.58 -    }
    3.59 -
    3.60 -    public final Kind kind;
    3.61 -    private final ClassCase superclass;
    3.62 -    private final List<ClassCase> supertypes;
    3.63 -
    3.64 -    private String name;
    3.65 -    private boolean _OK;
    3.66 -    private boolean _HasClassMethod;
    3.67 -    private Set<ClassCase> _mprov;
    3.68 -    private boolean _IsConcrete;
    3.69 -    private boolean _HasDefault;
    3.70 -    private ClassCase _mres;
    3.71 -    private ClassCase _mdefend;
    3.72 -
    3.73 -    private Set<RuleGroup> executed = new HashSet<RuleGroup>() {};
    3.74 -
    3.75 -    public ClassCase(Kind kind, ClassCase superclass, List<ClassCase> interfaces) {
    3.76 -        this.kind = kind;
    3.77 -        this.superclass = superclass;
    3.78 -
    3.79 -        // Set supertypes from superclass (if any) and interfaces
    3.80 -        List<ClassCase> lc;
    3.81 -        if (superclass == null) {
    3.82 -            lc = interfaces;
    3.83 -        } else {
    3.84 -            lc = new ArrayList<>();
    3.85 -            lc.add(superclass);
    3.86 -            lc.addAll(interfaces);
    3.87 -        }
    3.88 -        this.supertypes = lc;
    3.89 -    }
    3.90 -
    3.91 -    public final boolean isInterface() { return kind.isInterface; }
    3.92 -    public final boolean isClass() { return !kind.isInterface; }
    3.93 -
    3.94 -    public Set<ClassCase> get_mprov() {
    3.95 -        exec(RuleGroup.PROVENENCE);
    3.96 -        return _mprov;
    3.97 -    }
    3.98 -
    3.99 -    public void set_mprov(ClassCase cc) {
   3.100 -        Set<ClassCase> s = new HashSet<>();
   3.101 -        s.add(cc);
   3.102 -        _mprov = s;
   3.103 -    }
   3.104 -
   3.105 -    public void set_mprov(Set<ClassCase> s) {
   3.106 -        _mprov = s;
   3.107 -    }
   3.108 -
   3.109 -    public ClassCase get_mres() {
   3.110 -        exec(RuleGroup.RESOLUTION);
   3.111 -        return _mres;
   3.112 -    }
   3.113 -
   3.114 -    public void set_mres(ClassCase cc) {
   3.115 -        _mres = cc;
   3.116 -    }
   3.117 -
   3.118 -    public ClassCase get_mdefend() {
   3.119 -        exec(RuleGroup.DEFENDER);
   3.120 -        return _mdefend;
   3.121 -    }
   3.122 -
   3.123 -    public void set_mdefend(ClassCase cc) {
   3.124 -        _mdefend = cc;
   3.125 -    }
   3.126 -
   3.127 -    public boolean get_HasClassMethod() {
   3.128 -        exec(RuleGroup.PROVENENCE);
   3.129 -        return _HasClassMethod;
   3.130 -    }
   3.131 -
   3.132 -    public void set_HasClassMethod(boolean bool) {
   3.133 -        _HasClassMethod = bool;
   3.134 -    }
   3.135 -
   3.136 -    public boolean get_HasDefault() {
   3.137 -        exec(RuleGroup.MARKER);
   3.138 -        return _HasDefault;
   3.139 -    }
   3.140 -
   3.141 -    public void set_HasDefault(boolean bool) {
   3.142 -        _HasDefault = bool;
   3.143 -    }
   3.144 -
   3.145 -    public boolean get_IsConcrete() {
   3.146 -        exec(RuleGroup.MARKER);
   3.147 -        return _IsConcrete;
   3.148 -    }
   3.149 -
   3.150 -    public void set_IsConcrete(boolean bool) {
   3.151 -        _IsConcrete = bool;
   3.152 -    }
   3.153 -
   3.154 -    public boolean get_OK() {
   3.155 -        exec(RuleGroup.CHECKING);
   3.156 -        return _OK;
   3.157 -    }
   3.158 -
   3.159 -    public void set_OK(boolean bool) {
   3.160 -        _OK = bool;
   3.161 -    }
   3.162 -
   3.163 -    public boolean isMethodDefined() {
   3.164 -        for (ClassCase cc : supertypes) {
   3.165 -            if (cc.isMethodDefined()) {
   3.166 -                return true;
   3.167 -            }
   3.168 -        }
   3.169 -        switch (kind) {
   3.170 -            case CCONCRETE:
   3.171 -            case CABSTRACT:
   3.172 -            case IPRESENT:
   3.173 -            case IDEFAULT:
   3.174 -                return true;
   3.175 -            default:
   3.176 -                return false;
   3.177 -        }
   3.178 -    }
   3.179 -
   3.180 -    public boolean isAbstract() {
   3.181 -        return isMethodDefined() && (get_mres()==null);
   3.182 -    }
   3.183 -
   3.184 -    public boolean hasSuperclass() {
   3.185 -        return superclass != null;
   3.186 -    }
   3.187 -
   3.188 -    public ClassCase getSuperclass() {
   3.189 -        return superclass;
   3.190 -    }
   3.191 -
   3.192 -    public List<ClassCase> getSupertypes() {
   3.193 -        return supertypes;
   3.194 -    }
   3.195 -
   3.196 -    public List<ClassCase> getInterfaces() {
   3.197 -        if (superclass != null) {
   3.198 -            if (supertypes.get(0) != superclass) {
   3.199 -                throw new AssertionError("superclass missing from supertypes");
   3.200 -            }
   3.201 -            return supertypes.subList(1, supertypes.size());
   3.202 -        } else {
   3.203 -            return supertypes;
   3.204 -        }
   3.205 -    }
   3.206 -
   3.207 -    public boolean isSubtypeOf(ClassCase cc) {
   3.208 -        // S-Refl
   3.209 -        if (cc.equals(this)) {
   3.210 -            return true;
   3.211 -        }
   3.212 -
   3.213 -        // S-Def
   3.214 -        for (ClassCase sp : getSupertypes()) {
   3.215 -            if (cc.equals(sp)) {
   3.216 -                return true;
   3.217 -            }
   3.218 -        }
   3.219 -
   3.220 -        // _S-Trans
   3.221 -        for (ClassCase sp : getSupertypes()) {
   3.222 -            if (sp.isSubtypeOf(cc)) {
   3.223 -                return true;
   3.224 -            }
   3.225 -        }
   3.226 -
   3.227 -        return false;
   3.228 -    }
   3.229 -
   3.230 -    public void init(Map<String, Integer> namingContext) {
   3.231 -        if (name != null) {
   3.232 -            return; // Already inited
   3.233 -        }
   3.234 -
   3.235 -        for (ClassCase sup : supertypes) {
   3.236 -            sup.init(namingContext);
   3.237 -        }
   3.238 -
   3.239 -        // Build name
   3.240 -        StringBuilder sb = new StringBuilder();
   3.241 -        if (!supertypes.isEmpty()) {
   3.242 -            sb.append(isInterface() ? "I" : "C");
   3.243 -            for (ClassCase cc : supertypes) {
   3.244 -                sb.append(cc.getName());
   3.245 -            }
   3.246 -            sb.append(kind.isInterface ? "i" : "c");
   3.247 -        }
   3.248 -        sb.append(kind.prefix);
   3.249 -        String pname = sb.toString();
   3.250 -        Integer icnt = namingContext.get(pname);
   3.251 -        int cnt = icnt == null ? 0 : icnt;
   3.252 -        ++cnt;
   3.253 -        namingContext.put(pname, cnt);
   3.254 -        if (cnt > 1) {
   3.255 -            sb.append(cnt);
   3.256 -        }
   3.257 -        this.name = sb.toString();
   3.258 -    }
   3.259 -
   3.260 -    public boolean isa(Kind... kinds) {
   3.261 -        for (Kind k : kinds) {
   3.262 -            if (kind == k) {
   3.263 -                return true;
   3.264 -            }
   3.265 -        }
   3.266 -        return false;
   3.267 -    }
   3.268 -
   3.269 -    private void exec(RuleGroup rg ) {
   3.270 -        if (!executed.contains(rg)) {
   3.271 -            rg.exec(this);
   3.272 -            executed.add(rg);
   3.273 -        }
   3.274 -    }
   3.275 -
   3.276 -    public void collectClasses(Set<ClassCase> seen) {
   3.277 -        seen.add(this);
   3.278 -        for (ClassCase cc : supertypes) {
   3.279 -            cc.collectClasses(seen);
   3.280 -        }
   3.281 -    }
   3.282 -
   3.283 -    public String getID() {
   3.284 -        if (name == null) {
   3.285 -            throw new Error("Access to uninitialized ClassCase");
   3.286 -        } else {
   3.287 -            return name;
   3.288 -        }
   3.289 -    }
   3.290 -
   3.291 -    public final String getName() {
   3.292 -        if (name == null) {
   3.293 -            return "ClassCase uninited@" + hashCode();
   3.294 -        } else {
   3.295 -            return name;
   3.296 -        }
   3.297 -    }
   3.298 -
   3.299 -    @Override
   3.300 -    public boolean equals(Object obj) {
   3.301 -        return obj instanceof ClassCase && getID().equals(((ClassCase)obj).getID());
   3.302 -    }
   3.303 -
   3.304 -    @Override
   3.305 -    public int hashCode() {
   3.306 -        return getID().hashCode();
   3.307 -    }
   3.308 -
   3.309 -    @Override
   3.310 -    public String toString() {
   3.311 -        return getName();
   3.312 -    }
   3.313 -}

     4.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/Hierarchy.java	Tue Nov 20 15:43:28 2012 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,143 +0,0 @@
     4.4 -/*
     4.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.7 - *
     4.8 - * This code is free software; you can redistribute it and/or modify it
     4.9 - * under the terms of the GNU General Public License version 2 only, as
    4.10 - * published by the Free Software Foundation.  Oracle designates this
    4.11 - * particular file as subject to the "Classpath" exception as provided
    4.12 - * by Oracle in the LICENSE file that accompanied this code.
    4.13 - *
    4.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    4.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.17 - * version 2 for more details (a copy is included in the LICENSE file that
    4.18 - * accompanied this code).
    4.19 - *
    4.20 - * You should have received a copy of the GNU General Public License version
    4.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    4.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.23 - *
    4.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.25 - * or visit www.oracle.com if you need additional information or have any
    4.26 - * questions.
    4.27 - */
    4.28 -
    4.29 -package shapegen;
    4.30 -
    4.31 -import java.util.List;
    4.32 -import java.util.HashMap;
    4.33 -import java.util.HashSet;
    4.34 -import java.util.Set;
    4.35 -
    4.36 -import static shapegen.ClassCase.Kind.*;
    4.37 -
    4.38 -/**
    4.39 - *
    4.40 - * @author Robert Field
    4.41 - */
    4.42 -public class Hierarchy {
    4.43 -
    4.44 -    public final ClassCase root;
    4.45 -    public final Set<ClassCase> all;
    4.46 -
    4.47 -    public Hierarchy(ClassCase root) {
    4.48 -        this.root = root;
    4.49 -        root.init(new HashMap<String,Integer>());
    4.50 -        Set<ClassCase> allClasses = new HashSet<>();
    4.51 -        root.collectClasses(allClasses);
    4.52 -        this.all = allClasses;
    4.53 -    }
    4.54 -
    4.55 -    public boolean anyDefaults() {
    4.56 -        for (ClassCase cc : all) {
    4.57 -            if (cc.kind == IDEFAULT) {
    4.58 -                return true;
    4.59 -            }
    4.60 -        }
    4.61 -        return false;
    4.62 -    }
    4.63 -
    4.64 -    public boolean get_OK() {
    4.65 -        return root.get_OK();
    4.66 -    }
    4.67 -
    4.68 -    public String testName() {
    4.69 -        return root + "Test";
    4.70 -    }
    4.71 -
    4.72 -    private static void genInterfaceList(StringBuilder buf, String prefix, List<ClassCase> interfaces) {
    4.73 -        if (!interfaces.isEmpty()) {
    4.74 -            buf.append(" ");
    4.75 -            buf.append(prefix);
    4.76 -            buf.append(" ");
    4.77 -            buf.append(interfaces.get(0));
    4.78 -            for (int i = 1; i < interfaces.size(); ++i) {
    4.79 -                buf.append(", " + interfaces.get(i));
    4.80 -            }
    4.81 -        }
    4.82 -    }
    4.83 -
    4.84 -    public static void genClassDef(StringBuilder buf, ClassCase cc, String implClass, List<ClassCase> defaultRef) {
    4.85 -        if (cc.isInterface()) {
    4.86 -            buf.append("interface ");
    4.87 -            buf.append(cc.getName() + " ");
    4.88 -            genInterfaceList(buf, "extends", cc.getInterfaces());
    4.89 -            buf.append(" {\n");
    4.90 -
    4.91 -            switch (cc.kind) {
    4.92 -                case IDEFAULT:
    4.93 -                    buf.append("    default String m() { return \"\"; }\n");
    4.94 -                    defaultRef.add(cc);
    4.95 -                    break;
    4.96 -                case IPRESENT:
    4.97 -                    buf.append("    String m();\n");
    4.98 -                    break;
    4.99 -                case IVAC:
   4.100 -                    break;
   4.101 -                default:
   4.102 -                    throw new AssertionError("Unexpected kind");
   4.103 -            }
   4.104 -            buf.append("}\n\n");
   4.105 -        } else {
   4.106 -            buf.append((cc.isAbstract()? "abstract " : ""));
   4.107 -            buf.append(" class " + cc.getName());
   4.108 -            if (cc.getSuperclass() != null) {
   4.109 -                buf.append(" extends " + cc.getSuperclass());
   4.110 -            }
   4.111 -
   4.112 -            genInterfaceList(buf, "implements", cc.getInterfaces());
   4.113 -            buf.append(" {\n");
   4.114 -
   4.115 -            switch (cc.kind) {
   4.116 -                case CCONCRETE:
   4.117 -                    buf.append("   public String m() { return \"\"; }\n");
   4.118 -                    break;
   4.119 -                case CABSTRACT:
   4.120 -                    buf.append("   public abstract String m();\n");
   4.121 -                    break;
   4.122 -                case CNONE:
   4.123 -                    break;
   4.124 -                default:
   4.125 -                    throw new AssertionError("Unexpected kind");
   4.126 -            }
   4.127 -            buf.append("}\n\n");
   4.128 -        }
   4.129 -    }
   4.130 -
   4.131 -    @Override
   4.132 -    public boolean equals(Object obj) {
   4.133 -        return obj instanceof Hierarchy && root.getID().equals(((Hierarchy)obj).root.getID());
   4.134 -    }
   4.135 -
   4.136 -    @Override
   4.137 -    public int hashCode() {
   4.138 -        return root.getID().hashCode();
   4.139 -    }
   4.140 -
   4.141 -    @Override
   4.142 -    public String toString() {
   4.143 -        return root.getName();
   4.144 -    }
   4.145 -
   4.146 -}

     5.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/HierarchyGenerator.java	Tue Nov 20 15:43:28 2012 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,190 +0,0 @@
     5.4 -/*
     5.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     5.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.7 - *
     5.8 - * This code is free software; you can redistribute it and/or modify it
     5.9 - * under the terms of the GNU General Public License version 2 only, as
    5.10 - * published by the Free Software Foundation.  Oracle designates this
    5.11 - * particular file as subject to the "Classpath" exception as provided
    5.12 - * by Oracle in the LICENSE file that accompanied this code.
    5.13 - *
    5.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    5.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5.17 - * version 2 for more details (a copy is included in the LICENSE file that
    5.18 - * accompanied this code).
    5.19 - *
    5.20 - * You should have received a copy of the GNU General Public License version
    5.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    5.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.23 - *
    5.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.25 - * or visit www.oracle.com if you need additional information or have any
    5.26 - * questions.
    5.27 - */
    5.28 -
    5.29 -package shapegen;
    5.30 -
    5.31 -import shapegen.ClassCase.Kind;
    5.32 -
    5.33 -import java.util.Collection;
    5.34 -import java.util.Set;
    5.35 -import java.util.HashSet;
    5.36 -import java.util.Collections;
    5.37 -import java.util.ArrayList;
    5.38 -import java.util.List;
    5.39 -
    5.40 -import static shapegen.ClassCase.Kind.*;
    5.41 -
    5.42 -import static java.lang.Math.pow;
    5.43 -
    5.44 -/**
    5.45 - *
    5.46 - * @author Robert Field
    5.47 - */
    5.48 -public final class HierarchyGenerator {
    5.49 -
    5.50 -    private static int okcnt = 0;
    5.51 -    private static int errcnt = 0;
    5.52 -    private static Set<Hierarchy> uniqueOK = new HashSet<>();
    5.53 -    private static Set<Hierarchy> uniqueErr = new HashSet<>();
    5.54 -
    5.55 -    /**
    5.56 -     * @param args the command line arguments
    5.57 -     */
    5.58 -    public HierarchyGenerator() {
    5.59 -        organize("exhaustive interface", iExhaustive(2));
    5.60 -        organize("exhaustive class", cExhaustive());
    5.61 -        organize("shapes interface", iShapes());
    5.62 -        organize("shapes class/interface", ciShapes());
    5.63 -
    5.64 -        System.out.printf("\nExpect OK:    %d -- unique %d",   okcnt,  uniqueOK.size());
    5.65 -        System.out.printf("\nExpect Error: %d -- unique %d\n", errcnt, uniqueErr.size());
    5.66 -    }
    5.67 -
    5.68 -    public Collection<Hierarchy> getOK() {
    5.69 -        return uniqueOK;
    5.70 -    }
    5.71 -
    5.72 -    public Collection<Hierarchy> getErr() {
    5.73 -        return uniqueErr;
    5.74 -    }
    5.75 -
    5.76 -    private void organize(String tname, List<Hierarchy> totest) {
    5.77 -        System.out.printf("\nTesting %s....\n", tname);
    5.78 -        int nodefault = 0;
    5.79 -        List<Hierarchy> ok = new ArrayList<>();
    5.80 -        List<Hierarchy> err = new ArrayList<>();
    5.81 -        for (Hierarchy cc : totest) {
    5.82 -            if (cc.anyDefaults()) {
    5.83 -                //System.out.printf("  %s\n", cc);
    5.84 -                if (cc.get_OK()) {
    5.85 -                    ok.add(cc);
    5.86 -                } else {
    5.87 -                    err.add(cc);
    5.88 -                }
    5.89 -            } else {
    5.90 -                ++nodefault;
    5.91 -            }
    5.92 -        }
    5.93 -
    5.94 -        errcnt += err.size();
    5.95 -        okcnt += ok.size();
    5.96 -        uniqueErr.addAll(err);
    5.97 -        uniqueOK.addAll(ok);
    5.98 -
    5.99 -        System.out.printf("  %5d No default\n  %5d Error\n  %5d OK\n  %5d Total\n",
   5.100 -                nodefault, err.size(), ok.size(), totest.size());
   5.101 -    }
   5.102 -
   5.103 -    public List<Hierarchy> iExhaustive(int idepth) {
   5.104 -        List<ClassCase> current = new ArrayList<>();
   5.105 -        for (int i = 0; i < idepth; ++i) {
   5.106 -            current = ilayer(current);
   5.107 -        }
   5.108 -        return wrapInClassAndHierarchy(current);
   5.109 -    }
   5.110 -
   5.111 -    private List<ClassCase> ilayer(List<ClassCase> srcLayer) {
   5.112 -        List<ClassCase> lay = new ArrayList<>();
   5.113 -        for (int i = (int) pow(2, srcLayer.size()) - 1; i >= 0; --i) {
   5.114 -            List<ClassCase> itfs = new ArrayList<>();
   5.115 -            for (int b = srcLayer.size() - 1; b >= 0; --b) {
   5.116 -                if ((i & (1<<b)) != 0) {
   5.117 -                    itfs.add(srcLayer.get(b));
   5.118 -                }
   5.119 -            }
   5.120 -            lay.add(new ClassCase(IVAC, null, itfs));
   5.121 -            lay.add(new ClassCase(IPRESENT, null, itfs));
   5.122 -            lay.add(new ClassCase(IDEFAULT, null, itfs));
   5.123 -            lay.add(new ClassCase(IDEFAULT, null, itfs));
   5.124 -        }
   5.125 -        return lay;
   5.126 -    }
   5.127 -
   5.128 -    public List<Hierarchy> cExhaustive() {
   5.129 -        final Kind[] iKinds = new Kind[]{IDEFAULT, IVAC, IPRESENT, null};
   5.130 -        final Kind[] cKinds = new Kind[]{CNONE, CABSTRACT, CCONCRETE};
   5.131 -        List<Hierarchy> totest = new ArrayList<>();
   5.132 -        for (int i1 = 0; i1 < iKinds.length; ++i1) {
   5.133 -            for (int i2 = 0; i2 < iKinds.length; ++i2) {
   5.134 -                for (int i3 = 0; i3 < iKinds.length; ++i3) {
   5.135 -                    for (int c1 = 0; c1 < cKinds.length; ++c1) {
   5.136 -                        for (int c2 = 0; c2 < cKinds.length; ++c2) {
   5.137 -                            for (int c3 = 0; c3 < cKinds.length; ++c3) {
   5.138 -                                totest.add( new Hierarchy(
   5.139 -                                        new ClassCase(cKinds[c1],
   5.140 -                                            new ClassCase(cKinds[c2],
   5.141 -                                                new ClassCase(cKinds[c3],
   5.142 -                                                    null,
   5.143 -                                                    iList(iKinds[i1])
   5.144 -                                                ),
   5.145 -                                                iList(iKinds[i2])
   5.146 -                                            ),
   5.147 -                                            iList(iKinds[i3])
   5.148 -                                        )));
   5.149 -                            }
   5.150 -                        }
   5.151 -                    }
   5.152 -                }
   5.153 -            }
   5.154 -        }
   5.155 -        return totest;
   5.156 -    }
   5.157 -
   5.158 -    private List<ClassCase> iList(Kind kind) {
   5.159 -        if (kind == null) {
   5.160 -            return Collections.EMPTY_LIST;
   5.161 -        } else {
   5.162 -            List<ClassCase> itfs = new ArrayList<>();
   5.163 -            itfs.add(new ClassCase(kind, null, Collections.EMPTY_LIST));
   5.164 -            return itfs;
   5.165 -        }
   5.166 -    }
   5.167 -
   5.168 -    public List<Hierarchy> ciShapes() {
   5.169 -        return wrapInHierarchy(TTShape.allCases(true));
   5.170 -    }
   5.171 -
   5.172 -    public List<Hierarchy> iShapes() {
   5.173 -        return wrapInClassAndHierarchy(TTShape.allCases(false));
   5.174 -    }
   5.175 -
   5.176 -    public List<Hierarchy> wrapInClassAndHierarchy(List<ClassCase> ihs) {
   5.177 -        List<Hierarchy> totest = new ArrayList<>();
   5.178 -        for (ClassCase cc : ihs) {
   5.179 -            List<ClassCase> interfaces = new ArrayList<>();
   5.180 -            interfaces.add(cc);
   5.181 -            totest.add(new Hierarchy(new ClassCase(CNONE, null, interfaces)));
   5.182 -        }
   5.183 -        return totest;
   5.184 -    }
   5.185 -
   5.186 -    public List<Hierarchy> wrapInHierarchy(List<ClassCase> ihs) {
   5.187 -        List<Hierarchy> totest = new ArrayList<>();
   5.188 -        for (ClassCase cc : ihs) {
   5.189 -            totest.add(new Hierarchy(cc));
   5.190 -        }
   5.191 -        return totest;
   5.192 -    }
   5.193 -}

     6.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/Rule.java	Tue Nov 20 15:43:28 2012 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,48 +0,0 @@
     6.4 -/*
     6.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     6.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.7 - *
     6.8 - * This code is free software; you can redistribute it and/or modify it
     6.9 - * under the terms of the GNU General Public License version 2 only, as
    6.10 - * published by the Free Software Foundation.  Oracle designates this
    6.11 - * particular file as subject to the "Classpath" exception as provided
    6.12 - * by Oracle in the LICENSE file that accompanied this code.
    6.13 - *
    6.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    6.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    6.17 - * version 2 for more details (a copy is included in the LICENSE file that
    6.18 - * accompanied this code).
    6.19 - *
    6.20 - * You should have received a copy of the GNU General Public License version
    6.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    6.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.23 - *
    6.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    6.25 - * or visit www.oracle.com if you need additional information or have any
    6.26 - * questions.
    6.27 - */
    6.28 -
    6.29 -package shapegen;
    6.30 -
    6.31 -/**
    6.32 - *
    6.33 - * @author Robert Field
    6.34 - */
    6.35 -public abstract class Rule {
    6.36 -
    6.37 -    public final String name;
    6.38 -
    6.39 -    public Rule(String name) {
    6.40 -        this.name = name;
    6.41 -    }
    6.42 -
    6.43 -    abstract boolean guard(ClassCase cc);
    6.44 -
    6.45 -    abstract void eval(ClassCase cc);
    6.46 -
    6.47 -    @Override
    6.48 -    public String toString() {
    6.49 -        return name;
    6.50 -    }
    6.51 -}

     7.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/RuleGroup.java	Tue Nov 20 15:43:28 2012 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,206 +0,0 @@
     7.4 -/*
     7.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.7 - *
     7.8 - * This code is free software; you can redistribute it and/or modify it
     7.9 - * under the terms of the GNU General Public License version 2 only, as
    7.10 - * published by the Free Software Foundation.  Oracle designates this
    7.11 - * particular file as subject to the "Classpath" exception as provided
    7.12 - * by Oracle in the LICENSE file that accompanied this code.
    7.13 - *
    7.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    7.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    7.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    7.17 - * version 2 for more details (a copy is included in the LICENSE file that
    7.18 - * accompanied this code).
    7.19 - *
    7.20 - * You should have received a copy of the GNU General Public License version
    7.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    7.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    7.23 - *
    7.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    7.25 - * or visit www.oracle.com if you need additional information or have any
    7.26 - * questions.
    7.27 - */
    7.28 -
    7.29 -package shapegen;
    7.30 -
    7.31 -import java.util.HashSet;
    7.32 -import java.util.Set;
    7.33 -
    7.34 -import static shapegen.ClassCase.Kind.*;
    7.35 -
    7.36 -/**
    7.37 - *
    7.38 - * @author Robert Field
    7.39 - */
    7.40 -public class RuleGroup {
    7.41 -
    7.42 -    final String name;
    7.43 -    private final Rule[] rules;
    7.44 -
    7.45 -    public RuleGroup(String name, Rule[] rules) {
    7.46 -        this.name = name;
    7.47 -        this.rules = rules;
    7.48 -    }
    7.49 -
    7.50 -    public boolean exec(ClassCase cc) {
    7.51 -        boolean found = false;
    7.52 -        for (Rule rule : rules) {
    7.53 -            if (rule.guard(cc)) {
    7.54 -                if (found) {
    7.55 -                    throw new RuntimeException("Bad rules -- multiple matches " + toString() + " for " + cc);
    7.56 -                } else {
    7.57 -                    rule.eval(cc);
    7.58 -                    found = true;
    7.59 -                }
    7.60 -            }
    7.61 -        }
    7.62 -        return found;
    7.63 -    }
    7.64 -
    7.65 -    @Override
    7.66 -    public String toString() {
    7.67 -        return name;
    7.68 -    }
    7.69 -
    7.70 -    public static RuleGroup PROVENENCE = new RuleGroup("Provenence", new Rule[] {
    7.71 -        new Rule("P-CDeclare") {
    7.72 -            boolean guard(ClassCase cc) {
    7.73 -                return cc.isa(CCONCRETE, CABSTRACT);
    7.74 -            }
    7.75 -
    7.76 -            void eval(ClassCase cc) {
    7.77 -                cc.set_mprov(cc);
    7.78 -                cc.set_HasClassMethod(true);
    7.79 -            }
    7.80 -        },
    7.81 -
    7.82 -        new Rule("P-IDeclare") {
    7.83 -            boolean guard(ClassCase cc) {
    7.84 -                return cc.isa(IDEFAULT, IPRESENT);
    7.85 -            }
    7.86 -
    7.87 -            void eval(ClassCase cc) {
    7.88 -                cc.set_mprov(cc);
    7.89 -            }
    7.90 -        },
    7.91 -
    7.92 -        new Rule("P-IntfInh") {
    7.93 -            boolean guard(ClassCase cc) {
    7.94 -                return cc.isa(IVAC, CNONE) && !(cc.hasSuperclass() && cc.getSuperclass().get_HasClassMethod());
    7.95 -            }
    7.96 -
    7.97 -            void eval(ClassCase cc) {
    7.98 -                Set<ClassCase> _S = new HashSet<>();
    7.99 -                for (ClassCase t : cc.getSupertypes()) {
   7.100 -                    _S.addAll(t.get_mprov());
   7.101 -                }
   7.102 -                Set<ClassCase> tops = new HashSet<>();
   7.103 -                for (ClassCase _W : _S) {
   7.104 -                    for (ClassCase _V : _S) {
   7.105 -                        if (_V.equals(_W) || !(_V.isSubtypeOf(_W))) {
   7.106 -                            tops.add(_W);
   7.107 -                        }
   7.108 -                    }
   7.109 -                }
   7.110 -                cc.set_mprov(tops);
   7.111 -            }
   7.112 -        },
   7.113 -
   7.114 -        new Rule("P-ClassInh") {
   7.115 -            boolean guard(ClassCase cc) {
   7.116 -                return cc.isa(CNONE) && (cc.hasSuperclass() && cc.getSuperclass().get_HasClassMethod());
   7.117 -            }
   7.118 -
   7.119 -            void eval(ClassCase cc) {
   7.120 -                cc.set_mprov(cc.getSuperclass());
   7.121 -                cc.set_HasClassMethod(true);
   7.122 -            }
   7.123 -        },
   7.124 -
   7.125 -    });
   7.126 -
   7.127 -    public static RuleGroup MARKER = new RuleGroup("Marker", new Rule[] {
   7.128 -        new Rule("M-Default") {
   7.129 -            boolean guard(ClassCase cc) {
   7.130 -                return cc.isa(IDEFAULT);
   7.131 -            }
   7.132 -
   7.133 -            void eval(ClassCase cc) {
   7.134 -                cc.set_HasDefault(true);
   7.135 -            }
   7.136 -        },
   7.137 -
   7.138 -        new Rule("M-Conc") {
   7.139 -            boolean guard(ClassCase cc) {
   7.140 -              return cc.isa(CCONCRETE);
   7.141 -            }
   7.142 -
   7.143 -            void eval(ClassCase cc) {
   7.144 -                cc.set_IsConcrete(true);
   7.145 -            }
   7.146 -        },
   7.147 -
   7.148 -    });
   7.149 -
   7.150 -    public static RuleGroup RESOLUTION = new RuleGroup("Resolution", new Rule[] {
   7.151 -        new Rule("R-Resolve") {
   7.152 -            boolean guard(ClassCase cc) {
   7.153 -                if (!(cc.isClass() && cc.get_mprov().size() == 1)) {
   7.154 -                    return false;
   7.155 -                }
   7.156 -                ClassCase _V = cc.get_mprov().iterator().next();
   7.157 -                return _V.get_IsConcrete() || _V.get_HasDefault();
   7.158 -            }
   7.159 -
   7.160 -            void eval(ClassCase cc) {
   7.161 -                ClassCase _V = cc.get_mprov().iterator().next();
   7.162 -                cc.set_mres(_V);
   7.163 -            }
   7.164 -        },
   7.165 -
   7.166 -    });
   7.167 -
   7.168 -    public static RuleGroup DEFENDER = new RuleGroup("Defender", new Rule[] {
   7.169 -        new Rule("D-Defend") {
   7.170 -            boolean guard(ClassCase cc) {
   7.171 -                ClassCase mresSuper = cc.hasSuperclass() ? cc.getSuperclass().get_mres() : null;
   7.172 -                boolean eq = cc.get_mres() == null ? mresSuper == null : cc.get_mres().equals(mresSuper);
   7.173 -                return cc.isa(CNONE) && !eq;
   7.174 -            }
   7.175 -
   7.176 -            void eval(ClassCase cc) {
   7.177 -                cc.set_mdefend(cc.get_mres());
   7.178 -            }
   7.179 -        },
   7.180 -
   7.181 -    });
   7.182 -
   7.183 -    public static RuleGroup CHECKING = new RuleGroup("Checking", new Rule[] {
   7.184 -        new Rule("C-Check") {
   7.185 -            boolean guard(ClassCase cc) {
   7.186 -                for (ClassCase t : cc.getSupertypes()) {
   7.187 -                    if (! t.get_OK()) {
   7.188 -                        return false;
   7.189 -                    }
   7.190 -                }
   7.191 -                int defenderCount = 0;
   7.192 -                int provCount = 0;
   7.193 -                for (ClassCase prov : cc.get_mprov()) {
   7.194 -                    if (prov.get_HasDefault()) {
   7.195 -                        defenderCount++;
   7.196 -                    }
   7.197 -                    provCount++;
   7.198 -                }
   7.199 -                return provCount <= 1 || defenderCount == 0;
   7.200 -            }
   7.201 -
   7.202 -            void eval(ClassCase cc) {
   7.203 -                cc.set_OK(true);
   7.204 -            }
   7.205 -        },
   7.206 -
   7.207 -    });
   7.208 -
   7.209 -}

     8.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/TTNode.java	Tue Nov 20 15:43:28 2012 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,126 +0,0 @@
     8.4 -/*
     8.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     8.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.7 - *
     8.8 - * This code is free software; you can redistribute it and/or modify it
     8.9 - * under the terms of the GNU General Public License version 2 only, as
    8.10 - * published by the Free Software Foundation.  Oracle designates this
    8.11 - * particular file as subject to the "Classpath" exception as provided
    8.12 - * by Oracle in the LICENSE file that accompanied this code.
    8.13 - *
    8.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    8.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    8.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    8.17 - * version 2 for more details (a copy is included in the LICENSE file that
    8.18 - * accompanied this code).
    8.19 - *
    8.20 - * You should have received a copy of the GNU General Public License version
    8.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    8.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    8.23 - *
    8.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    8.25 - * or visit www.oracle.com if you need additional information or have any
    8.26 - * questions.
    8.27 - */
    8.28 -
    8.29 -package shapegen;
    8.30 -
    8.31 -import shapegen.ClassCase.Kind;
    8.32 -
    8.33 -import java.util.ArrayList;
    8.34 -import java.util.List;
    8.35 -import java.util.Set;
    8.36 -
    8.37 -import static shapegen.ClassCase.Kind.*;
    8.38 -
    8.39 -/**
    8.40 - * Type Template Node
    8.41 - *
    8.42 - * @author Robert Field
    8.43 - */
    8.44 -public class TTNode {
    8.45 -
    8.46 -    final List<TTNode> supertypes;
    8.47 -    final boolean canBeClass;
    8.48 -
    8.49 -    private int currentKindIndex;
    8.50 -    private Kind[] kinds;
    8.51 -
    8.52 -    public TTNode(List<TTNode> subtypes, boolean canBeClass) {
    8.53 -        this.supertypes = subtypes;
    8.54 -        this.canBeClass = canBeClass;
    8.55 -    }
    8.56 -
    8.57 -    public void start(boolean includeClasses) {
    8.58 -        kinds =
    8.59 -             supertypes.isEmpty()?
    8.60 -                (new Kind[]{IDEFAULT, IPRESENT})
    8.61 -             :  ((includeClasses && canBeClass)?
    8.62 -                  new Kind[]{CNONE, IVAC, IDEFAULT, IPRESENT}
    8.63 -                : new Kind[]{IVAC, IDEFAULT, IPRESENT});
    8.64 -        currentKindIndex = 0;
    8.65 -
    8.66 -        for (TTNode sub : supertypes) {
    8.67 -            sub.start(includeClasses);
    8.68 -        }
    8.69 -    }
    8.70 -
    8.71 -    public boolean next() {
    8.72 -        ++currentKindIndex;
    8.73 -        if (currentKindIndex >= kinds.length) {
    8.74 -            currentKindIndex = 0;
    8.75 -            return false;
    8.76 -        } else {
    8.77 -            return true;
    8.78 -        }
    8.79 -    }
    8.80 -
    8.81 -    public void collectAllSubtypes(Set<TTNode> subs) {
    8.82 -        subs.add(this);
    8.83 -        for (TTNode n : supertypes) {
    8.84 -            n.collectAllSubtypes(subs);
    8.85 -        }
    8.86 -    }
    8.87 -
    8.88 -    private Kind getKind() {
    8.89 -        return kinds[currentKindIndex];
    8.90 -    }
    8.91 -
    8.92 -    boolean isInterface() {
    8.93 -        return getKind().isInterface;
    8.94 -    }
    8.95 -
    8.96 -    boolean isClass() {
    8.97 -        return !isInterface();
    8.98 -    }
    8.99 -
   8.100 -    boolean hasDefault() {
   8.101 -        return getKind() == IDEFAULT;
   8.102 -    }
   8.103 -
   8.104 -    public boolean isValid() {
   8.105 -        for (TTNode n : supertypes) {
   8.106 -            if (!n.isValid() || (isInterface() && n.isClass())) {
   8.107 -                return false;
   8.108 -            }
   8.109 -        }
   8.110 -        return true;
   8.111 -    }
   8.112 -
   8.113 -    public ClassCase genCase() {
   8.114 -        ClassCase subclass;
   8.115 -        List<TTNode> ttintfs;
   8.116 -        if (isClass() && !supertypes.isEmpty() && supertypes.get(0).isClass()) {
   8.117 -            subclass = supertypes.get(0).genCase();
   8.118 -            ttintfs = supertypes.subList(1, supertypes.size());
   8.119 -        } else {
   8.120 -            subclass = null;
   8.121 -            ttintfs = supertypes;
   8.122 -        }
   8.123 -        List<ClassCase> intfs = new ArrayList<>();
   8.124 -        for (TTNode node : ttintfs) {
   8.125 -            intfs.add(node.genCase());
   8.126 -        }
   8.127 -        return new ClassCase(getKind(), subclass, intfs);
   8.128 -    }
   8.129 -}

     9.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/TTParser.java	Tue Nov 20 15:43:28 2012 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,100 +0,0 @@
     9.4 -/*
     9.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     9.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.7 - *
     9.8 - * This code is free software; you can redistribute it and/or modify it
     9.9 - * under the terms of the GNU General Public License version 2 only, as
    9.10 - * published by the Free Software Foundation.  Oracle designates this
    9.11 - * particular file as subject to the "Classpath" exception as provided
    9.12 - * by Oracle in the LICENSE file that accompanied this code.
    9.13 - *
    9.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
    9.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    9.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    9.17 - * version 2 for more details (a copy is included in the LICENSE file that
    9.18 - * accompanied this code).
    9.19 - *
    9.20 - * You should have received a copy of the GNU General Public License version
    9.21 - * 2 along with this work; if not, write to the Free Software Foundation,
    9.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    9.23 - *
    9.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    9.25 - * or visit www.oracle.com if you need additional information or have any
    9.26 - * questions.
    9.27 - */
    9.28 -
    9.29 -package shapegen;
    9.30 -
    9.31 -import java.util.ArrayList;
    9.32 -import java.util.HashMap;
    9.33 -import java.util.List;
    9.34 -import java.util.Map;
    9.35 -import java.io.IOException;
    9.36 -import java.io.StringReader;
    9.37 -
    9.38 -import static java.lang.Character.isLetter;
    9.39 -import static java.lang.Character.isUpperCase;
    9.40 -import static java.lang.Character.isWhitespace;
    9.41 -
    9.42 -/**
    9.43 - * Parse a type template definition string
    9.44 - *
    9.45 - *   input     :: classDef
    9.46 - *   classDef  :: letter [ ( classDef* ) ]
    9.47 - *
    9.48 - * @author Robert Field
    9.49 - */
    9.50 -public class TTParser extends StringReader {
    9.51 -
    9.52 -    private Map<Character, TTNode> letterMap = new HashMap<>();
    9.53 -    private char ch;
    9.54 -
    9.55 -    private final String def;
    9.56 -
    9.57 -    public TTParser(String s) {
    9.58 -        super(s);
    9.59 -        this.def = s;
    9.60 -    }
    9.61 -
    9.62 -    private void advance() throws IOException {
    9.63 -        do {
    9.64 -            ch = (char)read();
    9.65 -        } while (isWhitespace(ch));
    9.66 -    }
    9.67 -
    9.68 -    public TTNode parse() {
    9.69 -        try {
    9.70 -            advance();
    9.71 -            return classDef();
    9.72 -        } catch (IOException t) {
    9.73 -            throw new RuntimeException(t);
    9.74 -        }
    9.75 -    }
    9.76 -
    9.77 -    private TTNode classDef() throws IOException {
    9.78 -        if (!isLetter(ch)) {
    9.79 -            if (ch == (char)-1) {
    9.80 -                throw new IOException("Unexpected end of type template in " + def);
    9.81 -            } else {
    9.82 -                throw new IOException("Unexpected character in type template: " + (Character)ch + " in " + def);
    9.83 -            }
    9.84 -        }
    9.85 -        char nodeCh = ch;
    9.86 -        TTNode node = letterMap.get(nodeCh);
    9.87 -        boolean canBeClass = isUpperCase(nodeCh);
    9.88 -        advance();
    9.89 -        if (node == null) {
    9.90 -            List<TTNode> subtypes = new ArrayList<>();
    9.91 -            if (ch == '(') {
    9.92 -                advance();
    9.93 -                while (ch != ')') {
    9.94 -                    subtypes.add(classDef());
    9.95 -                }
    9.96 -                advance();
    9.97 -            }
    9.98 -            node = new TTNode(subtypes, canBeClass);
    9.99 -            letterMap.put(nodeCh, node);
   9.100 -        }
   9.101 -        return node;
   9.102 -    }
   9.103 -}

    10.1 --- a/test/tools/javac/defaultMethods/fd/shapegen/TTShape.java	Tue Nov 20 15:43:28 2012 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,104 +0,0 @@
    10.4 -/*
    10.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.7 - *
    10.8 - * This code is free software; you can redistribute it and/or modify it
    10.9 - * under the terms of the GNU General Public License version 2 only, as
   10.10 - * published by the Free Software Foundation.  Oracle designates this
   10.11 - * particular file as subject to the "Classpath" exception as provided
   10.12 - * by Oracle in the LICENSE file that accompanied this code.
   10.13 - *
   10.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   10.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   10.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   10.17 - * version 2 for more details (a copy is included in the LICENSE file that
   10.18 - * accompanied this code).
   10.19 - *
   10.20 - * You should have received a copy of the GNU General Public License version
   10.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   10.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   10.23 - *
   10.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   10.25 - * or visit www.oracle.com if you need additional information or have any
   10.26 - * questions.
   10.27 - */
   10.28 -
   10.29 -package shapegen;
   10.30 -
   10.31 -import java.util.ArrayList;
   10.32 -import java.util.HashSet;
   10.33 -import java.util.List;
   10.34 -import java.util.Set;
   10.35 -
   10.36 -/**
   10.37 - *
   10.38 - * @author Robert Field
   10.39 - */
   10.40 -public class TTShape {
   10.41 -
   10.42 -    private final TTNode root;
   10.43 -    private final TTNode[] nodes;
   10.44 -
   10.45 -    TTShape(TTNode root) {
   10.46 -        this.root = root;
   10.47 -        Set<TTNode> subs = new HashSet<>();
   10.48 -        root.collectAllSubtypes(subs);
   10.49 -        nodes = subs.toArray(new TTNode[subs.size()]);
   10.50 -    }
   10.51 -
   10.52 -    private List<ClassCase> toCases(boolean includeClasses) {
   10.53 -        List<ClassCase> ccs = new ArrayList<>();
   10.54 -        root.start(includeClasses);
   10.55 -        int i;
   10.56 -        outer:
   10.57 -        while (true) {
   10.58 -            if (root.isValid()) {
   10.59 -                ClassCase cc = root.genCase();
   10.60 -                //System.out.println(cc);
   10.61 -                ccs.add(cc);
   10.62 -            }
   10.63 -
   10.64 -            i = 0;
   10.65 -            do {
   10.66 -                if (i >= nodes.length) {
   10.67 -                    break outer;
   10.68 -                }
   10.69 -            } while(!nodes[i++].next());
   10.70 -        }
   10.71 -        return ccs;
   10.72 -    }
   10.73 -
   10.74 -   public static List<ClassCase> allCases(boolean includeClasses) {
   10.75 -        List<ClassCase> ccs = new ArrayList<>();
   10.76 -        for (TTShape shape : SHAPES) {
   10.77 -            ccs.addAll(shape.toCases(includeClasses));
   10.78 -        }
   10.79 -        return ccs;
   10.80 -    }
   10.81 -
   10.82 -    public static TTShape parse(String s) {
   10.83 -        return new TTShape(new TTParser(s).parse());
   10.84 -    }
   10.85 -
   10.86 -    public static final TTShape[] SHAPES = new TTShape[] {
   10.87 -        parse("a"),
   10.88 -        parse("a(b)"),
   10.89 -        parse("A(bb)"),
   10.90 -        parse("A(B(d)c(d))"),
   10.91 -        parse("A(b(c))"),
   10.92 -        parse("A(B(cd)d)"),
   10.93 -        parse("A(B(c)c)"),
   10.94 -        parse("A(B(Ce)d(e))"),
   10.95 -        parse("A(B(C)d(e))"),
   10.96 -        parse("A(Bc(d))"),
   10.97 -        parse("A(B(d)dc)"),
   10.98 -        parse("A(B(dc)dc)"),
   10.99 -        parse("A(B(c(d))d)"),
  10.100 -        parse("A(B(C(d))d)"),
  10.101 -        parse("A(B(C(e)d(e))e)"),
  10.102 -        parse("A(B(c(d))c)"),
  10.103 -        parse("A(B(dc(d))c)"),
  10.104 -        parse("A(B(C(d))d)"),
  10.105 -    };
  10.106 -
  10.107 -}

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/test/tools/javac/lambda/lambdaExecution/InInterface.java	Tue Nov 20 09:58:55 2012 -0800
    11.3 @@ -0,0 +1,64 @@
    11.4 +/*
    11.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    11.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.7 + *
    11.8 + * This code is free software; you can redistribute it and/or modify it
    11.9 + * under the terms of the GNU General Public License version 2 only, as
   11.10 + * published by the Free Software Foundation.  Oracle designates this
   11.11 + * particular file as subject to the "Classpath" exception as provided
   11.12 + * by Oracle in the LICENSE file that accompanied this code.
   11.13 + *
   11.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   11.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   11.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   11.17 + * version 2 for more details (a copy is included in the LICENSE file that
   11.18 + * accompanied this code).
   11.19 + *
   11.20 + * You should have received a copy of the GNU General Public License version
   11.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   11.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   11.23 + *
   11.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.25 + * or visit www.oracle.com if you need additional information or have any
   11.26 + * questions.
   11.27 + */
   11.28 +
   11.29 +/**
   11.30 + * @test
   11.31 + * @bug 8003639
   11.32 + * @summary convert lambda testng tests to jtreg and add them
   11.33 + * @run testng InInterface
   11.34 + */
   11.35 +
   11.36 +import static org.testng.Assert.assertEquals;
   11.37 +import org.testng.annotations.Test;
   11.38 +
   11.39 +interface LTII {
   11.40 +
   11.41 +    interface ILsp1 {
   11.42 +        String m();
   11.43 +    }
   11.44 +
   11.45 +    interface ILsp2 {
   11.46 +        String m(String x);
   11.47 +    }
   11.48 +
   11.49 +    default ILsp1 t1() {
   11.50 +        return () -> { return "yo"; };
   11.51 +    }
   11.52 +
   11.53 +    default ILsp2 t2() {
   11.54 +        return (x) -> { return "snur" + x; };
   11.55 +    }
   11.56 +
   11.57 +}
   11.58 +
   11.59 +@Test
   11.60 +public class InInterface implements LTII {
   11.61 +
   11.62 +    public void testLambdaInDefaultMethod() {
   11.63 +        assertEquals(t1().m(), "yo");
   11.64 +        assertEquals(t2().m("p"), "snurp");
   11.65 +    }
   11.66 +
   11.67 +}

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/test/tools/javac/lambda/lambdaExecution/InnerConstructor.java	Tue Nov 20 09:58:55 2012 -0800
    12.3 @@ -0,0 +1,75 @@
    12.4 +/*
    12.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    12.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 + *
    12.8 + * This code is free software; you can redistribute it and/or modify it
    12.9 + * under the terms of the GNU General Public License version 2 only, as
   12.10 + * published by the Free Software Foundation.  Oracle designates this
   12.11 + * particular file as subject to the "Classpath" exception as provided
   12.12 + * by Oracle in the LICENSE file that accompanied this code.
   12.13 + *
   12.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   12.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.17 + * version 2 for more details (a copy is included in the LICENSE file that
   12.18 + * accompanied this code).
   12.19 + *
   12.20 + * You should have received a copy of the GNU General Public License version
   12.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   12.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.23 + *
   12.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   12.25 + * or visit www.oracle.com if you need additional information or have any
   12.26 + * questions.
   12.27 + */
   12.28 +
   12.29 +/**
   12.30 + * @test
   12.31 + * @bug 8003639
   12.32 + * @summary convert lambda testng tests to jtreg and add them
   12.33 + * @run testng InnerConstructor
   12.34 + */
   12.35 +
   12.36 +import static org.testng.Assert.assertEquals;
   12.37 +import org.testng.annotations.Test;
   12.38 +
   12.39 +@Test
   12.40 +public class InnerConstructor  {
   12.41 +
   12.42 +    public void testLambdaWithInnerConstructor() {
   12.43 +        assertEquals(seq1().m().toString(), "Cbl:nada");
   12.44 +        assertEquals(seq2().m("rats").toString(), "Cbl:rats");
   12.45 +    }
   12.46 +
   12.47 +    Ib1 seq1() {
   12.48 +        return () -> { return new Cbl(); };
   12.49 +    }
   12.50 +
   12.51 +    Ib2 seq2() {
   12.52 +        return (x) -> { return new Cbl(x); };
   12.53 +    }
   12.54 +
   12.55 +    class Cbl {
   12.56 +        String val;
   12.57 +
   12.58 +        Cbl() {
   12.59 +            this.val = "nada";
   12.60 +        }
   12.61 +
   12.62 +        Cbl(String z) {
   12.63 +            this.val = z;
   12.64 +        }
   12.65 +
   12.66 +        public String toString() {
   12.67 +            return "Cbl:" + val;
   12.68 +        }
   12.69 +    }
   12.70 +
   12.71 +    interface Ib1 {
   12.72 +        Object m();
   12.73 +    }
   12.74 +
   12.75 +    interface Ib2 {
   12.76 +        Object m(String x);
   12.77 +    }
   12.78 +}

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/test/tools/javac/lambda/lambdaExecution/LambdaTranslationTest1.java	Tue Nov 20 09:58:55 2012 -0800
    13.3 @@ -0,0 +1,234 @@
    13.4 +/*
    13.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    13.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.7 + *
    13.8 + * This code is free software; you can redistribute it and/or modify it
    13.9 + * under the terms of the GNU General Public License version 2 only, as
   13.10 + * published by the Free Software Foundation.  Oracle designates this
   13.11 + * particular file as subject to the "Classpath" exception as provided
   13.12 + * by Oracle in the LICENSE file that accompanied this code.
   13.13 + *
   13.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   13.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   13.17 + * version 2 for more details (a copy is included in the LICENSE file that
   13.18 + * accompanied this code).
   13.19 + *
   13.20 + * You should have received a copy of the GNU General Public License version
   13.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   13.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.23 + *
   13.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   13.25 + * or visit www.oracle.com if you need additional information or have any
   13.26 + * questions.
   13.27 + */
   13.28 +
   13.29 +/**
   13.30 + * @test
   13.31 + * @bug 8003639
   13.32 + * @summary convert lambda testng tests to jtreg and add them
   13.33 + * @run testng LambdaTranslationTest1
   13.34 + */
   13.35 +
   13.36 +import org.testng.annotations.Test;
   13.37 +
   13.38 +import static org.testng.Assert.assertEquals;
   13.39 +
   13.40 +@Test
   13.41 +public class LambdaTranslationTest1 extends LT1Sub {
   13.42 +
   13.43 +    String cntxt = "blah";
   13.44 +
   13.45 +    private static final ThreadLocal<Object> result = new ThreadLocal<>();
   13.46 +
   13.47 +    private static void setResult(Object s) { result.set(s); }
   13.48 +    private static void appendResult(Object s) { result.set(result.get().toString() + s); }
   13.49 +
   13.50 +    private static void assertResult(String expected) {
   13.51 +        assertEquals(result.get().toString(), expected);
   13.52 +    }
   13.53 +
   13.54 +    static Integer count(String s) {
   13.55 +        return s.length();
   13.56 +    }
   13.57 +
   13.58 +    static int icount(String s) {
   13.59 +        return s.length();
   13.60 +    }
   13.61 +
   13.62 +    static void eye(Integer i) {
   13.63 +        setResult(String.format("I:%d", i));
   13.64 +    }
   13.65 +
   13.66 +    static void ieye(int i) {
   13.67 +        setResult(String.format("i:%d", i));
   13.68 +    }
   13.69 +
   13.70 +    static void deye(double d) {
   13.71 +        setResult(String.format("d:%f", d));
   13.72 +    }
   13.73 +
   13.74 +    public void testLambdas() {
   13.75 +        TBlock<Object> b = t -> {setResult("Sink0::" + t);};
   13.76 +        b.apply("Howdy");
   13.77 +        assertResult("Sink0::Howdy");
   13.78 +
   13.79 +        TBlock<String> b1 = t -> {setResult("Sink1::" + t);};
   13.80 +        b1.apply("Rowdy");
   13.81 +        assertResult("Sink1::Rowdy");
   13.82 +
   13.83 +        for (int i = 5; i < 10; ++i) {
   13.84 +            TBlock<Integer> b2 = t -> {setResult("Sink2::" + t);};
   13.85 +            b2.apply(i);
   13.86 +            assertResult("Sink2::" + i);
   13.87 +        }
   13.88 +
   13.89 +        TBlock<Integer> b3 = t -> {setResult("Sink3::" + t);};
   13.90 +        for (int i = 900; i > 0; i -= 100) {
   13.91 +            b3.apply(i);
   13.92 +            assertResult("Sink3::" + i);
   13.93 +        }
   13.94 +
   13.95 +        cntxt = "blah";
   13.96 +        TBlock<String> b4 = t -> {setResult(String.format("b4: %s .. %s", cntxt, t));};
   13.97 +        b4.apply("Yor");
   13.98 +        assertResult("b4: blah .. Yor");
   13.99 +
  13.100 +        String flaw = "flaw";
  13.101 +        TBlock<String> b5 = t -> {setResult(String.format("b5: %s .. %s", flaw, t));};
  13.102 +        b5.apply("BB");
  13.103 +        assertResult("b5: flaw .. BB");
  13.104 +
  13.105 +        cntxt = "flew";
  13.106 +        TBlock<String> b6 = t -> {setResult(String.format("b6: %s .. %s .. %s", t, cntxt, flaw));};
  13.107 +        b6.apply("flee");
  13.108 +        assertResult("b6: flee .. flew .. flaw");
  13.109 +
  13.110 +        TBlock<String> b7 = t -> {setResult(String.format("b7: %s %s", t, this.protectedSuperclassMethod()));};
  13.111 +        b7.apply("this:");
  13.112 +        assertResult("b7: this: instance:flew");
  13.113 +
  13.114 +        TBlock<String> b8 = t -> {setResult(String.format("b8: %s %s", t, super.protectedSuperclassMethod()));};
  13.115 +        b8.apply("super:");
  13.116 +        assertResult("b8: super: I'm the sub");
  13.117 +
  13.118 +        TBlock<String> b7b = t -> {setResult(String.format("b9: %s %s", t, protectedSuperclassMethod()));};
  13.119 +        b7b.apply("implicit this:");
  13.120 +        assertResult("b9: implicit this: instance:flew");
  13.121 +
  13.122 +        TBlock<Object> b10 = t -> {setResult(String.format("b10: new LT1Thing: %s", (new LT1Thing(t)).str));};
  13.123 +        b10.apply("thing");
  13.124 +        assertResult("b10: new LT1Thing: thing");
  13.125 +
  13.126 +        TBlock<Object> b11 = t -> {setResult(String.format("b11: %s", (new LT1Thing(t) {
  13.127 +            String get() {
  13.128 +                return "*" + str.toString() + "*";
  13.129 +            }
  13.130 +        }).get()));};
  13.131 +        b11.apply(999);
  13.132 +        assertResult("b11: *999*");
  13.133 +    }
  13.134 +
  13.135 +    public void testMethodRefs() {
  13.136 +        LT1IA ia = LambdaTranslationTest1::eye;
  13.137 +        ia.doit(1234);
  13.138 +        assertResult("I:1234");
  13.139 +
  13.140 +        LT1IIA iia = LambdaTranslationTest1::ieye;
  13.141 +        iia.doit(1234);
  13.142 +        assertResult("i:1234");
  13.143 +
  13.144 +        LT1IA da = LambdaTranslationTest1::deye;
  13.145 +        da.doit(1234);
  13.146 +        assertResult("d:1234.000000");
  13.147 +
  13.148 +        LT1SA a = LambdaTranslationTest1::count;
  13.149 +        assertEquals((Integer) 5, a.doit("howdy"));
  13.150 +
  13.151 +        a = LambdaTranslationTest1::icount;
  13.152 +        assertEquals((Integer) 6, a.doit("shower"));
  13.153 +    }
  13.154 +
  13.155 +    public void testInner() throws Exception {
  13.156 +        (new In()).doInner();
  13.157 +    }
  13.158 +
  13.159 +    protected String protectedSuperclassMethod() {
  13.160 +        return "instance:" + cntxt;
  13.161 +    }
  13.162 +
  13.163 +    private class In {
  13.164 +
  13.165 +        private int that = 1234;
  13.166 +
  13.167 +        void doInner() {
  13.168 +            TBlock<String> i4 = t -> {setResult(String.format("i4: %d .. %s", that, t));};
  13.169 +            i4.apply("=1234");
  13.170 +            assertResult("i4: 1234 .. =1234");
  13.171 +
  13.172 +            TBlock<String> i5 = t -> {setResult(""); appendResult(t); appendResult(t);};
  13.173 +            i5.apply("fruit");
  13.174 +            assertResult("fruitfruit");
  13.175 +
  13.176 +            cntxt = "human";
  13.177 +            TBlock<String> b4 = t -> {setResult(String.format("b4: %s .. %s", cntxt, t));};
  13.178 +            b4.apply("bin");
  13.179 +            assertResult("b4: human .. bin");
  13.180 +
  13.181 +            final String flaw = "flaw";
  13.182 +
  13.183 +/**
  13.184 + Callable<String> c5 = () ->  "["+flaw+"]" ;
  13.185 + System.out.printf("c5: %s\n", c5.call() );
  13.186 + **/
  13.187 +
  13.188 +            TBlock<String> b5 = t -> {setResult(String.format("b5: %s .. %s", flaw, t));};
  13.189 +            b5.apply("BB");
  13.190 +            assertResult("b5: flaw .. BB");
  13.191 +
  13.192 +            cntxt = "borg";
  13.193 +            TBlock<String> b6 = t -> {setResult(String.format("b6: %s .. %s .. %s", t, cntxt, flaw));};
  13.194 +            b6.apply("flee");
  13.195 +            assertResult("b6: flee .. borg .. flaw");
  13.196 +
  13.197 +            TBlock<String> b7b = t -> {setResult(String.format("b7b: %s %s", t, protectedSuperclassMethod()));};
  13.198 +            b7b.apply("implicit outer this");
  13.199 +            assertResult("b7b: implicit outer this instance:borg");
  13.200 +
  13.201 +            /**
  13.202 +             TBlock<Object> b9 = t -> { System.out.printf("New: %s\n", (new LT1Thing(t)).str); };
  13.203 +             b9.apply("thing");
  13.204 +
  13.205 +             TBlock<Object> ba = t -> { System.out.printf("Def: %s\n", (new LT1Thing(t) { String get() { return "*" + str.toString() +"*";}}).get() ); };
  13.206 +             ba.apply(999);
  13.207 +
  13.208 +             */
  13.209 +        }
  13.210 +    }
  13.211 +}
  13.212 +
  13.213 +class LT1Sub {
  13.214 +    protected String protectedSuperclassMethod() {
  13.215 +        return "I'm the sub";
  13.216 +    }
  13.217 +}
  13.218 +
  13.219 +class LT1Thing {
  13.220 +    final Object str;
  13.221 +
  13.222 +    LT1Thing(Object s) {
  13.223 +        str = s;
  13.224 +    }
  13.225 +}
  13.226 +
  13.227 +interface LT1SA {
  13.228 +    Integer doit(String s);
  13.229 +}
  13.230 +
  13.231 +interface LT1IA {
  13.232 +    void doit(int i);
  13.233 +}
  13.234 +
  13.235 +interface LT1IIA {
  13.236 +    void doit(Integer i);
  13.237 +}

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/test/tools/javac/lambda/lambdaExecution/LambdaTranslationTest2.java	Tue Nov 20 09:58:55 2012 -0800
    14.3 @@ -0,0 +1,355 @@
    14.4 +/*
    14.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    14.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.7 + *
    14.8 + * This code is free software; you can redistribute it and/or modify it
    14.9 + * under the terms of the GNU General Public License version 2 only, as
   14.10 + * published by the Free Software Foundation.  Oracle designates this
   14.11 + * particular file as subject to the "Classpath" exception as provided
   14.12 + * by Oracle in the LICENSE file that accompanied this code.
   14.13 + *
   14.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   14.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   14.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   14.17 + * version 2 for more details (a copy is included in the LICENSE file that
   14.18 + * accompanied this code).
   14.19 + *
   14.20 + * You should have received a copy of the GNU General Public License version
   14.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   14.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   14.23 + *
   14.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   14.25 + * or visit www.oracle.com if you need additional information or have any
   14.26 + * questions.
   14.27 + */
   14.28 +
   14.29 +/**
   14.30 + * @test
   14.31 + * @bug 8003639
   14.32 + * @summary convert lambda testng tests to jtreg and add them
   14.33 + * @run testng LambdaTranslationTest2
   14.34 + */
   14.35 +
   14.36 +import org.testng.annotations.Test;
   14.37 +
   14.38 +import java.util.ArrayList;
   14.39 +import java.util.List;
   14.40 +
   14.41 +import static org.testng.Assert.assertEquals;
   14.42 +import static org.testng.Assert.assertTrue;
   14.43 +
   14.44 +/**
   14.45 + * LambdaTranslationTest2 -- end-to-end smoke tests for lambda evaluation
   14.46 + */
   14.47 +
   14.48 +@Test
   14.49 +public class LambdaTranslationTest2 {
   14.50 +
   14.51 +    final String dummy = "dummy";
   14.52 +
   14.53 +    public void testLambdas() {
   14.54 +        TPredicate<String> isEmpty = s -> s.isEmpty();
   14.55 +        assertTrue(isEmpty.test(""));
   14.56 +        assertTrue(!isEmpty.test("foo"));
   14.57 +
   14.58 +        TPredicate<Object> oIsEmpty = s -> ((String) s).isEmpty();
   14.59 +        assertTrue(oIsEmpty.test(""));
   14.60 +        assertTrue(!oIsEmpty.test("foo"));
   14.61 +
   14.62 +        TPredicate<Object> alwaysTrue = o -> true;
   14.63 +        assertTrue(alwaysTrue.test(""));
   14.64 +        assertTrue(alwaysTrue.test(null));
   14.65 +
   14.66 +        TPredicate<Object> alwaysFalse = o -> false;
   14.67 +        assertTrue(!alwaysFalse.test(""));
   14.68 +        assertTrue(!alwaysFalse.test(null));
   14.69 +
   14.70 +        // tests local capture
   14.71 +        String foo = "foo";
   14.72 +        TPredicate<String> equalsFoo = s -> s.equals(foo);
   14.73 +        assertTrue(!equalsFoo.test(""));
   14.74 +        assertTrue(equalsFoo.test("foo"));
   14.75 +
   14.76 +        // tests instance capture
   14.77 +        TPredicate<String> equalsDummy = s -> s.equals(dummy);
   14.78 +        assertTrue(!equalsDummy.test(""));
   14.79 +        assertTrue(equalsDummy.test("dummy"));
   14.80 +
   14.81 +        TMapper<Object, Object> ident = s -> s;
   14.82 +
   14.83 +        assertEquals("blarf", ident.map("blarf"));
   14.84 +        assertEquals("wooga", ident.map("wooga"));
   14.85 +        assertTrue("wooga" == ident.map("wooga"));
   14.86 +
   14.87 +        // constant capture
   14.88 +        TMapper<Object, Object> prefixer = s -> "p" + s;
   14.89 +        assertEquals("pblarf", prefixer.map("blarf"));
   14.90 +        assertEquals("pwooga", prefixer.map("wooga"));
   14.91 +
   14.92 +        // instance capture
   14.93 +        TMapper<Object, Object> prefixer2 = s -> dummy + s;
   14.94 +        assertEquals("dummyblarf", prefixer2.map("blarf"));
   14.95 +        assertEquals("dummywooga", prefixer2.map("wooga"));
   14.96 +    }
   14.97 +
   14.98 +    interface Factory<T> {
   14.99 +        T make();
  14.100 +    }
  14.101 +
  14.102 +    interface StringFactory extends Factory<String> { }
  14.103 +
  14.104 +    interface StringFactory2 extends Factory<String> {
  14.105 +        String make();
  14.106 +    }
  14.107 +
  14.108 +    public void testBridges() {
  14.109 +        Factory<String> of = () -> "y";
  14.110 +        Factory<?> ef = () -> "z";
  14.111 +
  14.112 +        assertEquals("y", of.make());
  14.113 +        assertEquals("y", ((Factory<?>) of).make());
  14.114 +        assertEquals("y", ((Factory) of).make());
  14.115 +
  14.116 +        assertEquals("z", ef.make());
  14.117 +        assertEquals("z", ((Factory) ef).make());
  14.118 +    }
  14.119 +
  14.120 +    public void testBridgesImplicitSpecialization() {
  14.121 +        StringFactory sf = () -> "x";
  14.122 +
  14.123 +        assertEquals("x", sf.make());
  14.124 +        assertEquals("x", ((Factory<String>) sf).make());
  14.125 +        assertEquals("x", ((Factory<?>) sf).make());
  14.126 +        assertEquals("x", ((Factory) sf).make());
  14.127 +    }
  14.128 +
  14.129 +    public void testBridgesExplicitSpecialization() {
  14.130 +        StringFactory2 sf = () -> "x";
  14.131 +
  14.132 +        assertEquals("x", sf.make());
  14.133 +        assertEquals("x", ((Factory<String>) sf).make());
  14.134 +        assertEquals("x", ((Factory<?>) sf).make());
  14.135 +        assertEquals("x", ((Factory) sf).make());
  14.136 +    }
  14.137 +
  14.138 +    public void testSuperCapture() {
  14.139 +        class A {
  14.140 +            String make() { return "x"; }
  14.141 +        }
  14.142 +
  14.143 +        class B extends A {
  14.144 +            void testSuperCapture() {
  14.145 +                StringFactory sf = () -> super.make();
  14.146 +                assertEquals("x", sf.make());
  14.147 +            }
  14.148 +        }
  14.149 +
  14.150 +        new B().testSuperCapture();
  14.151 +    }
  14.152 +
  14.153 +    interface WidenD {
  14.154 +        public String m(float a0, double a1);
  14.155 +    }
  14.156 +
  14.157 +    interface WidenS {
  14.158 +        public String m(byte a0, short a1);
  14.159 +    }
  14.160 +
  14.161 +    interface WidenI {
  14.162 +        public String m(byte a0, short a1, char a2, int a3);
  14.163 +    }
  14.164 +
  14.165 +    interface WidenL {
  14.166 +        public String m(byte a0, short a1, char a2, int a3, long a4);
  14.167 +    }
  14.168 +
  14.169 +    interface Box {
  14.170 +        public String m(byte a0, short a1, char a2, int a3, long a4, boolean a5, float a6, double a7);
  14.171 +    }
  14.172 +
  14.173 +    static String pb(Byte a0, Short a1, Character a2, Integer a3, Long a4, Boolean a5, Float a6, Double a7) {
  14.174 +        return String.format("b%d s%d c%c i%d j%d z%b f%f d%f", a0, a1, a2, a3, a4, a5, a6, a7);
  14.175 +    }
  14.176 +
  14.177 +    static String pwI1(int a0, int a1, int a2, int a3) {
  14.178 +        return String.format("b%d s%d c%d i%d", a0, a1, a2, a3);
  14.179 +    }
  14.180 +
  14.181 +    static String pwI2(Integer a0, Integer a1, Integer a2, Integer a3) {
  14.182 +        return String.format("b%d s%d c%d i%d", a0, a1, a2, a3);
  14.183 +    }
  14.184 +
  14.185 +    static String pwL1(long a0, long a1, long a2, long a3, long a4) {
  14.186 +        return String.format("b%d s%d c%d i%d j%d", a0, a1, a2, a3, a4);
  14.187 +    }
  14.188 +
  14.189 +    static String pwL2(Long a0, Long a1, Long a2, Long a3, Long a4) {
  14.190 +        return String.format("b%d s%d c%d i%d j%d", a0, a1, a2, a3, a4);
  14.191 +    }
  14.192 +
  14.193 +    static String pwS1(short a0, short a1) {
  14.194 +        return String.format("b%d s%d", a0, a1);
  14.195 +    }
  14.196 +
  14.197 +    static String pwS2(Short a0, Short a1) {
  14.198 +        return String.format("b%d s%d", a0, a1);
  14.199 +    }
  14.200 +
  14.201 +    static String pwD1(double a0, double a1) {
  14.202 +        return String.format("f%f d%f", a0, a1);
  14.203 +    }
  14.204 +
  14.205 +    static String pwD2(Double a0, Double a1) {
  14.206 +        return String.format("f%f d%f", a0, a1);
  14.207 +    }
  14.208 +
  14.209 +    public void testPrimitiveWidening() {
  14.210 +        WidenS ws1 = LambdaTranslationTest2::pwS1;
  14.211 +        assertEquals("b1 s2", ws1.m((byte) 1, (short) 2));
  14.212 +
  14.213 +        WidenD wd1 = LambdaTranslationTest2::pwD1;
  14.214 +        assertEquals("f1.000000 d2.000000", wd1.m(1.0f, 2.0));
  14.215 +
  14.216 +        WidenI wi1 = LambdaTranslationTest2::pwI1;
  14.217 +        assertEquals("b1 s2 c3 i4", wi1.m((byte) 1, (short) 2, (char) 3, 4));
  14.218 +
  14.219 +        WidenL wl1 = LambdaTranslationTest2::pwL1;
  14.220 +        assertEquals("b1 s2 c3 i4 j5", wl1.m((byte) 1, (short) 2, (char) 3, 4, 5L));
  14.221 +
  14.222 +        // @@@ TODO: clarify spec on widen+box conversion
  14.223 +    }
  14.224 +
  14.225 +    interface Unbox {
  14.226 +        public String m(Byte a0, Short a1, Character a2, Integer a3, Long a4, Boolean a5, Float a6, Double a7);
  14.227 +    }
  14.228 +
  14.229 +    static String pu(byte a0, short a1, char a2, int a3, long a4, boolean a5, float a6, double a7) {
  14.230 +        return String.format("b%d s%d c%c i%d j%d z%b f%f d%f", a0, a1, a2, a3, a4, a5, a6, a7);
  14.231 +    }
  14.232 +
  14.233 +    public void testUnboxing() {
  14.234 +        Unbox u = LambdaTranslationTest2::pu;
  14.235 +        assertEquals("b1 s2 cA i4 j5 ztrue f6.000000 d7.000000", u.m((byte)1, (short) 2, 'A', 4, 5L, true, 6.0f, 7.0));
  14.236 +    }
  14.237 +
  14.238 +    public void testBoxing() {
  14.239 +        Box b = LambdaTranslationTest2::pb;
  14.240 +        assertEquals("b1 s2 cA i4 j5 ztrue f6.000000 d7.000000", b.m((byte) 1, (short) 2, 'A', 4, 5L, true, 6.0f, 7.0));
  14.241 +    }
  14.242 +
  14.243 +    static boolean cc(Object o) {
  14.244 +        return ((String) o).equals("foo");
  14.245 +    }
  14.246 +
  14.247 +    public void testArgCastingAdaptation() {
  14.248 +        TPredicate<String> p = LambdaTranslationTest2::cc;
  14.249 +        assertTrue(p.test("foo"));
  14.250 +        assertTrue(!p.test("bar"));
  14.251 +    }
  14.252 +
  14.253 +    interface SonOfPredicate<T> extends TPredicate<T> { }
  14.254 +
  14.255 +    public void testExtendsSAM() {
  14.256 +        SonOfPredicate<String> p = s -> s.isEmpty();
  14.257 +        assertTrue(p.test(""));
  14.258 +        assertTrue(!p.test("foo"));
  14.259 +    }
  14.260 +
  14.261 +    public void testConstructorRef() {
  14.262 +        Factory<List<String>> lf = ArrayList<String>::new;
  14.263 +        List<String> list = lf.make();
  14.264 +        assertTrue(list instanceof ArrayList);
  14.265 +        assertTrue(list != lf.make());
  14.266 +        list.add("a");
  14.267 +        assertEquals("[a]", list.toString());
  14.268 +    }
  14.269 +
  14.270 +    private static String privateMethod() {
  14.271 +        return "private";
  14.272 +    }
  14.273 +
  14.274 +    public void testPrivateMethodRef() {
  14.275 +        Factory<String> sf = LambdaTranslationTest2::privateMethod;
  14.276 +        assertEquals("private", sf.make());
  14.277 +    }
  14.278 +
  14.279 +    private interface PrivateIntf {
  14.280 +        String make();
  14.281 +    }
  14.282 +
  14.283 +    public void testPrivateIntf() {
  14.284 +        PrivateIntf p = () -> "foo";
  14.285 +        assertEquals("foo", p.make());
  14.286 +    }
  14.287 +
  14.288 +    interface Op<T> {
  14.289 +        public T op(T a, T b);
  14.290 +    }
  14.291 +
  14.292 +    public void testBoxToObject() {
  14.293 +        Op<Integer> maxer = Math::max;
  14.294 +        for (int i=-100000; i < 100000; i += 100)
  14.295 +            for (int j=-100000; j < 100000; j += 99) {
  14.296 +                assertEquals((int) maxer.op(i,j), Math.max(i,j));
  14.297 +            }
  14.298 +    }
  14.299 +
  14.300 +    protected static String protectedMethod() {
  14.301 +        return "protected";
  14.302 +    }
  14.303 +
  14.304 +    public void testProtectedMethodRef() {
  14.305 +        Factory<String> sf = LambdaTranslationTest2::protectedMethod;
  14.306 +        assertEquals("protected", sf.make());
  14.307 +    }
  14.308 +
  14.309 +    class Inner1 {
  14.310 +        String m1() {
  14.311 +            return "Inner1.m1()";
  14.312 +        }
  14.313 +
  14.314 +        class Inner2 {
  14.315 +            public String m1() {
  14.316 +                return "Inner1.Inner2.m1()";
  14.317 +            }
  14.318 +
  14.319 +            protected String m2() {
  14.320 +                return "Inner1.Inner2.m2()";
  14.321 +            }
  14.322 +
  14.323 +            String m3() {
  14.324 +                return "Inner1.Inner2.m3()";
  14.325 +            }
  14.326 +
  14.327 +            class Inner3<T> {
  14.328 +                T t = null;
  14.329 +                Inner3(T t) {
  14.330 +                    this.t = t;
  14.331 +                }
  14.332 +                T m1() {
  14.333 +                    return t;
  14.334 +                }
  14.335 +            }
  14.336 +        }
  14.337 +    }
  14.338 +
  14.339 +    public void testInnerClassMethodRef() {
  14.340 +        Factory<String> fs = new Inner1()::m1;
  14.341 +        assertEquals("Inner1.m1()", fs.make());
  14.342 +
  14.343 +        fs = new Inner1().new Inner2()::m1;
  14.344 +        assertEquals("Inner1.Inner2.m1()", fs.make());
  14.345 +
  14.346 +        fs = new Inner1().new Inner2()::m2;
  14.347 +        assertEquals("Inner1.Inner2.m2()", fs.make());
  14.348 +
  14.349 +        fs = new Inner1().new Inner2()::m3;
  14.350 +        assertEquals("Inner1.Inner2.m3()", fs.make());
  14.351 +
  14.352 +        fs = new Inner1().new Inner2().new Inner3<String>("Inner1.Inner2.Inner3")::m1;
  14.353 +        assertEquals("Inner1.Inner2.Inner3", fs.make());
  14.354 +
  14.355 +        Factory<Integer> fsi = new Inner1().new Inner2().new Inner3<Integer>(100)::m1;
  14.356 +        assertEquals(100, (int)fsi.make());
  14.357 +    }
  14.358 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/test/tools/javac/lambda/lambdaExecution/TBlock.java	Tue Nov 20 09:58:55 2012 -0800
    15.3 @@ -0,0 +1,36 @@
    15.4 +/**
    15.5 + * Performs operations upon an input object which may modify that object and/or
    15.6 + * external state (other objects).
    15.7 + *
    15.8 + * <p>All block implementations are expected to:
    15.9 + * <ul>
   15.10 + * <li>When used for aggregate operations upon many elements blocks
   15.11 + * should not assume that the {@code apply} operation will be called upon
   15.12 + * elements in any specific order.</li>
   15.13 + * </ul>
   15.14 + *
   15.15 + * @param <T> The type of input objects to {@code apply}.
   15.16 + */
   15.17 +public interface TBlock<T> {
   15.18 +
   15.19 +    /**
   15.20 +     * Performs operations upon the provided object which may modify that object
   15.21 +     * and/or external state.
   15.22 +     *
   15.23 +     * @param t an input object
   15.24 +     */
   15.25 +    void apply(T t);
   15.26 +
   15.27 +    /**
   15.28 +     * Returns a Block which performs in sequence the {@code apply} methods of
   15.29 +     * multiple Blocks. This Block's {@code apply} method is performed followed
   15.30 +     * by the {@code apply} method of the specified Block operation.
   15.31 +     *
   15.32 +     * @param other an additional Block which will be chained after this Block
   15.33 +     * @return a Block which performs in sequence the {@code apply} method of
   15.34 +     * this Block and the {@code apply} method of the specified Block operation
   15.35 +     */
   15.36 +    public default TBlock<T> chain(TBlock<? super T> other) {
   15.37 +        return (T t) -> { apply(t); other.apply(t); };
   15.38 +    }
   15.39 +}

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/test/tools/javac/lambda/lambdaExecution/TMapper.java	Tue Nov 20 09:58:55 2012 -0800
    16.3 @@ -0,0 +1,68 @@
    16.4 +/*
    16.5 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    16.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.7 + *
    16.8 + * This code is free software; you can redistribute it and/or modify it
    16.9 + * under the terms of the GNU General Public License version 2 only, as
   16.10 + * published by the Free Software Foundation.  Oracle designates this
   16.11 + * particular file as subject to the "Classpath" exception as provided
   16.12 + * by Oracle in the LICENSE file that accompanied this code.
   16.13 + *
   16.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   16.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   16.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   16.17 + * version 2 for more details (a copy is included in the LICENSE file that
   16.18 + * accompanied this code).
   16.19 + *
   16.20 + * You should have received a copy of the GNU General Public License version
   16.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   16.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   16.23 + *
   16.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   16.25 + * or visit www.oracle.com if you need additional information or have any
   16.26 + * questions.
   16.27 + */
   16.28 +
   16.29 +/**
   16.30 + * Given an input object maps to an appropriate output object. A mapper may
   16.31 + * variously provide a mapping between types, object instances or keys and
   16.32 + * values or any other form of transformation upon the input.
   16.33 + *
   16.34 + * <p/>All mapper implementations are expected to:
   16.35 + * <ul>
   16.36 + *  <li>Provide stable results such that for any {@code t} the result of two
   16.37 + * {@code map} operations are always equivalent. ie.<pre>
   16.38 + * Foo one = mapper.map(a);
   16.39 + * Foo two = mapper.map(a);
   16.40 + *
   16.41 + * assert one.equals(two) && two.equals(one);
   16.42 + * </pre></li>
   16.43 + * <li>Equivalent input objects should map to equivalent output objects. ie.<pre>
   16.44 + * assert a.equals(b);  // a and b are equivalent
   16.45 + *
   16.46 + * Foo x = mapper.map(a);
   16.47 + * Foo y = mapper.map(b);
   16.48 + *
   16.49 + * assert x.equals(y); // their mapped results should be as equivalent.
   16.50 + * </pre></li>
   16.51 + * <li>The mapper should not modify the input object in any way that would
   16.52 + * change the mapping.</li>
   16.53 + * <li>When used for aggregate operations upon many elements mappers
   16.54 + * should not assume that the {@code map} operation will be called upon elements
   16.55 + * in any specific order.</li>
   16.56 + * </ul>
   16.57 + *
   16.58 + * @param <R> the type of output objects from {@code map} operation. May be the
   16.59 + * @param <T> the type of input objects provided to the {@code map} operation.
   16.60 + * same type as {@code <T>}.
   16.61 + */
   16.62 +public interface TMapper<R, T> {
   16.63 +
   16.64 +    /**
   16.65 +     * Map the provided input object to an appropriate output object.
   16.66 +     *
   16.67 +     * @param t the input object to be mapped.
   16.68 +     * @return the mapped output object.
   16.69 +     */
   16.70 +    R map(T t);
   16.71 +}

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/test/tools/javac/lambda/lambdaExecution/TPredicate.java	Tue Nov 20 09:58:55 2012 -0800
    17.3 @@ -0,0 +1,64 @@
    17.4 +/*
    17.5 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
    17.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.7 + *
    17.8 + * This code is free software; you can redistribute it and/or modify it
    17.9 + * under the terms of the GNU General Public License version 2 only, as
   17.10 + * published by the Free Software Foundation.  Oracle designates this
   17.11 + * particular file as subject to the "Classpath" exception as provided
   17.12 + * by Oracle in the LICENSE file that accompanied this code.
   17.13 + *
   17.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   17.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   17.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   17.17 + * version 2 for more details (a copy is included in the LICENSE file that
   17.18 + * accompanied this code).
   17.19 + *
   17.20 + * You should have received a copy of the GNU General Public License version
   17.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   17.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.23 + *
   17.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   17.25 + * or visit www.oracle.com if you need additional information or have any
   17.26 + * questions.
   17.27 + */
   17.28 +
   17.29 +/**
   17.30 + * Determines if the input object matches some criteria.
   17.31 + *
   17.32 + * <p>All predicate implementations are expected to:
   17.33 + * <ul>
   17.34 + *  <li>Provide stable results such that for any {@code t} the result of two
   17.35 + * {@code eval} operations are always equivalent. ie.<pre>
   17.36 + * boolean one = predicate.test(a);
   17.37 + * boolean two = predicate.test(a);
   17.38 + *
   17.39 + * assert one == two;
   17.40 + * </pre></li>
   17.41 + * <li>Equivalent input objects should map to equivalent output objects. ie.<pre>
   17.42 + * assert a.equals(b);  // a and b are equivalent
   17.43 + *
   17.44 + * boolean x = predicate.test(a);
   17.45 + * boolean y = predicate.test(ab;
   17.46 + *
   17.47 + * assert x == y; // their test results should be the same.
   17.48 + * </pre></li>
   17.49 + * <li>The predicate should not modify the input object in any way that would
   17.50 + * change the evaluation.</li>
   17.51 + * <li>When used for aggregate operations upon many elements predicates
   17.52 + * should not assume that the {@code test} operation will be called upon
   17.53 + * elements in any specific order.</li>
   17.54 + * </ul>
   17.55 + *
   17.56 + * @param <T> the type of input objects provided to {@code test}.
   17.57 + */
   17.58 +public interface TPredicate<T> {
   17.59 +
   17.60 +    /**
   17.61 +     * Return {@code true} if the input object matches some criteria.
   17.62 +     *
   17.63 +     * @param t the input object.
   17.64 +     * @return {@code true} if the input object matched some criteria.
   17.65 +     */
   17.66 +     boolean test(T t);
   17.67 +}

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestFDCCE.java	Tue Nov 20 09:58:55 2012 -0800
    18.3 @@ -0,0 +1,154 @@
    18.4 +/*
    18.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    18.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.7 + *
    18.8 + * This code is free software; you can redistribute it and/or modify it
    18.9 + * under the terms of the GNU General Public License version 2 only, as
   18.10 + * published by the Free Software Foundation.  Oracle designates this
   18.11 + * particular file as subject to the "Classpath" exception as provided
   18.12 + * by Oracle in the LICENSE file that accompanied this code.
   18.13 + *
   18.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   18.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   18.17 + * version 2 for more details (a copy is included in the LICENSE file that
   18.18 + * accompanied this code).
   18.19 + *
   18.20 + * You should have received a copy of the GNU General Public License version
   18.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   18.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.23 + *
   18.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   18.25 + * or visit www.oracle.com if you need additional information or have any
   18.26 + * questions.
   18.27 + */
   18.28 +
   18.29 +/**
   18.30 + * @test
   18.31 + * @bug 8003639
   18.32 + * @summary convert lambda testng tests to jtreg and add them
   18.33 + * @run testng MethodReferenceTestFDCCE
   18.34 + */
   18.35 +
   18.36 +import org.testng.annotations.Test;
   18.37 +import java.lang.reflect.Array;
   18.38 +
   18.39 +import static org.testng.Assert.assertEquals;
   18.40 +import static org.testng.Assert.assertTrue;
   18.41 +import static org.testng.Assert.fail;
   18.42 +
   18.43 +/**
   18.44 + * Method references and raw types.
   18.45 + * @author Robert Field
   18.46 + */
   18.47 +
   18.48 +@Test
   18.49 +@SuppressWarnings({"rawtypes", "unchecked"})
   18.50 +public class MethodReferenceTestFDCCE {
   18.51 +
   18.52 +    static void assertCCE(Throwable t) {
   18.53 +        assertEquals(t.getClass().getName(), "java.lang.ClassCastException");
   18.54 +    }
   18.55 +
   18.56 +    interface Pred<T> { boolean accept(T x); }
   18.57 +
   18.58 +    interface Ps { boolean accept(short x); }
   18.59 +
   18.60 +    interface Oo { Object too(int x); }
   18.61 +
   18.62 +    interface Reto<T> { T m(); }
   18.63 +
   18.64 +    class A {}
   18.65 +    class B extends A {}
   18.66 +
   18.67 +    static boolean isMinor(int x) {
   18.68 +        return x < 18;
   18.69 +    }
   18.70 +
   18.71 +    static boolean tst(A x) {
   18.72 +        return true;
   18.73 +    }
   18.74 +
   18.75 +    static Object otst(Object x) {
   18.76 +        return x;
   18.77 +    }
   18.78 +
   18.79 +    static boolean stst(Short x) {
   18.80 +        return x < 18;
   18.81 +    }
   18.82 +
   18.83 +    static short ritst() {
   18.84 +        return 123;
   18.85 +    }
   18.86 +
   18.87 +    public void testMethodReferenceFDPrim1() {
   18.88 +        Pred<Byte> p = MethodReferenceTestFDCCE::isMinor;
   18.89 +        Pred p2 = p;
   18.90 +        assertTrue(p2.accept((Byte)(byte)15));
   18.91 +    }
   18.92 +
   18.93 +    public void testMethodReferenceFDPrim2() {
   18.94 +        Pred<Byte> p = MethodReferenceTestFDCCE::isMinor;
   18.95 +        Pred p2 = p;
   18.96 +        assertTrue(p2.accept((byte)15));
   18.97 +    }
   18.98 +
   18.99 +    public void testMethodReferenceFDPrimICCE() {
  18.100 +        Pred<Byte> p = MethodReferenceTestFDCCE::isMinor;
  18.101 +        Pred p2 = p;
  18.102 +        try {
  18.103 +            p2.accept(15); // should throw CCE
  18.104 +            fail("Exception should have been thrown");
  18.105 +        } catch (Throwable t) {
  18.106 +            assertCCE(t);
  18.107 +        }
  18.108 +    }
  18.109 +
  18.110 +    public void testMethodReferenceFDPrimOCCE() {
  18.111 +        Pred<Byte> p = MethodReferenceTestFDCCE::isMinor;
  18.112 +        Pred p2 = p;
  18.113 +        try {
  18.114 +            p2.accept(new Object()); // should throw CCE
  18.115 +            fail("Exception should have been thrown");
  18.116 +        } catch (Throwable t) {
  18.117 +            assertCCE(t);
  18.118 +        }
  18.119 +    }
  18.120 +
  18.121 +    public void testMethodReferenceFDRef() {
  18.122 +        Pred<B> p = MethodReferenceTestFDCCE::tst;
  18.123 +        Pred p2 = p;
  18.124 +        assertTrue(p2.accept(new B()));
  18.125 +    }
  18.126 +
  18.127 +    public void testMethodReferenceFDRefCCE() {
  18.128 +        Pred<B> p = MethodReferenceTestFDCCE::tst;
  18.129 +        Pred p2 = p;
  18.130 +        try {
  18.131 +            p2.accept(new A()); // should throw CCE
  18.132 +            fail("Exception should have been thrown");
  18.133 +        } catch (Throwable t) {
  18.134 +            assertCCE(t);
  18.135 +        }
  18.136 +    }
  18.137 +
  18.138 +    public void testMethodReferenceFDPrimPrim() {
  18.139 +        Ps p = MethodReferenceTestFDCCE::isMinor;
  18.140 +        assertTrue(p.accept((byte)15));
  18.141 +    }
  18.142 +
  18.143 +    public void testMethodReferenceFDPrimBoxed() {
  18.144 +        Ps p = MethodReferenceTestFDCCE::stst;
  18.145 +        assertTrue(p.accept((byte)15));
  18.146 +    }
  18.147 +
  18.148 +    public void testMethodReferenceFDPrimRef() {
  18.149 +        Oo p = MethodReferenceTestFDCCE::otst;
  18.150 +        assertEquals(p.too(15).getClass().getName(), "java.lang.Integer");
  18.151 +    }
  18.152 +
  18.153 +    public void testMethodReferenceFDRet1() {
  18.154 +        Reto<Short> p = MethodReferenceTestFDCCE::ritst;
  18.155 +        assertEquals(p.m(), (Short)(short)123);
  18.156 +    }
  18.157 +}

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerDefault.java	Tue Nov 20 09:58:55 2012 -0800
    19.3 @@ -0,0 +1,88 @@
    19.4 +/*
    19.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    19.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.7 + *
    19.8 + * This code is free software; you can redistribute it and/or modify it
    19.9 + * under the terms of the GNU General Public License version 2 only, as
   19.10 + * published by the Free Software Foundation.  Oracle designates this
   19.11 + * particular file as subject to the "Classpath" exception as provided
   19.12 + * by Oracle in the LICENSE file that accompanied this code.
   19.13 + *
   19.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   19.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   19.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   19.17 + * version 2 for more details (a copy is included in the LICENSE file that
   19.18 + * accompanied this code).
   19.19 + *
   19.20 + * You should have received a copy of the GNU General Public License version
   19.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   19.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   19.23 + *
   19.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.25 + * or visit www.oracle.com if you need additional information or have any
   19.26 + * questions.
   19.27 + */
   19.28 +
   19.29 +/**
   19.30 + * @test
   19.31 + * @bug 8003639
   19.32 + * @summary convert lambda testng tests to jtreg and add them
   19.33 + * @run testng MethodReferenceTestInnerDefault
   19.34 + */
   19.35 +
   19.36 +import org.testng.annotations.Test;
   19.37 +
   19.38 +import static org.testng.Assert.assertEquals;
   19.39 +
   19.40 +/**
   19.41 + * @author Robert Field
   19.42 + */
   19.43 +
   19.44 +interface IDSs { String m(String a); }
   19.45 +
   19.46 +interface InDefA {
   19.47 +    default String xsA__(String s) {
   19.48 +        return "A__xsA:" + s;
   19.49 +    }
   19.50 +
   19.51 +    default String xsAB_(String s) {
   19.52 +        return "AB_xsA:" + s;
   19.53 +    }
   19.54 +
   19.55 +}
   19.56 +
   19.57 +interface InDefB extends InDefA {
   19.58 +
   19.59 +    default String xsAB_(String s) {
   19.60 +        return "AB_xsB:" + s;
   19.61 +    }
   19.62 +
   19.63 +    default String xs_B_(String s) {
   19.64 +        return "_B_xsB:" + s;
   19.65 +    }
   19.66 +}
   19.67 +
   19.68 +@Test
   19.69 +public class MethodReferenceTestInnerDefault implements InDefB {
   19.70 +
   19.71 +    public void testMethodReferenceInnerDefault() {
   19.72 +        (new In()).testMethodReferenceInnerDefault();
   19.73 +    }
   19.74 +
   19.75 +    class In {
   19.76 +
   19.77 +        public void testMethodReferenceInnerDefault() {
   19.78 +            IDSs q;
   19.79 +
   19.80 +            q = MethodReferenceTestInnerDefault.this::xsA__;
   19.81 +            assertEquals(q.m("*"), "A__xsA:*");
   19.82 +
   19.83 +            q = MethodReferenceTestInnerDefault.this::xsAB_;
   19.84 +            assertEquals(q.m("*"), "AB_xsB:*");
   19.85 +
   19.86 +            q = MethodReferenceTestInnerDefault.this::xs_B_;
   19.87 +            assertEquals(q.m("*"), "_B_xsB:*");
   19.88 +        }
   19.89 +    }
   19.90 +
   19.91 +}

    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerInstance.java	Tue Nov 20 09:58:55 2012 -0800
    20.3 @@ -0,0 +1,95 @@
    20.4 +/*
    20.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    20.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.7 + *
    20.8 + * This code is free software; you can redistribute it and/or modify it
    20.9 + * under the terms of the GNU General Public License version 2 only, as
   20.10 + * published by the Free Software Foundation.  Oracle designates this
   20.11 + * particular file as subject to the "Classpath" exception as provided
   20.12 + * by Oracle in the LICENSE file that accompanied this code.
   20.13 + *
   20.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   20.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   20.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   20.17 + * version 2 for more details (a copy is included in the LICENSE file that
   20.18 + * accompanied this code).
   20.19 + *
   20.20 + * You should have received a copy of the GNU General Public License version
   20.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   20.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   20.23 + *
   20.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   20.25 + * or visit www.oracle.com if you need additional information or have any
   20.26 + * questions.
   20.27 + */
   20.28 +
   20.29 +/**
   20.30 + * @test
   20.31 + * @bug 8003639
   20.32 + * @summary convert lambda testng tests to jtreg and add them
   20.33 + * @run testng MethodReferenceTestInnerInstance
   20.34 + */
   20.35 +
   20.36 +import org.testng.annotations.Test;
   20.37 +
   20.38 +import static org.testng.Assert.assertEquals;
   20.39 +
   20.40 +/**
   20.41 + * @author Robert Field
   20.42 + */
   20.43 +
   20.44 +@Test
   20.45 +public class MethodReferenceTestInnerInstance {
   20.46 +
   20.47 +    public void testMethodReferenceInnerInstance() {
   20.48 +        cia().cib().testMethodReferenceInstance();
   20.49 +    }
   20.50 +
   20.51 +    public void testMethodReferenceInnerExternal() {
   20.52 +        cia().cib().testMethodReferenceExternal();
   20.53 +    }
   20.54 +
   20.55 +    interface SI {
   20.56 +        String m(Integer a);
   20.57 +    }
   20.58 +
   20.59 +    class CIA {
   20.60 +
   20.61 +        String xI(Integer i) {
   20.62 +            return "xI:" + i;
   20.63 +        }
   20.64 +
   20.65 +        public class CIB {
   20.66 +
   20.67 +            public void testMethodReferenceInstance() {
   20.68 +                SI q;
   20.69 +
   20.70 +                q = CIA.this::xI;
   20.71 +                assertEquals(q.m(55), "xI:55");
   20.72 +            }
   20.73 +
   20.74 +            public void testMethodReferenceExternal() {
   20.75 +                SI q;
   20.76 +
   20.77 +                q = (new E())::xI;
   20.78 +                assertEquals(q.m(77), "ExI:77");
   20.79 +            }
   20.80 +        }
   20.81 +
   20.82 +        CIB cib() {
   20.83 +            return new CIB();
   20.84 +        }
   20.85 +
   20.86 +        class E {
   20.87 +
   20.88 +            String xI(Integer i) {
   20.89 +                return "ExI:" + i;
   20.90 +            }
   20.91 +        }
   20.92 +
   20.93 +    }
   20.94 +
   20.95 +    CIA cia() {
   20.96 +        return new CIA();
   20.97 +    }
   20.98 +}

    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInnerVarArgsThis.java	Tue Nov 20 09:58:55 2012 -0800
    21.3 @@ -0,0 +1,250 @@
    21.4 +/*
    21.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    21.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.7 + *
    21.8 + * This code is free software; you can redistribute it and/or modify it
    21.9 + * under the terms of the GNU General Public License version 2 only, as
   21.10 + * published by the Free Software Foundation.  Oracle designates this
   21.11 + * particular file as subject to the "Classpath" exception as provided
   21.12 + * by Oracle in the LICENSE file that accompanied this code.
   21.13 + *
   21.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   21.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   21.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   21.17 + * version 2 for more details (a copy is included in the LICENSE file that
   21.18 + * accompanied this code).
   21.19 + *
   21.20 + * You should have received a copy of the GNU General Public License version
   21.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   21.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   21.23 + *
   21.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   21.25 + * or visit www.oracle.com if you need additional information or have any
   21.26 + * questions.
   21.27 + */
   21.28 +
   21.29 +/**
   21.30 + * @test
   21.31 + * @bug 8003639
   21.32 + * @summary convert lambda testng tests to jtreg and add them
   21.33 + * @run testng MethodReferenceTestInnerVarArgsThis
   21.34 + */
   21.35 +
   21.36 +import org.testng.annotations.Test;
   21.37 +import java.lang.reflect.Array;
   21.38 +
   21.39 +import static org.testng.Assert.assertEquals;
   21.40 +
   21.41 +/**
   21.42 + * @author Robert Field
   21.43 + */
   21.44 +
   21.45 +@Test
   21.46 +public class MethodReferenceTestInnerVarArgsThis {
   21.47 +
   21.48 +    interface NsII {
   21.49 +
   21.50 +        String m(Integer a, Integer b);
   21.51 +    }
   21.52 +
   21.53 +    interface Nsiii {
   21.54 +
   21.55 +        String m(int a, int b, int c);
   21.56 +    }
   21.57 +
   21.58 +    interface Nsi {
   21.59 +
   21.60 +        String m(int a);
   21.61 +    }
   21.62 +
   21.63 +    interface NsaO {
   21.64 +
   21.65 +        String m(Object[] a);
   21.66 +    }
   21.67 +
   21.68 +    interface Nsai {
   21.69 +
   21.70 +        String m(int[] a);
   21.71 +    }
   21.72 +
   21.73 +    interface Nsvi {
   21.74 +
   21.75 +        String m(int... va);
   21.76 +    }
   21.77 +
   21.78 +    class CIA {
   21.79 +
   21.80 +        String xvI(Integer... vi) {
   21.81 +            StringBuilder sb = new StringBuilder("xvI:");
   21.82 +            for (Integer i : vi) {
   21.83 +                sb.append(i);
   21.84 +                sb.append("-");
   21.85 +            }
   21.86 +            return sb.toString();
   21.87 +        }
   21.88 +
   21.89 +        String xIvI(Integer f, Integer... vi) {
   21.90 +            StringBuilder sb = new StringBuilder("xIvI:");
   21.91 +            sb.append(f);
   21.92 +            for (Integer i : vi) {
   21.93 +                sb.append(i);
   21.94 +                sb.append("-");
   21.95 +            }
   21.96 +            return sb.toString();
   21.97 +        }
   21.98 +
   21.99 +        String xvi(int... vi) {
  21.100 +            int sum = 0;
  21.101 +            for (int i : vi) {
  21.102 +                sum += i;
  21.103 +            }
  21.104 +            return "xvi:" + sum;
  21.105 +        }
  21.106 +
  21.107 +        String xIvi(Integer f, int... vi) {
  21.108 +            int sum = 0;
  21.109 +            for (int i : vi) {
  21.110 +                sum += i;
  21.111 +            }
  21.112 +            return "xIvi:(" + f + ")" + sum;
  21.113 +        }
  21.114 +
  21.115 +        String xvO(Object... vi) {
  21.116 +            StringBuilder sb = new StringBuilder("xvO:");
  21.117 +            for (Object i : vi) {
  21.118 +                if (i.getClass().isArray()) {
  21.119 +                    sb.append("[");
  21.120 +                    int len = Array.getLength(i);
  21.121 +                    for (int x = 0; x < len; ++x) {
  21.122 +                        sb.append(Array.get(i, x));
  21.123 +                        sb.append(",");
  21.124 +                    }
  21.125 +                    sb.append("]");
  21.126 +
  21.127 +                } else {
  21.128 +                    sb.append(i);
  21.129 +                }
  21.130 +                sb.append("*");
  21.131 +            }
  21.132 +            return sb.toString();
  21.133 +        }
  21.134 +
  21.135 +        public class CIB {
  21.136 +
  21.137 +            // These should be processed as var args
  21.138 +            public void testVarArgsNsSuperclass() {
  21.139 +                NsII q;
  21.140 +
  21.141 +                q = CIA.this::xvO;
  21.142 +                assertEquals(q.m(55, 66), "xvO:55*66*");
  21.143 +            }
  21.144 +
  21.145 +            public void testVarArgsNsArray() {
  21.146 +                Nsai q;
  21.147 +
  21.148 +                q = CIA.this::xvO;
  21.149 +                assertEquals(q.m(new int[]{55, 66}), "xvO:[55,66,]*");
  21.150 +            }
  21.151 +
  21.152 +            public void testVarArgsNsII() {
  21.153 +                NsII q;
  21.154 +
  21.155 +                q = CIA.this::xvI;
  21.156 +                assertEquals(q.m(33, 7), "xvI:33-7-");
  21.157 +
  21.158 +                q = CIA.this::xIvI;
  21.159 +                assertEquals(q.m(50, 40), "xIvI:5040-");
  21.160 +
  21.161 +                q = CIA.this::xvi;
  21.162 +                assertEquals(q.m(100, 23), "xvi:123");
  21.163 +
  21.164 +                q = CIA.this::xIvi;
  21.165 +                assertEquals(q.m(9, 21), "xIvi:(9)21");
  21.166 +            }
  21.167 +
  21.168 +            public void testVarArgsNsiii() {
  21.169 +                Nsiii q;
  21.170 +
  21.171 +                q = CIA.this::xvI;
  21.172 +                assertEquals(q.m(3, 2, 1), "xvI:3-2-1-");
  21.173 +
  21.174 +                q = CIA.this::xIvI;
  21.175 +                assertEquals(q.m(888, 99, 2), "xIvI:88899-2-");
  21.176 +
  21.177 +                q = CIA.this::xvi;
  21.178 +                assertEquals(q.m(900, 80, 7), "xvi:987");
  21.179 +
  21.180 +                q = CIA.this::xIvi;
  21.181 +                assertEquals(q.m(333, 27, 72), "xIvi:(333)99");
  21.182 +            }
  21.183 +
  21.184 +            public void testVarArgsNsi() {
  21.185 +                Nsi q;
  21.186 +
  21.187 +                q = CIA.this::xvI;
  21.188 +                assertEquals(q.m(3), "xvI:3-");
  21.189 +
  21.190 +                q = CIA.this::xIvI;
  21.191 +                assertEquals(q.m(888), "xIvI:888");
  21.192 +
  21.193 +                q = CIA.this::xvi;
  21.194 +                assertEquals(q.m(900), "xvi:900");
  21.195 +
  21.196 +                q = CIA.this::xIvi;
  21.197 +                assertEquals(q.m(333), "xIvi:(333)0");
  21.198 +            }
  21.199 +
  21.200 +            // These should NOT be processed as var args
  21.201 +            public void testVarArgsNsaO() {
  21.202 +                NsaO q;
  21.203 +
  21.204 +                q = CIA.this::xvO;
  21.205 +                assertEquals(q.m(new String[]{"yo", "there", "dude"}), "xvO:yo*there*dude*");
  21.206 +            }
  21.207 +        }
  21.208 +
  21.209 +        CIB cib() {
  21.210 +            return new CIB();
  21.211 +        }
  21.212 +
  21.213 +        class E {
  21.214 +
  21.215 +            String xI(Integer i) {
  21.216 +                return "ExI:" + i;
  21.217 +            }
  21.218 +        }
  21.219 +    }
  21.220 +
  21.221 +    CIA cia() {
  21.222 +        return new CIA();
  21.223 +    }
  21.224 +
  21.225 +    // These should be processed as var args
  21.226 +    public void testVarArgsNsSuperclass() {
  21.227 +        cia().cib().testVarArgsNsSuperclass();
  21.228 +    }
  21.229 +
  21.230 +    public void testVarArgsNsArray() {
  21.231 +        cia().cib().testVarArgsNsArray();
  21.232 +    }
  21.233 +
  21.234 +    public void testVarArgsNsII() {
  21.235 +        cia().cib().testVarArgsNsII();
  21.236 +    }
  21.237 +
  21.238 +    public void testVarArgsNsiii() {
  21.239 +        cia().cib().testVarArgsNsiii();
  21.240 +    }
  21.241 +
  21.242 +    public void testVarArgsNsi() {
  21.243 +        cia().cib().testVarArgsNsi();
  21.244 +    }
  21.245 +
  21.246 +    // These should NOT be processed as var args
  21.247 +
  21.248 +    public void testVarArgsNsaO() {
  21.249 +        cia().cib().testVarArgsNsaO();
  21.250 +    }
  21.251 +
  21.252 +
  21.253 +}

    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestInstance.java	Tue Nov 20 09:58:55 2012 -0800
    22.3 @@ -0,0 +1,70 @@
    22.4 +/*
    22.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    22.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.7 + *
    22.8 + * This code is free software; you can redistribute it and/or modify it
    22.9 + * under the terms of the GNU General Public License version 2 only, as
   22.10 + * published by the Free Software Foundation.  Oracle designates this
   22.11 + * particular file as subject to the "Classpath" exception as provided
   22.12 + * by Oracle in the LICENSE file that accompanied this code.
   22.13 + *
   22.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   22.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   22.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   22.17 + * version 2 for more details (a copy is included in the LICENSE file that
   22.18 + * accompanied this code).
   22.19 + *
   22.20 + * You should have received a copy of the GNU General Public License version
   22.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   22.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   22.23 + *
   22.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   22.25 + * or visit www.oracle.com if you need additional information or have any
   22.26 + * questions.
   22.27 + */
   22.28 +
   22.29 +/**
   22.30 + * @test
   22.31 + * @bug 8003639
   22.32 + * @summary convert lambda testng tests to jtreg and add them
   22.33 + * @run testng MethodReferenceTestInstance
   22.34 + */
   22.35 +
   22.36 +import org.testng.annotations.Test;
   22.37 +
   22.38 +import static org.testng.Assert.assertEquals;
   22.39 +
   22.40 +/**
   22.41 + * @author Robert Field
   22.42 + */
   22.43 +
   22.44 +class MethodReferenceTestInstance_E {
   22.45 +    String xI(Integer i) {
   22.46 +        return "ExI:" + i;
   22.47 +    }
   22.48 +}
   22.49 +
   22.50 +@Test
   22.51 +public class MethodReferenceTestInstance {
   22.52 +
   22.53 +    interface SI { String m(Integer a); }
   22.54 +
   22.55 +    String xI(Integer i) {
   22.56 +        return "xI:" + i;
   22.57 +    }
   22.58 +
   22.59 +    public void testMethodReferenceInstance() {
   22.60 +        SI q;
   22.61 +
   22.62 +        q = this::xI;
   22.63 +        assertEquals(q.m(55), "xI:55");
   22.64 +    }
   22.65 +
   22.66 +    public void testMethodReferenceExternal() {
   22.67 +        SI q;
   22.68 +
   22.69 +        q = (new MethodReferenceTestInstance_E())::xI;
   22.70 +        assertEquals(q.m(77), "ExI:77");
   22.71 +    }
   22.72 +
   22.73 +}

    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java	Tue Nov 20 09:58:55 2012 -0800
    23.3 @@ -0,0 +1,194 @@
    23.4 +/*
    23.5 + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    23.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.7 + *
    23.8 + * This code is free software; you can redistribute it and/or modify it
    23.9 + * under the terms of the GNU General Public License version 2 only, as
   23.10 + * published by the Free Software Foundation.  Oracle designates this
   23.11 + * particular file as subject to the "Classpath" exception as provided
   23.12 + * by Oracle in the LICENSE file that accompanied this code.
   23.13 + *
   23.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   23.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   23.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   23.17 + * version 2 for more details (a copy is included in the LICENSE file that
   23.18 + * accompanied this code).
   23.19 + *
   23.20 + * You should have received a copy of the GNU General Public License version
   23.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   23.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   23.23 + *
   23.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   23.25 + * or visit www.oracle.com if you need additional information or have any
   23.26 + * questions.
   23.27 + */
   23.28 +
   23.29 +/**
   23.30 + * @test
   23.31 + * @bug 8003639
   23.32 + * @summary convert lambda testng tests to jtreg and add them
   23.33 + * @run testng MethodReferenceTestKinds
   23.34 + */
   23.35 +
   23.36 +import org.testng.annotations.Test;
   23.37 +
   23.38 +import static org.testng.Assert.assertEquals;
   23.39 +
   23.40 +/**
   23.41 + * @author Robert Field
   23.42 + */
   23.43 +
   23.44 +@Test
   23.45 +public class MethodReferenceTestKinds extends MethodReferenceTestKindsSup {
   23.46 +
   23.47 +    interface S0 { String get(); }
   23.48 +    interface S1 { String get(MethodReferenceTestKinds x); }
   23.49 +    interface S2 { String get(MethodReferenceTestKinds x, MethodReferenceTestKinds y); }
   23.50 +
   23.51 +    interface SXN0 { MethodReferenceTestKindsBase make(MethodReferenceTestKinds x); }
   23.52 +    interface SXN1 { MethodReferenceTestKindsBase make(MethodReferenceTestKinds x, String str); }
   23.53 +
   23.54 +    interface SN0 { MethodReferenceTestKindsBase make(); }
   23.55 +    interface SN1 { MethodReferenceTestKindsBase make(String x); }
   23.56 +
   23.57 +    class In extends MethodReferenceTestKindsBase {
   23.58 +        In(String val) {
   23.59 +            this.val = val;
   23.60 +        }
   23.61 +
   23.62 +        In() {
   23.63 +            this("blank");
   23.64 +        }
   23.65 +    }
   23.66 +
   23.67 +    String instanceMethod0() { return "IM:0-" + this; }
   23.68 +    String instanceMethod1(MethodReferenceTestKinds x) { return "IM:1-" + this + x; }
   23.69 +
   23.70 +    static String staticMethod0() { return "SM:0"; }
   23.71 +    static String staticMethod1(MethodReferenceTestKinds x) { return "SM:1-" + x; }
   23.72 +
   23.73 +    MethodReferenceTestKinds(String val) {
   23.74 +        super(val);
   23.75 +    }
   23.76 +
   23.77 +    MethodReferenceTestKinds() {
   23.78 +        super("blank");
   23.79 +    }
   23.80 +
   23.81 +    MethodReferenceTestKinds inst(String val) {
   23.82 +        return new MethodReferenceTestKinds(val);
   23.83 +    }
   23.84 +
   23.85 +    public void testMRBound() {
   23.86 +        S0 var = this::instanceMethod0;
   23.87 +        assertEquals(var.get(), "IM:0-MethodReferenceTestKinds(blank)");
   23.88 +    }
   23.89 +
   23.90 +    public void testMRBoundArg() {
   23.91 +        S1 var = this::instanceMethod1;
   23.92 +        assertEquals(var.get(inst("arg")), "IM:1-MethodReferenceTestKinds(blank)MethodReferenceTestKinds(arg)");
   23.93 +    }
   23.94 +
   23.95 +    public void testMRUnbound() {
   23.96 +        S1 var = MethodReferenceTestKinds::instanceMethod0;
   23.97 +        assertEquals(var.get(inst("rcvr")), "IM:0-MethodReferenceTestKinds(rcvr)");
   23.98 +    }
   23.99 +
  23.100 +    public void testMRUnboundArg() {
  23.101 +        S2 var = MethodReferenceTestKinds::instanceMethod1;
  23.102 +        assertEquals(var.get(inst("rcvr"), inst("arg")), "IM:1-MethodReferenceTestKinds(rcvr)MethodReferenceTestKinds(arg)");
  23.103 +    }
  23.104 +
  23.105 +    public void testMRSuper() {
  23.106 +        S0 var = super::instanceMethod0;
  23.107 +        assertEquals(var.get(), "SIM:0-MethodReferenceTestKinds(blank)");
  23.108 +    }
  23.109 +
  23.110 +    public void testMRSuperArg() {
  23.111 +        S1 var = super::instanceMethod1;
  23.112 +        assertEquals(var.get(inst("arg")), "SIM:1-MethodReferenceTestKinds(blank)MethodReferenceTestKinds(arg)");
  23.113 +    }
  23.114 +
  23.115 +    public void testMRStatic() {
  23.116 +        S0 var = MethodReferenceTestKinds::staticMethod0;
  23.117 +        assertEquals(var.get(), "SM:0");
  23.118 +    }
  23.119 +
  23.120 +    public void testMRStaticArg() {
  23.121 +        S1 var = MethodReferenceTestKinds::staticMethod1;
  23.122 +        assertEquals(var.get(inst("arg")), "SM:1-MethodReferenceTestKinds(arg)");
  23.123 +    }
  23.124 +
  23.125 +    public void testMRStaticEval() {
  23.126 +        MethodReferenceTestKinds evalCheck;
  23.127 +        S0 var = (evalCheck = inst("discard"))::staticMethod0;
  23.128 +        assertEquals(evalCheck.toString(), "MethodReferenceTestKinds(discard)");
  23.129 +        assertEquals(var.get(), "SM:0");
  23.130 +    }
  23.131 +
  23.132 +    public void testMRStaticEvalArg() {
  23.133 +        MethodReferenceTestKinds evalCheck;
  23.134 +        S1 var = (evalCheck = inst("discard"))::staticMethod1;
  23.135 +        assertEquals(evalCheck.toString(), "MethodReferenceTestKinds(discard)");
  23.136 +        assertEquals(var.get(inst("arg")), "SM:1-MethodReferenceTestKinds(arg)");
  23.137 +    }
  23.138 +
  23.139 +    public void testMRTopLevel() {
  23.140 +        SN0 var = MethodReferenceTestKindsBase::new;
  23.141 +        assertEquals(var.make().toString(), "MethodReferenceTestKindsBase(blank)");
  23.142 +    }
  23.143 +
  23.144 +    public void testMRTopLevelArg() {
  23.145 +        SN1 var = MethodReferenceTestKindsBase::new;
  23.146 +        assertEquals(var.make("name").toString(), "MethodReferenceTestKindsBase(name)");
  23.147 +    }
  23.148 +/* unbound inner case not supported anymore (dropped by EG)
  23.149 +    public void testMRUnboundInner() {
  23.150 +        SXN0 var = MethodReferenceTestKinds.In::new;
  23.151 +        assertEquals(var.make(inst("out")).toString(), "In(blank)");
  23.152 +    }
  23.153 +
  23.154 +   public void testMRUnboundInnerArg() {
  23.155 +        SXN1 var = MethodReferenceTestKinds.In::new;
  23.156 +        assertEquals(var.make(inst("out"), "name").toString(), "In(name)");
  23.157 +    }
  23.158 +*/
  23.159 +    public void testMRImplicitInner() {
  23.160 +        SN0 var = MethodReferenceTestKinds.In::new;
  23.161 +        assertEquals(var.make().toString(), "In(blank)");
  23.162 +    }
  23.163 +
  23.164 +    public void testMRImplicitInnerArg() {
  23.165 +        SN1 var = MethodReferenceTestKinds.In::new;
  23.166 +        assertEquals(var.make("name").toString(), "In(name)");
  23.167 +    }
  23.168 +
  23.169 +}
  23.170 +
  23.171 +
  23.172 +class MethodReferenceTestKindsBase {
  23.173 +    String val = "unset";
  23.174 +
  23.175 +    public String toString() {
  23.176 +        return getClass().getSimpleName() + "(" + val + ")";
  23.177 +    }
  23.178 +
  23.179 +    MethodReferenceTestKindsBase(String val) {
  23.180 +        this.val = val;
  23.181 +    }
  23.182 +
  23.183 +    MethodReferenceTestKindsBase() {
  23.184 +        this("blank");
  23.185 +    }
  23.186 +
  23.187 +}
  23.188 +
  23.189 +class MethodReferenceTestKindsSup extends MethodReferenceTestKindsBase {
  23.190 +    String instanceMethod0() { return "SIM:0-" + this; }
  23.191 +    String instanceMethod1(MethodReferenceTestKinds x) { return "SIM:1-" + this + x; }
  23.192 +
  23.193 +    MethodReferenceTestKindsSup(String val) {
  23.194 +        super(val);
  23.195 +    }
  23.196 +
  23.197 +}

    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNew.java	Tue Nov 20 09:58:55 2012 -0800
    24.3 @@ -0,0 +1,138 @@
    24.4 +/*
    24.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    24.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.7 + *
    24.8 + * This code is free software; you can redistribute it and/or modify it
    24.9 + * under the terms of the GNU General Public License version 2 only, as
   24.10 + * published by the Free Software Foundation.  Oracle designates this
   24.11 + * particular file as subject to the "Classpath" exception as provided
   24.12 + * by Oracle in the LICENSE file that accompanied this code.
   24.13 + *
   24.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   24.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   24.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   24.17 + * version 2 for more details (a copy is included in the LICENSE file that
   24.18 + * accompanied this code).
   24.19 + *
   24.20 + * You should have received a copy of the GNU General Public License version
   24.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   24.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   24.23 + *
   24.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   24.25 + * or visit www.oracle.com if you need additional information or have any
   24.26 + * questions.
   24.27 + */
   24.28 +
   24.29 +/**
   24.30 + * @test
   24.31 + * @bug 8003639
   24.32 + * @summary convert lambda testng tests to jtreg and add them
   24.33 + * @run testng MethodReferenceTestNew
   24.34 + */
   24.35 +
   24.36 +import org.testng.annotations.Test;
   24.37 +
   24.38 +import static org.testng.Assert.assertEquals;
   24.39 +
   24.40 +/**
   24.41 + * @author Robert Field
   24.42 + */
   24.43 +
   24.44 +@Test
   24.45 +public class MethodReferenceTestNew {
   24.46 +
   24.47 +    interface M0<T> {
   24.48 +
   24.49 +        T m();
   24.50 +    }
   24.51 +
   24.52 +    static class N0 {
   24.53 +
   24.54 +        N0() {
   24.55 +        }
   24.56 +    }
   24.57 +
   24.58 +    interface M1<T> {
   24.59 +
   24.60 +        T m(Integer a);
   24.61 +    }
   24.62 +
   24.63 +    static class N1 {
   24.64 +
   24.65 +        int i;
   24.66 +
   24.67 +        N1(int i) {
   24.68 +            this.i = i;
   24.69 +        }
   24.70 +    }
   24.71 +
   24.72 +    interface M2<T> {
   24.73 +
   24.74 +        T m(Integer n, String o);
   24.75 +    }
   24.76 +
   24.77 +    static class N2 {
   24.78 +
   24.79 +        Number n;
   24.80 +        Object o;
   24.81 +
   24.82 +        N2(Number n, Object o) {
   24.83 +            this.n = n;
   24.84 +            this.o = o;
   24.85 +        }
   24.86 +
   24.87 +        public String toString() {
   24.88 +            return "N2(" + n + "," + o + ")";
   24.89 +        }
   24.90 +    }
   24.91 +
   24.92 +    interface MV {
   24.93 +
   24.94 +        NV m(Integer ai, int i);
   24.95 +    }
   24.96 +
   24.97 +    static class NV {
   24.98 +
   24.99 +        int i;
  24.100 +
  24.101 +        NV(int... v) {
  24.102 +            i = 0;
  24.103 +            for (int x : v) {
  24.104 +                i += x;
  24.105 +            }
  24.106 +        }
  24.107 +
  24.108 +        public String toString() {
  24.109 +            return "NV(" + i + ")";
  24.110 +        }
  24.111 +    }
  24.112 +
  24.113 +    public void testConstructorReference0() {
  24.114 +        M0<N0> q;
  24.115 +
  24.116 +        q = N0::new;
  24.117 +        assertEquals(q.m().getClass().getSimpleName(), "N0");
  24.118 +    }
  24.119 +
  24.120 +    public void testConstructorReference1() {
  24.121 +        M1<N1> q;
  24.122 +
  24.123 +        q = N1::new;
  24.124 +        assertEquals(q.m(14).getClass().getSimpleName(), "N1");
  24.125 +    }
  24.126 +
  24.127 +    public void testConstructorReference2() {
  24.128 +        M2<N2> q;
  24.129 +
  24.130 +        q = N2::new;
  24.131 +        assertEquals(q.m(7, "hi").toString(), "N2(7,hi)");
  24.132 +    }
  24.133 +
  24.134 +    public void testConstructorReferenceVarArgs() {
  24.135 +        MV q;
  24.136 +
  24.137 +        q = NV::new;
  24.138 +        assertEquals(q.m(5, 45).toString(), "NV(50)");
  24.139 +    }
  24.140 +
  24.141 +}

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestNewInner.java	Tue Nov 20 09:58:55 2012 -0800
    25.3 @@ -0,0 +1,157 @@
    25.4 +/*
    25.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    25.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.7 + *
    25.8 + * This code is free software; you can redistribute it and/or modify it
    25.9 + * under the terms of the GNU General Public License version 2 only, as
   25.10 + * published by the Free Software Foundation.  Oracle designates this
   25.11 + * particular file as subject to the "Classpath" exception as provided
   25.12 + * by Oracle in the LICENSE file that accompanied this code.
   25.13 + *
   25.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   25.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   25.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   25.17 + * version 2 for more details (a copy is included in the LICENSE file that
   25.18 + * accompanied this code).
   25.19 + *
   25.20 + * You should have received a copy of the GNU General Public License version
   25.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   25.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   25.23 + *
   25.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   25.25 + * or visit www.oracle.com if you need additional information or have any
   25.26 + * questions.
   25.27 + */
   25.28 +
   25.29 +/**
   25.30 + * @test
   25.31 + * @bug 8003639
   25.32 + * @summary convert lambda testng tests to jtreg and add them
   25.33 + * @run testng MethodReferenceTestNewInner
   25.34 + */
   25.35 +
   25.36 +import org.testng.annotations.Test;
   25.37 +
   25.38 +import static org.testng.Assert.assertEquals;
   25.39 +
   25.40 +/**
   25.41 + * @author Robert Field
   25.42 + */
   25.43 +
   25.44 +@Test
   25.45 +public class MethodReferenceTestNewInner {
   25.46 +
   25.47 +    String note = "NO NOTE";
   25.48 +
   25.49 +    interface M0<T> {
   25.50 +
   25.51 +        T m();
   25.52 +    }
   25.53 +
   25.54 +    interface MP<T> {
   25.55 +
   25.56 +        T m(MethodReferenceTestNewInner m);
   25.57 +    }
   25.58 +
   25.59 +    class N0 {
   25.60 +
   25.61 +        N0() {
   25.62 +        }
   25.63 +    }
   25.64 +
   25.65 +    interface M1<T> {
   25.66 +
   25.67 +        T m(Integer a);
   25.68 +    }
   25.69 +
   25.70 +    class N1 {
   25.71 +
   25.72 +        int i;
   25.73 +
   25.74 +        N1(int i) {
   25.75 +            this.i = i;
   25.76 +        }
   25.77 +    }
   25.78 +
   25.79 +    interface M2<T> {
   25.80 +
   25.81 +        T m(Integer n, String o);
   25.82 +    }
   25.83 +
   25.84 +    class N2 {
   25.85 +
   25.86 +        Number n;
   25.87 +        Object o;
   25.88 +
   25.89 +        N2(Number n, Object o) {
   25.90 +            this.n = n;
   25.91 +            this.o = o;
   25.92 +        }
   25.93 +
   25.94 +        public String toString() {
   25.95 +            return note + ":N2(" + n + "," + o + ")";
   25.96 +        }
   25.97 +    }
   25.98 +
   25.99 +    interface MV {
  25.100 +
  25.101 +        NV m(Integer ai, int i);
  25.102 +    }
  25.103 +
  25.104 +    class NV {
  25.105 +
  25.106 +        int i;
  25.107 +
  25.108 +        NV(int... v) {
  25.109 +            i = 0;
  25.110 +            for (int x : v) {
  25.111 +                i += x;
  25.112 +            }
  25.113 +        }
  25.114 +
  25.115 +        public String toString() {
  25.116 +            return note + ":NV(" + i + ")";
  25.117 +        }
  25.118 +    }
  25.119 +
  25.120 +/* unbound constructor case not supported anymore (dropped by EG)
  25.121 +    public static void testConstructorReferenceP() {
  25.122 +        MP<N0> q;
  25.123 +
  25.124 +        q = N0::new;
  25.125 +        assertEquals(q.m(new MethodReferenceTestNewInner()).getClass().getSimpleName(), "N0");
  25.126 +    }
  25.127 +*/
  25.128 +    public void testConstructorReference0() {
  25.129 +        M0<N0> q;
  25.130 +
  25.131 +        q = N0::new;
  25.132 +        assertEquals(q.m().getClass().getSimpleName(), "N0");
  25.133 +    }
  25.134 +
  25.135 +    public void testConstructorReference1() {
  25.136 +        M1<N1> q;
  25.137 +
  25.138 +        q = N1::new;
  25.139 +        assertEquals(q.m(14).getClass().getSimpleName(), "N1");
  25.140 +    }
  25.141 +
  25.142 +    public void testConstructorReference2() {
  25.143 +        M2<N2> q;
  25.144 +
  25.145 +        note = "T2";
  25.146 +        q = N2::new;
  25.147 +        assertEquals(q.m(7, "hi").toString(), "T2:N2(7,hi)");
  25.148 +    }
  25.149 +
  25.150 +    /***
  25.151 +    public void testConstructorReferenceVarArgs() {
  25.152 +        MV q;
  25.153 +
  25.154 +        note = "TVA";
  25.155 +        q = NV::new;
  25.156 +        assertEquals(q.m(5, 45).toString(), "TNV:NV(50)");
  25.157 +    }
  25.158 +    ***/
  25.159 +
  25.160 +}

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java	Tue Nov 20 09:58:55 2012 -0800
    26.3 @@ -0,0 +1,54 @@
    26.4 +/*
    26.5 + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    26.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.7 + *
    26.8 + * This code is free software; you can redistribute it and/or modify it
    26.9 + * under the terms of the GNU General Public License version 2 only, as
   26.10 + * published by the Free Software Foundation.  Oracle designates this
   26.11 + * particular file as subject to the "Classpath" exception as provided
   26.12 + * by Oracle in the LICENSE file that accompanied this code.
   26.13 + *
   26.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   26.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   26.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   26.17 + * version 2 for more details (a copy is included in the LICENSE file that
   26.18 + * accompanied this code).
   26.19 + *
   26.20 + * You should have received a copy of the GNU General Public License version
   26.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   26.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   26.23 + *
   26.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   26.25 + * or visit www.oracle.com if you need additional information or have any
   26.26 + * questions.
   26.27 + */
   26.28 +
   26.29 +/**
   26.30 + * @test
   26.31 + * @bug 8003639
   26.32 + * @summary convert lambda testng tests to jtreg and add them
   26.33 + * @run testng MethodReferenceTestSueCase1
   26.34 + */
   26.35 +
   26.36 +import org.testng.annotations.Test;
   26.37 +
   26.38 +import static org.testng.Assert.assertEquals;
   26.39 +
   26.40 +/**
   26.41 + * @author Robert Field
   26.42 + */
   26.43 +
   26.44 +@Test
   26.45 +public class MethodReferenceTestSueCase1 {
   26.46 +
   26.47 +    public interface Sam2<T> { public String get(T target, String s); }
   26.48 +
   26.49 +    String instanceMethod(String s) { return "2"; }
   26.50 +    Sam2<MethodReferenceTestSueCase1> var = MethodReferenceTestSueCase1::instanceMethod;
   26.51 +
   26.52 +    String m() {  return var.get(new MethodReferenceTestSueCase1(), ""); }
   26.53 +
   26.54 +    public void testSueCase1() {
   26.55 +        assertEquals(m(), "2");
   26.56 +    }
   26.57 +}