equal
deleted
inserted
replaced
134 anno_proc2, |
134 anno_proc2, |
135 annotationProcessorModule2, |
135 annotationProcessorModule2, |
136 annotationProcessor2); |
136 annotationProcessor2); |
137 |
137 |
138 String log = new JavacTask(tb) |
138 String log = new JavacTask(tb) |
139 .options("-modulesourcepath", moduleSrc.toString()) |
139 .options("--module-source-path", moduleSrc.toString()) |
140 .outdir(processorCompiledModules) |
140 .outdir(processorCompiledModules) |
141 .files(findJavaFiles(moduleSrc)) |
141 .files(findJavaFiles(moduleSrc)) |
142 .run() |
142 .run() |
143 .writeAll() |
143 .writeAll() |
144 .getOutput(Task.OutputKind.DIRECT); |
144 .getOutput(Task.OutputKind.DIRECT); |
157 |
157 |
158 @Test |
158 @Test |
159 public void testUseOnlyOneProcessor(Path base) throws Exception { |
159 public void testUseOnlyOneProcessor(Path base) throws Exception { |
160 initialization(base); |
160 initialization(base); |
161 String log = new JavacTask(tb) |
161 String log = new JavacTask(tb) |
162 .options("-processormodulepath", processorCompiledModules.toString(), |
162 .options("--processor-module-path", processorCompiledModules.toString(), |
163 "-processor", "mypkg2.MyProcessor2") |
163 "-processor", "mypkg2.MyProcessor2") |
164 .outdir(classes) |
164 .outdir(classes) |
165 .sources(testClass) |
165 .sources(testClass) |
166 .run() |
166 .run() |
167 .writeAll() |
167 .writeAll() |
173 |
173 |
174 @Test |
174 @Test |
175 public void testAnnotationProcessorExecutionOrder(Path base) throws Exception { |
175 public void testAnnotationProcessorExecutionOrder(Path base) throws Exception { |
176 initialization(base); |
176 initialization(base); |
177 List<String> log = new JavacTask(tb) |
177 List<String> log = new JavacTask(tb) |
178 .options("-processormodulepath", processorCompiledModules.toString(), |
178 .options("--processor-module-path", processorCompiledModules.toString(), |
179 "-processor", "mypkg1.MyProcessor1,mypkg2.MyProcessor2") |
179 "-processor", "mypkg1.MyProcessor1,mypkg2.MyProcessor2") |
180 .outdir(classes) |
180 .outdir(classes) |
181 .sources(testClass) |
181 .sources(testClass) |
182 .run() |
182 .run() |
183 .writeAll() |
183 .writeAll() |
186 "the annotation processor 2 is working!"))) { |
186 "the annotation processor 2 is working!"))) { |
187 throw new AssertionError("Unexpected output: " + log); |
187 throw new AssertionError("Unexpected output: " + log); |
188 } |
188 } |
189 |
189 |
190 log = new JavacTask(tb) |
190 log = new JavacTask(tb) |
191 .options("-processormodulepath", processorCompiledModules.toString(), |
191 .options("--processor-module-path", processorCompiledModules.toString(), |
192 "-processor", "mypkg2.MyProcessor2,mypkg1.MyProcessor1") |
192 "-processor", "mypkg2.MyProcessor2,mypkg1.MyProcessor1") |
193 .outdir(classes) |
193 .outdir(classes) |
194 .sources(testClass) |
194 .sources(testClass) |
195 .run() |
195 .run() |
196 .writeAll() |
196 .writeAll() |
203 |
203 |
204 @Test |
204 @Test |
205 public void testErrorOutputIfOneProcessorNameIsIncorrect(Path base) throws Exception { |
205 public void testErrorOutputIfOneProcessorNameIsIncorrect(Path base) throws Exception { |
206 initialization(base); |
206 initialization(base); |
207 String log = new JavacTask(tb) |
207 String log = new JavacTask(tb) |
208 .options("-XDrawDiagnostics", "-processormodulepath", processorCompiledModules.toString(), |
208 .options("-XDrawDiagnostics", |
|
209 "--processor-module-path", processorCompiledModules.toString(), |
209 "-processor", "mypkg2.MyProcessor2,noPackage.noProcessor,mypkg1.MyProcessor1") |
210 "-processor", "mypkg2.MyProcessor2,noPackage.noProcessor,mypkg1.MyProcessor1") |
210 .outdir(classes) |
211 .outdir(classes) |
211 .sources(testClass) |
212 .sources(testClass) |
212 .run(Task.Expect.FAIL) |
213 .run(Task.Expect.FAIL) |
213 .writeAll() |
214 .writeAll() |
219 |
220 |
220 @Test |
221 @Test |
221 public void testOptionsExclusion(Path base) throws Exception { |
222 public void testOptionsExclusion(Path base) throws Exception { |
222 initialization(base); |
223 initialization(base); |
223 List<String> log = new JavacTask(tb) |
224 List<String> log = new JavacTask(tb) |
224 .options("-XDrawDiagnostics", "-processormodulepath", processorCompiledModules.toString(), |
225 .options("-XDrawDiagnostics", |
225 "-processorpath", processorCompiledModules.toString()) |
226 "--processor-module-path", processorCompiledModules.toString(), |
|
227 "--processor-path", processorCompiledModules.toString()) |
226 .outdir(classes) |
228 .outdir(classes) |
227 .sources(testClass) |
229 .sources(testClass) |
228 .run(Task.Expect.FAIL) |
230 .run(Task.Expect.FAIL) |
229 .writeAll() |
231 .writeAll() |
230 .getOutputLines(Task.OutputKind.DIRECT); |
232 .getOutputLines(Task.OutputKind.DIRECT); |