jdk-sandbox: comparison test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java

equal deleted inserted replaced

-:88502b1cf76f
+:7799a51dbe30
 /*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 * @modules jdk.jdeps/com.sun.tools.classfile
 */
 import com.sun.tools.classfile.*;
 import java.io.File;
+import java.util.List;
 public class CombinationsTargetTest2 extends ClassfileTestHelper {
+private static final String JDK_VERSION =
+Integer.toString(Runtime.getRuntime().version().feature());
 // Test count helps identify test case in event of failure.
 int testcount = 0;
 // Base test case template descriptions;true==annotations in code attribute.
 src3("(repeating) type annotations on type parameters of class, method return value in method", true),
 src4("(repeating) type annotations on field in anonymous class", false),
 src5("(repeating) type annotations on field in anonymous class", false),
 src6("(repeating) type annotations on void method declaration", false),
 src7("(repeating) type annotations in use of instanceof", true),
-src8("(repeating) type annotations in use of instanceof in method", true);
+src7p("(repeating) type annotations in use of instanceof with type test pattern", true),
+src8("(repeating) type annotations in use of instanceof in method", true),
+src8p("(repeating) type annotations in use of instanceof with type test pattern in method", true);
 String description;
 Boolean local;
 srce(String desc, Boolean b) {
 test( 0, 2, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src5);
 test( 0, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src6);
 test( 0, 0, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src6);
 test( 2, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src7);
 test( 0, 2, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src7);
+test( 2, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src7p);
+test( 0, 2, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src7p);
 test( 4, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src8);
 test( 0, 4, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src8);
+test( 4, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src8p);
+test( 0, 4, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src8p);
 break;
 case "FIELD":
 test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS",   et, ++testrun, srce.src1);
 test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS",   et, ++testrun, srce.src2);
 test( 6, 0, 0, 0, As, BDs, ABMix, "CLASS",   et, ++testrun, srce.src3);
 ++testcount;
 expected_tvisibles = tvis;
 expected_tinvisibles = tinv;
 expected_visibles = vis;
 expected_invisibles = inv;
+extraOptions = List.of();
 File testFile = null;
 String tname="Test" + N.toString();
 hasInnerClass=false;
 String testDef = "Test " + testcount + " parameters: tinv=" + tinv +
 ", tvis=" + tvis + ", inv=" + inv + ", vis=" + vis +
 "    boolean dataIsString = ( data instanceof _As_ _Bs_ String);\n" +
 "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
 "\n\n";
 hasInnerClass=false;
 break;
+case src7p: // (repeating) type annotations in use of instanceof with type test pattern
+/*
+*   class Test10{
+*       String data = "test";
+*       boolean dataIsString = ( data instanceof @A @B @A @B String str);
+*   }
+*/
+source = new String( source +
+"// " + src.description + "\n" +
+"class "+ testname + "{\n" +
+"    String data = \"test\";\n" +
+"    boolean dataIsString = ( data instanceof _As_ _Bs_ String str && str.isEmpty());\n" +
+"}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+"\n\n";
+extraOptions = List.of("--enable-preview",
+"-source", JDK_VERSION);
+hasInnerClass=false;
+break;
 case src8: // (repeating) type annotations in use of instanceof
 /*
 *   class Test20{
 *       String data = "test";
 *       Boolean isString() {
 "    }\n" +
 "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
 "\n\n";
 hasInnerClass=false;
 break;
+case src8p: // (repeating) type annotations in use of instanceof with type test pattern
+/*
+*   class Test20{
+*       String data = "test";
+*       Boolean isString() {
+*           if( data instanceof @A @B @A @B String )
+*               return true;
+*           else
+*               return( data instanceof @A @B @A @B String );
+*       }
+*   }
+*/
+source = new String( source +
+"// " + src.description + "\n" +
+"class "+ testname + "{\n" +
+"    String data = \"test\";\n" +
+"    Boolean isString() { \n" +
+"        if( data instanceof _As_ _Bs_ String str)\n" +
+"            return true;\n" +
+"        else\n" +
+"            return( data instanceof _As_ _Bs_ String str && str.isEmpty());\n" +
+"    }\n" +
+"}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+"\n\n";
+extraOptions = List.of("--enable-preview",
+"-source", JDK_VERSION);
+hasInnerClass=false;
+break;
 }
 return imports + source;
 }
 }

changeset 59285	7799a51dbe30
parent 47216	71c04702a3d5