changeset 50901:8367c588a717 condy-folding

manual merge with branch jep-334
author vromero
date Thu, 31 May 2018 05:53:45 -0700
parents 9afb4b449a76 a33890943673
children 80c69f5cd21a
files test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java test/langtools/jdk/jshell/TypeNameTest.java test/langtools/tools/javac/T8187978/FilterOutCandidatesForDiagnosticsTest.out test/langtools/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out test/langtools/tools/javac/lvti/harness/NonDenotableTest.java test/langtools/tools/javac/varargs/6806876/T6806876.out
diffstat 2 files changed, 21 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/langtools/jdk/javadoc/doclet/lib/JavadocTester.java	Thu May 31 14:53:14 2018 +0200
+++ b/test/langtools/jdk/javadoc/doclet/lib/JavadocTester.java	Thu May 31 05:53:45 2018 -0700
@@ -522,7 +522,9 @@
                         + stringToFind);
             } else {
                 failed(path + ": following text " + (isFound ? "found:" : "not found:") + "\n"
-                        + stringToFind);
+                        + stringToFind + '\n' +
+                        "found \n" +
+                        fileString);
             }
         }
     }
--- a/test/langtools/jdk/jshell/TypeNameTest.java	Thu May 31 14:53:14 2018 +0200
+++ b/test/langtools/jdk/jshell/TypeNameTest.java	Thu May 31 05:53:45 2018 -0700
@@ -192,7 +192,24 @@
         assertType("arrayOf(99)[0]", "Integer");
 
         assertEval("<Z> Z choose(Z z1, Z z2) { return z1; }");
-        assertType("choose(1, 1L);", "Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.Constable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<? extends Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.Constable<? extends Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.Constable<?>>", "Object");
+        assertType("choose(1, 1L);",
+                "Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<?>" +
+                "&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<? extends Number&Comparable<?>" +
+                "&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.Constable<? extends Number&Comparable<?>" +
+                "&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>" +
+                "&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.ConstantDesc" +
+                "<? extends Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>" +
+                "&java.lang.invoke.constant.Constable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>" +
+                "&java.lang.invoke.constant.Constable<?>>>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable" +
+                "<? extends Number&Comparable<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>" +
+                "&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>>" +
+                "&java.lang.invoke.constant.Constable<? extends Number&Comparable<? extends Number&Comparable<?>" +
+                "&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<?>&java.lang.invoke.constant.ConstantDesc<?>" +
+                "&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.Constable<?>>" +
+                "&java.lang.invoke.constant.ConstantDesc<? extends Number&Comparable<? extends Number&Comparable<?>" +
+                "&java.lang.invoke.constant.ConstantDesc<?>&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.ConstantDesc<?>" +
+                "&java.lang.invoke.constant.Constable<?>>&java.lang.invoke.constant.Constable<?>>",
+                "Object");
     }
 
     public void testVariableTypeName() {