1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
/*
* Copyright (c) 2017, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 8174243
* @summary incorrect error message for nested service provider
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
* @run main WrongErrorMessageForNestedServiceProviderTest
*/
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.ToolBox;
public class WrongErrorMessageForNestedServiceProviderTest extends ModuleTestBase {
public static void main(String... args) throws Exception {
WrongErrorMessageForNestedServiceProviderTest t = new WrongErrorMessageForNestedServiceProviderTest();
t.runTests();
}
private static final String twoServicesModuleDef =
"module m {\n" +
" exports example;\n" +
" provides example.SomeService with example.ServiceImpl;\n" +
" provides example.SomeServiceOuter with example.Outer.ServiceImplOuter;\n" +
"}";
private static final String someServiceInt =
"package example;\n" +
"public interface SomeService {\n" +
" public void foo();\n" +
"}";
private static final String someServiceIntOuter =
"package example;\n" +
"public interface SomeServiceOuter {\n" +
" public void foo();\n" +
"}";
@Test
public void testPositive(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
twoServicesModuleDef,
someServiceInt,
someServiceIntOuter,
"package example;\n" +
"public class ServiceImpl implements example.SomeService {\n" +
" public ServiceImpl() {}\n" +
" public void foo() {}\n" +
"}",
"package example;\n" +
"class Outer {\n" +
" public static class ServiceImplOuter implements example.SomeServiceOuter {\n" +
" public ServiceImplOuter() {}\n" +
" public void foo() {}\n" +
" }\n" +
"}");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> output = new JavacTask(tb)
.outdir(classes)
.options("-Werror", "-XDrawDiagnostics")
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList("");
if (!output.containsAll(expected)) {
throw new Exception("Expected output not found");
}
}
@Test
public void testNegative(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
twoServicesModuleDef,
someServiceInt,
someServiceIntOuter,
"package example;\n" +
"class ServiceImpl implements example.SomeService {\n" +
" public ServiceImpl() {}\n" +
" public void foo() {}\n" +
"}",
"package example;\n" +
"class Outer {\n" +
" static class ServiceImplOuter implements example.SomeServiceOuter {\n" +
" public ServiceImplOuter() {}\n" +
" public void foo() {}\n" +
" }\n" +
"}");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> output = new JavacTask(tb)
.outdir(classes)
.options("-Werror", "-XDrawDiagnostics")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList(
"module-info.java:3:46: compiler.err.not.def.public: example.ServiceImpl, example",
"module-info.java:4:57: compiler.err.not.def.public: example.Outer.ServiceImplOuter, example.Outer",
"2 errors");
if (!output.containsAll(expected)) {
throw new Exception("Expected output not found");
}
}
@Test
public void testClassWrappedByPrivateClass(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"module m {\n" +
" exports example;\n" +
" provides example.SomeServiceOuter with example.Outer1.Outer2.ServiceImplOuter;\n" +
"}",
someServiceIntOuter,
"package example;\n" +
"class Outer1 {\n" +
" static private class Outer2 {\n" +
" public static class ServiceImplOuter implements example.SomeServiceOuter {\n" +
" public ServiceImplOuter() {}\n" +
" public void foo() {}\n" +
" }\n" +
" }\n" +
"}");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> output = new JavacTask(tb)
.outdir(classes)
.options("-Werror", "-XDrawDiagnostics")
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList("");
if (!output.containsAll(expected)) {
throw new Exception("Expected output not found");
}
}
}
|
