|
38 | 38 | import static org.junit.Assert.assertSame; |
39 | 39 | import static org.junit.Assert.assertTrue; |
40 | 40 | import static org.junit.Assert.fail; |
| 41 | +import static org.scijava.util.ArrayUtils.array; |
41 | 42 |
|
42 | 43 | import java.util.Arrays; |
43 | 44 | import java.util.List; |
@@ -285,50 +286,48 @@ public void testNonStrictOptionalMissingTransitive() { |
285 | 286 | * Verifies that the order plugins appear in the PluginIndex and Service list |
286 | 287 | * does not affect which services are loaded. |
287 | 288 | */ |
288 | | - @SuppressWarnings("unchecked") |
289 | 289 | @Test |
290 | 290 | public void testClassOrder() { |
291 | 291 | final int expectedSize = 2; |
292 | 292 |
|
293 | 293 | // Same order, Base first |
294 | | - Context c = |
295 | | - createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services( |
296 | | - BaseService.class, ExtensionService.class)); |
| 294 | + Context c = createContext(// |
| 295 | + pluginIndex(BaseImpl.class, ExtensionImpl.class), // |
| 296 | + array(BaseService.class, ExtensionService.class)); |
297 | 297 | assertEquals(expectedSize, c.getServiceIndex().size()); |
298 | 298 |
|
299 | 299 | // Same order, Extension first |
300 | | - c = |
301 | | - createContext(pluginIndex(ExtensionImpl.class, BaseImpl.class), services( |
302 | | - ExtensionService.class, BaseService.class)); |
| 300 | + c = createContext(// |
| 301 | + pluginIndex(ExtensionImpl.class, BaseImpl.class), // |
| 302 | + array(ExtensionService.class, BaseService.class)); |
303 | 303 | assertEquals(expectedSize, c.getServiceIndex().size()); |
304 | 304 |
|
305 | 305 | // Different order, Extension first |
306 | | - c = |
307 | | - createContext(pluginIndex(ExtensionImpl.class, BaseImpl.class), services( |
308 | | - BaseService.class, ExtensionService.class)); |
| 306 | + c = createContext(// |
| 307 | + pluginIndex(ExtensionImpl.class, BaseImpl.class), // |
| 308 | + array(BaseService.class, ExtensionService.class)); |
309 | 309 | assertEquals(expectedSize, c.getServiceIndex().size()); |
310 | 310 |
|
311 | 311 | // Different order, Base first |
312 | | - c = |
313 | | - createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services( |
314 | | - ExtensionService.class, BaseService.class)); |
| 312 | + c = createContext(// |
| 313 | + pluginIndex(BaseImpl.class, ExtensionImpl.class), // |
| 314 | + array(ExtensionService.class, BaseService.class)); |
315 | 315 | assertEquals(expectedSize, c.getServiceIndex().size()); |
316 | 316 | } |
317 | 317 |
|
318 | 318 | /** |
319 | 319 | * Verifies that the Service index created when using Abstract classes is the |
320 | 320 | * same as for interfaces. |
321 | 321 | */ |
322 | | - @SuppressWarnings("unchecked") |
323 | 322 | @Test |
324 | 323 | public void testAbstractClasslist() { |
325 | | - final Context cAbstract = |
326 | | - createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services( |
327 | | - AbstractBase.class, AbstractExtension.class)); |
| 324 | + final Context cAbstract = createContext(// |
| 325 | + pluginIndex(BaseImpl.class, ExtensionImpl.class), // |
| 326 | + array(AbstractBase.class, AbstractExtension.class)); |
328 | 327 |
|
329 | | - final Context cService = |
330 | | - createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services( |
331 | | - BaseService.class, ExtensionService.class)); |
| 328 | + final Context cService = createContext(// |
| 329 | + pluginIndex(BaseImpl.class, ExtensionImpl.class), // |
| 330 | + array(BaseService.class, ExtensionService.class)); |
332 | 331 |
|
333 | 332 | assertEquals(cService.getServiceIndex().size(), cAbstract.getServiceIndex() |
334 | 333 | .size()); |
@@ -423,16 +422,6 @@ private Context createContext(final PluginIndex index, |
423 | 422 | index); |
424 | 423 | } |
425 | 424 |
|
426 | | - /** |
427 | | - * Convenience method since you can't instantiate a Class<? extends Service> |
428 | | - * array. |
429 | | - */ |
430 | | - private Class<? extends Service>[] services( |
431 | | - final Class<? extends Service>... serviceClasses) |
432 | | - { |
433 | | - return serviceClasses; |
434 | | - } |
435 | | - |
436 | 425 | /** |
437 | 426 | * Creates a PluginIndex and adds all the provided classes as plugins, indexed |
438 | 427 | * under Service.class |
|
0 commit comments