ServiceIndexTest: dispose contexts in unit tests

Author: ctrueden

src/test/java/org/scijava/service/ServiceIndexTest.java

@@ -65,6 +65,7 @@ public void testGetAll() {
 		assertSame(DefaultPluginService.class, all.get(1).getClass());
 		assertSame(DefaultThreadService.class, all.get(2).getClass());
 		assertSame(StderrLogService.class, all.get(3).getClass());
+		context.dispose();
 	}
 
 	@Test
@@ -73,16 +74,19 @@ public void testMarkerInterfaces() {
 		for (Service s : context.getServiceIndex().getAll()) {
 			assertTrue(s.getClass().getName(), s instanceof SciJavaService);
 		}
+		context.dispose();
 	}
 
 	/**
 	 * Test the {@link ServiceIndex#getPrevService(Class, Class)} operation.
 	 */
 	@Test
 	public void testGetPrevService() {
+		final Context context = new Context(SciJavaService.class);
+
 		// Create a service index where the OptionsService hierarchy should be:
 		// HigherOptionsService > DefaultOptionsService > LowerOptionsService
-		final ServiceIndex serviceIndex = setUpPrivateServices();
+		final ServiceIndex serviceIndex = setUpPrivateServices(context);
 
 		// DefaultOptionsService should be the previous service to LowerOptionsService
 		assertEquals(DefaultOptionsService.class, serviceIndex.getPrevService(
@@ -96,16 +100,20 @@ public void testGetPrevService() {
 		// There should not be a previous service before HigherOptionsService
 		assertNull(serviceIndex.getPrevService(OptionsService.class,
 			HigherOptionsService.class));
+
+		context.dispose();
 	}
 
 	/**
 	 * Test the {@link ServiceIndex#getNextService(Class, Class)} operation.
 	 */
 	@Test
 	public void testGetNextService() {
+		final Context context = new Context(SciJavaService.class);
+
 		// Create a service index where the OptionsService hierarchy should be:
 		// HigherOptionService > DefaultOptionService > LowerOptionService
-		final ServiceIndex serviceIndex = setUpPrivateServices();
+		final ServiceIndex serviceIndex = setUpPrivateServices(context);
 
 		// DefaultOptionsService should be the next service to HigherOptionsService
 		assertEquals(DefaultOptionsService.class, serviceIndex.getNextService(
@@ -119,15 +127,16 @@ public void testGetNextService() {
 		// There should not be a next service after LowerOptionsService
 		assertNull(serviceIndex.getNextService(OptionsService.class,
 			LowerOptionsService.class));
+
+		context.dispose();
 	}
 
 	// -- Helper methods --
 
 	/**
 	 * @return A {@link ServiceIndex} with all private services manually added.
 	 */
-	private ServiceIndex setUpPrivateServices() {
-		final Context context = new Context(SciJavaService.class);
+	private ServiceIndex setUpPrivateServices(final Context context) {
 		final ServiceIndex serviceIndex = context.getServiceIndex();
 		serviceIndex.add(new HigherOptionsService());
 		serviceIndex.add(new LowerOptionsService());