author | akulyakh |
Thu, 21 May 2015 11:41:04 -0700 | |
changeset 30730 | d3ce7619db2c |
parent 27319 | 030080f03e4f |
permissions | -rw-r--r-- |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
1 |
/* |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27319
diff
changeset
|
2 |
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
4 |
* |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
8 |
* |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
13 |
* accompanied this code). |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
14 |
* |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
18 |
* |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
21 |
* questions. |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
22 |
*/ |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
23 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
24 |
/* |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
25 |
* @test |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
26 |
* @bug 8011383 |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
27 |
* @summary Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27319
diff
changeset
|
28 |
* @modules jdk.compiler/com.sun.tools.javac.util |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
29 |
*/ |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
30 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
31 |
import java.io.File; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
32 |
import java.io.IOException; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
33 |
import java.util.Arrays; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
34 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
35 |
import javax.lang.model.element.*; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
36 |
import javax.tools.JavaCompiler; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
37 |
import javax.tools.JavaFileObject; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
38 |
import javax.tools.StandardJavaFileManager; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
39 |
import javax.tools.ToolProvider; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
40 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
41 |
import com.sun.source.util.JavacTask; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
42 |
import com.sun.source.util.TaskEvent; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
43 |
import com.sun.source.util.TaskListener; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
44 |
import com.sun.tools.javac.util.Assert; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
45 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
46 |
public class DefaultMethodFlags { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
47 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
48 |
public static void main(String[] args) throws IOException { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
49 |
new DefaultMethodFlags().run(args); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
50 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
51 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
52 |
void run(String[] args) throws IOException { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
53 |
checkDefaultMethodFlags(); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
54 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
55 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
56 |
void checkDefaultMethodFlags() throws IOException { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
57 |
JavaCompiler c = ToolProvider.getSystemJavaCompiler(); |
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
58 |
try (StandardJavaFileManager fm = c.getStandardFileManager(null, null, null)) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
59 |
Iterable<? extends JavaFileObject> fos = |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
60 |
fm.getJavaFileObjectsFromFiles( |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
61 |
Arrays.asList(new File( |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
62 |
System.getProperty("test.src"), |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
63 |
this.getClass().getSimpleName() + ".java"))); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
64 |
JavacTask task = (JavacTask) c.getTask(null, fm, null, null, null, fos); |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
65 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
66 |
task.addTaskListener(new TaskListener() { |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
67 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
68 |
@Override |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
69 |
public void started(TaskEvent e) {} |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
70 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
71 |
@Override |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
72 |
public void finished(TaskEvent e) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
73 |
if (e.getKind() == TaskEvent.Kind.ANALYZE) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
74 |
TypeElement te = e.getTypeElement(); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
75 |
if (te.getSimpleName().toString().equals("I")) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
76 |
checkDefaultInterface(te); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
77 |
} |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
78 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
79 |
} |
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
80 |
}); |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
81 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
82 |
task.analyze(); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
16970
diff
changeset
|
83 |
} |
16970
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
84 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
85 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
86 |
void checkDefaultInterface(TypeElement te) { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
87 |
System.err.println("Checking " + te.getSimpleName()); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
88 |
Assert.check(te.getModifiers().contains(Modifier.ABSTRACT)); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
89 |
for (Element e : te.getEnclosedElements()) { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
90 |
if (e.getSimpleName().toString().matches("(\\w)_(default|static|abstract)")) { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
91 |
boolean abstractExpected = false; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
92 |
String methodKind = e.getSimpleName().toString().substring(2); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
93 |
switch (methodKind) { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
94 |
case "default": |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
95 |
case "static": |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
96 |
break; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
97 |
case "abstract": |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
98 |
abstractExpected = true; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
99 |
break; |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
100 |
default: |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
101 |
Assert.error("Cannot get here!" + methodKind); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
102 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
103 |
Assert.check(e.getModifiers().contains(Modifier.ABSTRACT) == abstractExpected); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
104 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
105 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
106 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
107 |
} |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
108 |
|
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
109 |
interface I { |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
110 |
default void m_default() { } |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
111 |
static void m_static() { } |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
112 |
void m_abstract(); |
0967fa88590b
8011383: Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
mcimadamore
parents:
diff
changeset
|
113 |
} |