svn commit: r1530212 - /felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java

[pd...@apache.org]

Author: pderop
Date: Tue Oct  8 10:15:27 2013
New Revision: 1530212

URL: http://svn.apache.org/r1530212
Log:
Reuse BundleContext from the "context" attribute (from superclass).

Modified:
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java

Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java?rev=1530212&r1=1530211&r2=1530212&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java Tue Oct  8 10:15:27 2013
@@ -26,8 +26,6 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
-
 import junit.framework.Assert;
 
 import org.apache.felix.dependencymanager.test2.components.Ensure;
@@ -37,7 +35,6 @@ import org.apache.felix.dm.DependencyMan
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
@@ -49,9 +46,6 @@ public class AspectRaceTest extends Test
 	final static int SERVICES = 3;
 	final static int ASPECTS_PER_SERVICE = 10;
 
-	@Inject
-	private static volatile BundleContext _bctx;
-
 	@Test
 	public void testConcurrentAspects() {
 		try {
@@ -66,7 +60,7 @@ public class AspectRaceTest extends Test
 			// We create a Controller which is injected with some S services,
 			// and each S services has some aspects (SAspect).
 
-			_dm = new DependencyManager(_bctx);
+			_dm = new DependencyManager(context);
 			Controller controller = new Controller();
 			Component c = _dm
 					.createComponent()
@@ -237,7 +231,7 @@ public class AspectRaceTest extends Test
 						"could not unregister services and aspects timely");
 			}
 
-			if (_bctx.getServiceReference(S.class.getName()) != null) {
+			if (context.getServiceReference(S.class.getName()) != null) {
 				error("could not unregister some services or aspects !");
 			}
 			debug("unregistered all aspects and services concurrently");