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 2008/11/23 18:17:40 UTC
svn commit: r720011 [2/2] - in /felix/trunk/ipojo: examples/junit4osgi/
examples/junit4osgi/junit4osgi/
examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/junit4osgi/
examples/junit4osgi/junit4osgi/src/main/java/org/apache/felix/ipojo/...
Modified: felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java (original)
+++ felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java Sun Nov 23 09:17:38 2008
@@ -20,23 +20,20 @@
import java.util.Properties;
-import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.ps.service.FooService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
import org.osgi.framework.ServiceReference;
public class StaticProps extends OSGiTestCase {
-
- ComponentInstance fooProvider1;
- ComponentInstance fooProvider2;
+
+ IPOJOHelper helper;
public void setUp() {
+ helper = new IPOJOHelper(this);
String type = "PS-FooProviderType-2";
-
- Properties p1 = new Properties();
- p1.put("instance.name","FooProvider-1");
- fooProvider1 = Utils.getComponentInstance(context, type, p1);
+
+ helper.createComponentInstance(type, "FooProvider-1");
Properties p2 = new Properties();
p2.put("instance.name","FooProvider-2");
@@ -45,19 +42,16 @@
p2.put("string", new String("bar"));
p2.put("strAProp", new String[] {"bar", "foo"});
p2.put("intAProp", new int[] {1, 2, 3});
- fooProvider2 = Utils.getComponentInstance(context, type, p2);
+ helper.createComponentInstance(type, p2);
}
public void tearDown() {
- fooProvider1.dispose();
- fooProvider1 = null;
- fooProvider2.dispose();
- fooProvider2 = null;
+ helper.dispose();
}
public void testProperties1() {
- ServiceReference sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-1");
+ ServiceReference sr = helper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-1");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties
@@ -84,7 +78,7 @@
}
public void testProperties2() {
- ServiceReference sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-2");
+ ServiceReference sr = helper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-2");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties
Modified: felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java (original)
+++ felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java Sun Nov 23 09:17:38 2008
@@ -21,26 +21,23 @@
import java.util.Dictionary;
import java.util.Properties;
-import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.Factory;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.ps.service.FooService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedServiceFactory;
public class StaticPropsReconfiguration extends OSGiTestCase {
- ComponentInstance fooProvider1;
- ComponentInstance fooProvider2;
-
- public void setUp() {
+ IPOJOHelper helper;
+
+ public void setUp() {
+ helper = new IPOJOHelper(this);
+
String type = "PS-FooProviderType-2";
-
- Properties p1 = new Properties();
- p1.put("instance.name","FooProvider-1");
- fooProvider1 = Utils.getComponentInstance(context, type, p1);
+ helper.createComponentInstance(type, "FooProvider-1");
Properties p2 = new Properties();
p2.put("instance.name","FooProvider-2");
@@ -49,19 +46,15 @@
p2.put("string", new String("bar"));
p2.put("strAProp", new String[] {"bar", "foo"});
p2.put("intAProp", new int[] {1, 2, 3});
- fooProvider2 = Utils.getComponentInstance(context, type, p2);
-
+ helper.createComponentInstance(type, p2);
}
public void tearDown() {
- fooProvider1.dispose();
- fooProvider1 = null;
- fooProvider2.dispose();
- fooProvider2 = null;
+ helper.dispose();
}
public void testReconfFactory1() {
- ServiceReference sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-1");
+ ServiceReference sr = helper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-1");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties
@@ -86,7 +79,7 @@
}
// Reconfiguration
- ServiceReference fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName(), "PS-FooProviderType-2");
+ ServiceReference fact_ref = helper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-2");
Dictionary reconf = new Properties();
reconf.put("instance.name","FooProvider-1");
reconf.put("int", new Integer(5));
@@ -94,14 +87,14 @@
reconf.put("string", new String("toto"));
reconf.put("strAProp", new String[] {"foo", "baz"});
reconf.put("intAProp", new int[] {3, 2, 1});
- Factory fact = (Factory) context.getService(fact_ref);
+ Factory fact = (Factory) getServiceObject(fact_ref);
try {
fact.reconfigure(reconf);
} catch(Exception e) {
fail("Configuration non acceptable : " + reconf);
}
- sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-1");
+ sr = helper.getServiceReferenceByName( FooService.class.getName(), "FooProvider-1");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties after the reconfiguration
@@ -125,13 +118,12 @@
if(intAProp[i] != v2[i]) { fail("Check the intAProp Equality"); }
}
- context.ungetService(fact_ref);
fact = null;
}
public void testReconfFactory2() {
- ServiceReference sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-2");
+ ServiceReference sr = helper.getServiceReferenceByName( FooService.class.getName(), "FooProvider-2");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties
@@ -157,7 +149,7 @@
}
// Reconfiguration
- ServiceReference fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName(), "PS-FooProviderType-2");
+ ServiceReference fact_ref = helper.getServiceReferenceByName( Factory.class.getName(), "PS-FooProviderType-2");
Dictionary reconf = new Properties();
reconf.put("instance.name","FooProvider-2");
reconf.put("int", new Integer(5));
@@ -165,7 +157,7 @@
reconf.put("string", new String("toto"));
reconf.put("strAProp", new String[] {"foo", "baz"});
reconf.put("intAProp", new int[] {3, 2, 1});
- Factory fact = (Factory) context.getService(fact_ref);
+ Factory fact = (Factory) getServiceObject(fact_ref);
try {
fact.reconfigure(reconf);
} catch(Exception e) {
@@ -192,13 +184,11 @@
for (int i = 0; i < intAProp.length; i++) {
if(intAProp[i] != v2[i]) { fail("Check the intAProp Equality"); }
}
-
- context.ungetService(fact_ref);
fact = null;
}
public void testMSFFactory1() {
- ServiceReference sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-1");
+ ServiceReference sr = helper.getServiceReferenceByName( FooService.class.getName(), "FooProvider-1");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties
@@ -223,21 +213,21 @@
}
// Reconfiguration
- ServiceReference fact_ref = Utils.getServiceReferenceByName(context, ManagedServiceFactory.class.getName(), "PS-FooProviderType-2");
+ ServiceReference fact_ref = helper.getServiceReferenceByName( ManagedServiceFactory.class.getName(), "PS-FooProviderType-2");
Dictionary reconf = new Properties();
reconf.put("int", new Integer(5));
reconf.put("long", new Long(43));
reconf.put("string", new String("toto"));
reconf.put("strAProp", new String[] {"foo", "baz"});
reconf.put("intAProp", new int[] {3, 2, 1});
- ManagedServiceFactory fact = (ManagedServiceFactory) context.getService(fact_ref);
+ ManagedServiceFactory fact = (ManagedServiceFactory) getServiceObject(fact_ref);
try {
fact.updated("FooProvider-1", reconf);
} catch (ConfigurationException e) {
fail("Configuration non acceptable : " + reconf);
}
- sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-1");
+ sr = helper.getServiceReferenceByName( FooService.class.getName(), "FooProvider-1");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties after the reconfiguration
@@ -261,13 +251,12 @@
if(intAProp[i] != v2[i]) { fail("Check the intAProp Equality"); }
}
- context.ungetService(fact_ref);
fact = null;
}
public void testReconfMSF2() {
- ServiceReference sr = Utils.getServiceReferenceByName(context, FooService.class.getName(), "FooProvider-2");
+ ServiceReference sr = helper.getServiceReferenceByName( FooService.class.getName(), "FooProvider-2");
assertNotNull("Check the availability of the FS service", sr);
// Check service properties
@@ -293,14 +282,14 @@
}
// Reconfiguration
- ServiceReference fact_ref = Utils.getServiceReferenceByName(context, ManagedServiceFactory.class.getName(), "PS-FooProviderType-2");
+ ServiceReference fact_ref = helper.getServiceReferenceByName( ManagedServiceFactory.class.getName(), "PS-FooProviderType-2");
Dictionary reconf = new Properties();
reconf.put("int", new Integer(5));
reconf.put("long", new Long(43));
reconf.put("string", new String("toto"));
reconf.put("strAProp", new String[] {"foo", "baz"});
reconf.put("intAProp", new int[] {3, 2, 1});
- ManagedServiceFactory fact = (ManagedServiceFactory) context.getService(fact_ref);
+ ManagedServiceFactory fact = (ManagedServiceFactory) getServiceObject(fact_ref);
try {
fact.updated("FooProvider-2", reconf);
} catch (ConfigurationException e) {
@@ -328,7 +317,6 @@
if(intAProp[i] != v2[i]) { fail("Check the intAProp Equality"); }
}
- context.ungetService(fact_ref);
fact = null;
}
Modified: felix/trunk/ipojo/tests/manipulator/creation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/creation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/creation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java (original)
+++ felix/trunk/ipojo/tests/manipulator/creation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java Sun Nov 23 09:17:38 2008
@@ -21,19 +21,19 @@
import java.util.Properties;
import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
import org.apache.felix.ipojo.architecture.Architecture;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.component.FooProviderType1;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.FooService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
-import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
/**
* Check the different method to create POJO object.
*/
public class POJOCreation extends OSGiTestCase {
+
+ private IPOJOHelper helper;
private ComponentInstance ci_lazzy;
private ComponentInstance ci_immediate;
@@ -43,90 +43,59 @@
private Architecture immeArch;
private Architecture immeArchSing;
- private ServiceReference lazzyRef;
- private ServiceReference immRef;
- private ServiceReference immRefSing;
+
private ComponentInstance ci_lazzy_sing;
private ComponentInstance ci_lazzy_sev;
- private ServiceReference lazzyRefSing;
- private ServiceReference lazzyRefSev;
+
private Architecture lazzyArchSing;
private Architecture lazzyArchSev;
private ComponentInstance ci_lazzy_singM;
private ComponentInstance ci_lazzy_sevM;
- private ServiceReference lazzyRefSingM;
- private ServiceReference lazzyRefSevM;
+
private Architecture lazzyArchSingM;
private Architecture lazzyArchSevM;
public void setUp() {
+ helper = new IPOJOHelper(this);
+
String factName = "ManipulationCreation-FooProviderType-1";
String compName = "FooProvider-1";
- Properties p = new Properties();
- p.put("instance.name",compName);
- ci_lazzy = Utils.getComponentInstance(context, factName ,p);
+ ci_lazzy = helper.createComponentInstance(factName ,compName);
String factName2 = "ManipulationCreation-ImmediateFooProviderType";
String compName2 = "FooProvider-2";
- Properties p2 = new Properties();
- p2.put("instance.name",compName2);
- ci_immediate = Utils.getComponentInstance(context, factName2, p2);
+ ci_immediate = helper.createComponentInstance(factName2, compName2);
String factName3 = "ManipulationCreation-ImmediateFooProviderTypeSingleton";
String compName3 = "FooProvider-3";
- Properties p3 = new Properties();
- p3.put("instance.name",compName3);
- ci_immediate_singleton = Utils.getComponentInstance(context, factName3, p3);
+ ci_immediate_singleton = helper.createComponentInstance(factName3, compName3);
String factName4 = "ManipulationCreation-FooProviderType-1-Sing";
String compName4 = "FooProvider-1-Sing";
- Properties p4 = new Properties();
- p4.put("instance.name",compName4);
- ci_lazzy_sing = Utils.getComponentInstance(context, factName4 ,p4);
+ ci_lazzy_sing = helper.createComponentInstance(factName4, compName4);
String factName5 = "ManipulationCreation-FooProviderType-1-Sev";
String compName5 = "FooProvider-1-Sev";
- Properties p5 = new Properties();
- p5.put("instance.name",compName5);
- ci_lazzy_sev = Utils.getComponentInstance(context, factName5 ,p5);
+ ci_lazzy_sev = helper.createComponentInstance(factName5, compName5);
String factName6 = "ManipulationCreation-FooProviderType-1-SingM";
String compName6 = "FooProvider-1-SingM";
- Properties p6 = new Properties();
- p6.put("instance.name",compName6);
- ci_lazzy_singM = Utils.getComponentInstance(context, factName6 ,p6);
+ ci_lazzy_singM = helper.createComponentInstance(factName6, compName6);
String factName7 = "ManipulationCreation-FooProviderType-1-SevM";
String compName7 = "FooProvider-1-SevM";
- Properties p7 = new Properties();
- p7.put("instance.name",compName7);
- ci_lazzy_sevM = Utils.getComponentInstance(context, factName7 ,p7);
+ ci_lazzy_sevM = helper.createComponentInstance(factName7, compName7);
- lazzyRef = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName+")");
- immRef = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName2+")");
- immRefSing = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName3+")");
- lazzyRefSing = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName4+")");
- lazzyRefSev = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName5+")");
- lazzyRefSingM = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName6+")");
- lazzyRefSevM = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName7+")");
-
- lazzyArch = (Architecture) context.getService(lazzyRef);
- immeArch = (Architecture) context.getService(immRef);
- immeArchSing = (Architecture) context.getService(immRefSing);
- lazzyArchSing = (Architecture) context.getService(lazzyRefSing);
- lazzyArchSev = (Architecture) context.getService(lazzyRefSev);
- lazzyArchSingM = (Architecture) context.getService(lazzyRefSingM);
- lazzyArchSevM = (Architecture) context.getService(lazzyRefSevM);
+ lazzyArch = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName+")");
+ immeArch = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName2+")");
+ immeArchSing = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName3+")");
+ lazzyArchSing = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName4+")");
+ lazzyArchSev = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName5+")");
+ lazzyArchSingM = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName6+")");
+ lazzyArchSevM = (Architecture) getServiceObject(Architecture.class.getName(), "(architecture.instance="+compName7+")");
}
public void tearDown() {
- context.ungetService(lazzyRef);
- context.ungetService(immRef);
- context.ungetService(immRefSing);
- context.ungetService(lazzyRefSing);
- context.ungetService(lazzyRefSev);
- context.ungetService(lazzyRefSingM);
- context.ungetService(lazzyRefSevM);
lazzyArch = null;
immeArch = null;
immeArchSing = null;
@@ -134,13 +103,7 @@
lazzyArchSev = null;
lazzyArchSingM = null;
lazzyArchSevM = null;
- ci_lazzy.dispose();
- ci_immediate.dispose();
- ci_immediate_singleton.dispose();
- ci_lazzy_sing.dispose();
- ci_lazzy_sev.dispose();
- ci_lazzy_singM.dispose();
- ci_lazzy_sevM.dispose();
+ helper.dispose();
}
/**
@@ -148,15 +111,11 @@
*/
public void testLazyCreation() {
assertEquals("Check that no objects are created ", 0, lazzyArch.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",ref);
+ FooService fs = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertEquals("Check the creation of 1 object",1, lazzyArch.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -164,15 +123,11 @@
*/
public void testLazyCreationSingleton() {
assertEquals("Check that no objects are created ", 0, lazzyArchSing.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy_sing.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy_sing.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy_sing.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy_sing.getInstanceName() + " is available",ref);
+ FooService fs = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertEquals("Check the creation of 1 object",1, lazzyArchSing.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -180,17 +135,13 @@
*/
public void testLazyCreationSeveral() {
assertEquals("Check that no objects are created ", 0, lazzyArchSev.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy_sev.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy_sev.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
- FooService fs2 = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy_sev.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy_sev.getInstanceName() + " is available", ref);
+ FooService fs = (FooService) getServiceObject(ref);
+ FooService fs2 = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertTrue("Check the FooService invocation-2", fs2.foo());
assertEquals("Check the creation of 1 object",1, lazzyArchSev.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -198,31 +149,23 @@
*/
public void testImmediateCreation() {
assertEquals("Check that one object is created ", 1, immeArch.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_immediate.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_immediate.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_immediate.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_immediate.getInstanceName() + " is available", ref);
+ FooService fs = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertEquals("Check the creation of 1 object", 1, immeArch.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
* Check bundle context injection.
*/
public void testBundleContext() {
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",ref);
+ FooService fs = (FooService) getServiceObject(ref);
Properties p = fs.fooProps();
assertNotNull("Check the bundle context", p.get("context"));
assertEquals("Check the creation of 1 object",1, lazzyArch.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -230,15 +173,11 @@
*/
public void testImmediateSingletonCreation() {
assertEquals("Check that one object is created ", 1, immeArchSing.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_immediate_singleton.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_immediate_singleton.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_immediate_singleton.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_immediate_singleton.getInstanceName() + " is available",ref);
+ FooService fs = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertEquals("Check the creation of 1 object", 1, immeArchSing.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -247,17 +186,13 @@
*/
public void testLazyCreationSingletonM() {
assertEquals("Check that no objects are created ", 0, lazzyArchSingM.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy_singM.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy_singM.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
- FooService fs2 = (FooService) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy_singM.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy_singM.getInstanceName() + " is available",ref);
+ FooService fs = (FooService) getServiceObject(ref);
+ FooService fs2 = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertTrue("Check the FooService invocation", fs2.foo());
assertEquals("Check the creation of 1 object",1, lazzyArchSingM.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -266,19 +201,15 @@
*/
public void testLazyCreationSeveralM() {
assertEquals("Check that no objects are created ", 0, lazzyArchSevM.getInstanceDescription().getCreatedObjects().length);
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy_sevM.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy_sevM.getInstanceName() + " is available",refs);
- FooService fs = (FooService) context.getService(refs[0]);
+ ServiceReference ref= helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy_sevM.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy_sevM.getInstanceName() + " is available",ref);
+ FooService fs = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation", fs.foo());
assertEquals("Check the creation of 1 object",1, lazzyArchSevM.getInstanceDescription().getCreatedObjects().length);
- FooService fs2 = (FooService) context.getService(refs[0]);
+ FooService fs2 = (FooService) getServiceObject(ref);
assertTrue("Check the FooService invocation-2", fs2.foo());
// Only one object as the getService method is called only once (service factory) despite the policy="method".
assertEquals("Check the creation of 1 object",1, lazzyArchSevM.getInstanceDescription().getCreatedObjects().length);
- context.ungetService(refs[0]);
}
/**
@@ -295,9 +226,7 @@
public void testSuperCall() {
try {
- Factory fact = Utils.getFactoryByName(context, "org.apache.felix.ipojo.test.scenarios.component.CallSuperConstructor");
- ComponentInstance ci = fact.createComponentInstance(null);
- ci.dispose();
+ helper.createComponentInstance("org.apache.felix.ipojo.test.scenarios.component.CallSuperConstructor");
} catch (Throwable e) {
fail(e.getMessage());
}
@@ -305,9 +234,7 @@
public void testSuperCallWithBC() {
try {
- Factory fact = Utils.getFactoryByName(context, "org.apache.felix.ipojo.test.scenarios.component.CallSuperConstructorWithBC");
- ComponentInstance ci = fact.createComponentInstance(null);
- ci.dispose();
+ helper.createComponentInstance("org.apache.felix.ipojo.test.scenarios.component.CallSuperConstructorWithBC");
} catch (Throwable e) {
fail(e.getMessage());
}
Modified: felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java Sun Nov 23 09:17:38 2008
@@ -18,54 +18,46 @@
*/
package org.apache.felix.ipojo.test.scenarios.manipulation;
-import java.util.Properties;
-
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.architecture.Architecture;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.component.FooProviderType1;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.FooService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
-import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
/**
- * Test execption handling. POJO exception must be propagated.
+ * Test exception handling. POJO exception must be propagated.
*/
public class ExceptionTest extends OSGiTestCase {
private ComponentInstance ci_lazzy;
- private ComponentInstance ci_immediate;
private ServiceReference lazzyRef;
private ServiceReference immRef;
+
+ IPOJOHelper helper;
public void setUp() {
+ helper = new IPOJOHelper(this);
+
String factName = "Manipulation-FooProviderType-1";
String compName = "FooProvider-1";
-
- Properties p = new Properties();
- p.put("instance.name",compName);
- ci_lazzy = Utils.getComponentInstance(context, factName, p);
+ ci_lazzy = helper.createComponentInstance(factName, compName);
String factName2 = "Manipulation-ImmediateFooProviderType";
String compName2 = "FooProvider-2";
+ helper.createComponentInstance(factName2, compName2);
- Properties p2 = new Properties();
- p2.put("instance.name",compName2);
- ci_immediate = Utils.getComponentInstance(context, factName2, p2);
+ lazzyRef = getServiceReference(Architecture.class.getName(), "(architecture.instance="+compName+")");
+ immRef = getServiceReference(Architecture.class.getName(), "(architecture.instance="+compName2+")");
- lazzyRef = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName+")");
- immRef = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName2+")");
assertNotNull("LazzyRef", lazzyRef);
assertNotNull("ImmRef", immRef);
}
public void tearDown() {
- context.ungetService(lazzyRef);
- context.ungetService(immRef);
- ci_lazzy.dispose();
- ci_immediate.dispose();
+ helper.dispose();
}
@@ -73,18 +65,14 @@
* Check that the exception is correctly propagated.
*/
public void testException() {
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",refs);
- FooProviderType1 fs = (FooProviderType1) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",ref);
+ FooProviderType1 fs = (FooProviderType1) getServiceObject(ref);
try {
fs.testException();
- context.ungetService(refs[0]);
fail("The method must returns an exception");
} catch(Exception e) {
- context.ungetService(refs[0]);
+ // OK
}
}
@@ -92,17 +80,12 @@
* Check that the exception is correctly catch by the POJO.
*/
public void testTry() {
- ServiceReference[] refs = null;
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name="+ci_lazzy.getInstanceName()+")");
- } catch (InvalidSyntaxException e) { e.printStackTrace(); }
- assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",refs);
- FooProviderType1 fs = (FooProviderType1) context.getService(refs[0]);
+ ServiceReference ref = helper.getServiceReferenceByName(FooService.class.getName(), ci_lazzy.getInstanceName());
+ assertNotNull("Check that a FooService from " + ci_lazzy.getInstanceName() + " is available",ref);
+ FooProviderType1 fs = (FooProviderType1) context.getService(ref);
try {
fs.testTry();
- context.ungetService(refs[0]);
} catch(Exception e) {
- context.ungetService(refs[0]);
fail("The method has returned an exception");
}
}
Modified: felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java Sun Nov 23 09:17:38 2008
@@ -25,9 +25,8 @@
import org.apache.felix.ipojo.Pojo;
import org.apache.felix.ipojo.architecture.InstanceDescription;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.FooService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
-import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
/**
@@ -35,6 +34,16 @@
*/
public class GetComponentInstanceTest extends OSGiTestCase {
+ IPOJOHelper helper;
+
+ public void setUp() {
+ helper = new IPOJOHelper(this);
+ }
+
+ public void tearDown() {
+ helper.dispose();
+ }
+
/**
* Check if a pojo can correctly be cast in POJO.
* Check the getComponentInstance method.
@@ -42,10 +51,10 @@
public void testGetComponentInstance() {
String factName = "Manipulation-FooProviderType-1";
String compName = "FooProvider-1";
- ServiceReference[] refs = null;
+ ServiceReference ref = null;
// Get the factory to create a component instance
- Factory fact = Utils.getFactoryByName(context, factName);
+ Factory fact = helper.getFactory(factName);
assertNotNull("Cannot find the factory FooProvider-1", fact);
Properties props = new Properties();
@@ -58,14 +67,12 @@
assertEquals("Check instance name", compName, ci.getInstanceName());
// Get a FooService provider
- try {
- refs = context.getServiceReferences(FooService.class.getName(), "(instance.name=" + compName + ")");
- } catch (InvalidSyntaxException e) { fail("Service query failed (2) " + e); }
+ ref = helper.getServiceReferenceByName(FooService.class.getName(), compName);
- assertNotNull("FS not available", refs);
+ assertNotNull("FS not available", ref);
// Get foo object
- FooService fs = (FooService) context.getService(refs[0]);
+ FooService fs = (FooService) getServiceObject(ref);
// Cast to POJO
Pojo pojo = (Pojo) fs;
@@ -81,16 +88,13 @@
assertEquals("Check instance description name", id.getName(), compName);
// Unget the service
- context.ungetService(refs[0]);
+ context.ungetService(ref);
ci.dispose();
// Check that there is no more FooService
- try {
- refs = context.getServiceReferences(FooService.class.getName(), null);
- } catch (InvalidSyntaxException e) { fail("Service query failed (3) : " + e.getMessage()); }
-
- assertNull("FS available, but component instance stopped", refs);
+ ref = getServiceReference(FooService.class.getName());
+ assertNull("FS available, but component instance stopped", ref);
}
}
Modified: felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java Sun Nov 23 09:17:38 2008
@@ -4,12 +4,11 @@
import java.util.Properties;
import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.Factory;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.component.InnerClasses;
import org.apache.felix.ipojo.test.scenarios.component.InnerClasses.PublicNested;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.CheckService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
import org.osgi.framework.ServiceReference;
public class NestedClassesTests extends OSGiTestCase {
@@ -17,8 +16,11 @@
private ComponentInstance instance;
private CheckService service;
+ IPOJOHelper helper;
+
+
public void setUp() {
- Factory factory = Utils.getFactoryByName(context, "inners");
+ helper = new IPOJOHelper(this);
Properties map = new Properties();
map.put("publicObject", "publicObject");
map.put("publicInt", new Integer(0));
@@ -30,20 +32,15 @@
map.put("privateInt", new Integer(3));
map.put("nonObject", "nonObject");
map.put("nonInt", new Integer(4));
- try {
- instance = factory.createComponentInstance(map);
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ instance = helper.createComponentInstance("inners", map);
- ServiceReference ref =Utils.getServiceReferenceByName(context, CheckService.class.getName(), instance.getInstanceName());
+ ServiceReference ref = helper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check service availability", ref);
- service = (CheckService) context.getService(ref);
+ service = (CheckService) getServiceObject(ref);
}
public void tearDown() {
- instance.dispose();
- instance = null;
+ helper.dispose();
service = null;
}
@@ -177,7 +174,5 @@
assertEquals("Check non-managed int", new Integer(5), data.get("nonInt"));
}
-
-
}
Modified: felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/Boxing.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/Boxing.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/Boxing.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/Boxing.java Sun Nov 23 09:17:38 2008
@@ -4,8 +4,8 @@
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.PrimitiveManipulationTestService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
import org.osgi.framework.ServiceReference;
public class Boxing extends OSGiTestCase {
@@ -15,22 +15,23 @@
PrimitiveManipulationTestService prim;
ServiceReference prim_ref;
+
+ IPOJOHelper helper;
public void setUp() {
+ helper = new IPOJOHelper(this);
Properties p1 = new Properties();
p1.put("instance.name","primitives");
- instance = Utils.getComponentInstance(context, "ManipulationPrimitives5-PrimitiveManipulationTester", p1);
+ instance = helper.createComponentInstance("ManipulationPrimitives5-PrimitiveManipulationTester", p1);
assertTrue("check instance state", instance.getState() == ComponentInstance.VALID);
- prim_ref = Utils.getServiceReferenceByName(context, PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
+ prim_ref = helper.getServiceReferenceByName(PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
assertNotNull("Check prim availability", prim_ref);
- prim = (PrimitiveManipulationTestService) context.getService(prim_ref);
+ prim = (PrimitiveManipulationTestService) getServiceObject(prim_ref);
}
public void tearDown() {
- context.ungetService(prim_ref);
+ helper.dispose();
prim = null;
- instance.dispose();
- instance = null;
}
public void testLongFromObject() {
Modified: felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/DuplicateMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/DuplicateMethod.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/DuplicateMethod.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/DuplicateMethod.java Sun Nov 23 09:17:38 2008
@@ -1,22 +1,21 @@
package org.apache.felix.ipojo.test.scenarios.manipulation;
-import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.Plop;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
import org.osgi.framework.ServiceReference;
public class DuplicateMethod extends OSGiTestCase {
public void testDuplicateMethod() {
- ComponentInstance instance = Utils.getComponentInstanceByName(context, "plopimpl", "plop");
- ServiceReference ref = Utils.getServiceReferenceByName(context, Plop.class.getName(), "plop");
+ IPOJOHelper helper = new IPOJOHelper(this);
+ helper.createComponentInstance("plopimpl", "plop");
+ ServiceReference ref = helper.getServiceReferenceByName(Plop.class.getName(), "plop");
assertNotNull("Check plop", ref);
- Plop plop = (Plop) context.getService(ref);
+ Plop plop = (Plop) getServiceObject(ref);
Object o = plop.getPlop();
assertEquals("Check result", "plop", o);
- context.ungetService(ref);
- instance.dispose();
+ helper.dispose();
}
}
Modified: felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/TypedList.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/TypedList.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/TypedList.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/TypedList.java Sun Nov 23 09:17:38 2008
@@ -26,14 +26,12 @@
}
public void tearDown() {
- foo1.dispose();
- foo2.dispose();
- checker.dispose();
+ helper.dispose();
}
public void testTypedList() {
- ServiceReference ref = getServiceReferenceByName(CheckService.class.getName(), checker.getInstanceName());
- CheckService check = (CheckService) context.getService(ref);
+ ServiceReference ref = helper.getServiceReferenceByName(CheckService.class.getName(), checker.getInstanceName());
+ CheckService check = (CheckService) getServiceObject(ref);
assertNotNull("Checker availability", check);
// Check without providers
assertFalse("Empty list", check.check());
@@ -58,10 +56,6 @@
props = check.getProps();
list = (List<FooService>) props.get("list");
assertEquals("Check size - 3", 1, list.size());
-
- context.ungetService(ref);
}
-
-
}
Modified: felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java (original)
+++ felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java Sun Nov 23 09:17:38 2008
@@ -18,38 +18,31 @@
*/
package org.apache.felix.ipojo.test.scenarios.manipulation;
-import java.util.Properties;
-
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.PrimitiveManipulationTestService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
-import org.osgi.framework.ServiceReference;
/**
* Check the manipulation of primitive type (boxed and unboxed).
*/
public class PrimitiveTypeTest extends OSGiTestCase {
- ComponentInstance instance; // Instance under test
PrimitiveManipulationTestService prim;
- ServiceReference prim_ref;
+
+ IPOJOHelper helper;
public void setUp() {
- Properties p1 = new Properties();
- p1.put("instance.name","primitives");
- instance = Utils.getComponentInstance(context, "ManipulationPrimitives-PrimitiveManipulationTester", p1);
+ helper = new IPOJOHelper(this);
+ ComponentInstance instance = helper.createComponentInstance("ManipulationPrimitives-PrimitiveManipulationTester");
assertTrue("check instance state", instance.getState() == ComponentInstance.VALID);
- prim_ref = Utils.getServiceReferenceByName(context, PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
- assertNotNull("Check prim availability", prim_ref);
- prim = (PrimitiveManipulationTestService) context.getService(prim_ref);
+ prim = (PrimitiveManipulationTestService) getServiceObject(PrimitiveManipulationTestService.class.getName(), "(instance.name=" + instance.getInstanceName() + ")");
+ assertNotNull("Check prim availability", prim);
}
public void tearDown() {
- context.ungetService(prim_ref);
+ helper.dispose();
prim = null;
- instance.dispose();
- instance = null;
}
public void testByte() {
Modified: felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java?rev=720011&r1=720010&r2=720011&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java (original)
+++ felix/trunk/ipojo/tests/manipulator/primitives/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java Sun Nov 23 09:17:38 2008
@@ -18,12 +18,10 @@
*/
package org.apache.felix.ipojo.test.scenarios.manipulation;
-import java.util.Properties;
-
import org.apache.felix.ipojo.ComponentInstance;
import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.junit4osgi.helpers.IPOJOHelper;
import org.apache.felix.ipojo.test.scenarios.manipulation.service.PrimitiveManipulationTestService;
-import org.apache.felix.ipojo.test.scenarios.util.Utils;
import org.osgi.framework.ServiceReference;
/**
@@ -32,27 +30,21 @@
*/
public class PrimitiveTypeTest2 extends OSGiTestCase {
- ComponentInstance instance; // Instance under test
-
PrimitiveManipulationTestService prim;
-
- ServiceReference prim_ref;
-
+ IPOJOHelper helper;
+
public void setUp() {
- Properties p1 = new Properties();
- p1.put("instance.name","primitives");
- instance = Utils.getComponentInstance(context, "ManipulationPrimitives-PrimitiveManipulationTesterA", p1);
+ helper = new IPOJOHelper(this);
+ ComponentInstance instance = helper.createComponentInstance("ManipulationPrimitives-PrimitiveManipulationTesterA");
assertTrue("check instance state", instance.getState() == ComponentInstance.VALID);
- prim_ref = Utils.getServiceReferenceByName(context, PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
- assertNotNull("Check prim availability", prim_ref);
- prim = (PrimitiveManipulationTestService) context.getService(prim_ref);
+ ServiceReference ref = helper.getServiceReferenceByName(PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
+ assertNotNull("Check prim availability", ref);
+ prim = (PrimitiveManipulationTestService) getServiceObject(ref);
}
public void tearDown() {
- context.ungetService(prim_ref);
prim = null;
- instance.dispose();
- instance = null;
+ helper.dispose();
}
public void testByte() {