You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2010/10/10 15:54:03 UTC
svn commit: r1006293 -
/felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/AutoHandlerTest.java
Author: clement
Date: Sun Oct 10 13:54:03 2010
New Revision: 1006293
URL: http://svn.apache.org/viewvc?rev=1006293&view=rev
Log:
Cleanup test environment after tests.
Modified:
felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/AutoHandlerTest.java
Modified: felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/AutoHandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/AutoHandlerTest.java?rev=1006293&r1=1006292&r2=1006293&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/AutoHandlerTest.java (original)
+++ felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/AutoHandlerTest.java Sun Oct 10 13:54:03 2010
@@ -38,7 +38,7 @@ public class AutoHandlerTest extends OSG
public void setUp() {
factory = (ComponentFactory) Utils.getFactoryByName(getContext(), "HANDLER-HandlerTesterWO");
- System.clearProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE);
+ System.setProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE, "");
}
public void tearDown() {
@@ -47,10 +47,17 @@ public class AutoHandlerTest extends OSG
}
instance = null;
- System.clearProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE);
+ System.setProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE, "");
+
}
public void testRequiredHandlerList() {
+ System.setProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE, "");
+
+ factory.stop();
+ factory.restart();
+ factory.start();
+
List list = factory.getRequiredHandlers();
assertFalse(list.contains("org.apache.felix.ipojo.test.handler.checkservice:check"));
@@ -64,6 +71,8 @@ public class AutoHandlerTest extends OSG
list = factory.getRequiredHandlers();
assertTrue(list.contains("org.apache.felix.ipojo.test.handler.checkservice:check"));
+ System.setProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE, "");
+
}
public void testInstanceCreation() throws Exception {
@@ -81,5 +90,10 @@ public class AutoHandlerTest extends OSG
assertNotNull(hd);
assertTrue(hd instanceof CheckServiceHandlerDescription);
+ System.setProperty(ORG_APACHE_FELIX_IPOJO_HANDLER_AUTO_PRIMITIVE, "");
+
+ factory.stop();
+ factory.restart();
+ factory.start();
}
}