Skip to content

Commit aa8be0f

Browse files
committed
ContextCreationTest: remove unneeded method
Now that we have the handy ArrayUtils.array method, we can ditch the less general services helper method.
1 parent 537fc20 commit aa8be0f

File tree

1 file changed

+19
-30
lines changed

1 file changed

+19
-30
lines changed

src/test/java/org/scijava/ContextCreationTest.java

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import static org.junit.Assert.assertSame;
3939
import static org.junit.Assert.assertTrue;
4040
import static org.junit.Assert.fail;
41+
import static org.scijava.util.ArrayUtils.array;
4142

4243
import java.util.Arrays;
4344
import java.util.List;
@@ -285,50 +286,48 @@ public void testNonStrictOptionalMissingTransitive() {
285286
* Verifies that the order plugins appear in the PluginIndex and Service list
286287
* does not affect which services are loaded.
287288
*/
288-
@SuppressWarnings("unchecked")
289289
@Test
290290
public void testClassOrder() {
291291
final int expectedSize = 2;
292292

293293
// 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));
297297
assertEquals(expectedSize, c.getServiceIndex().size());
298298

299299
// 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));
303303
assertEquals(expectedSize, c.getServiceIndex().size());
304304

305305
// 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));
309309
assertEquals(expectedSize, c.getServiceIndex().size());
310310

311311
// 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));
315315
assertEquals(expectedSize, c.getServiceIndex().size());
316316
}
317317

318318
/**
319319
* Verifies that the Service index created when using Abstract classes is the
320320
* same as for interfaces.
321321
*/
322-
@SuppressWarnings("unchecked")
323322
@Test
324323
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));
328327

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));
332331

333332
assertEquals(cService.getServiceIndex().size(), cAbstract.getServiceIndex()
334333
.size());
@@ -423,16 +422,6 @@ private Context createContext(final PluginIndex index,
423422
index);
424423
}
425424

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-
436425
/**
437426
* Creates a PluginIndex and adds all the provided classes as plugins, indexed
438427
* under Service.class

0 commit comments

Comments
 (0)