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 2014/03/09 09:03:59 UTC
svn commit: r1575671 [2/9] - in /felix/trunk/ipojo/runtime/core-it: ./
ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/
ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/
ipojo-api-test/src/te...
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSuperMethodProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSuperMethodProperties.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSuperMethodProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSuperMethodProperties.java Sun Mar 9 08:03:56 2014
@@ -80,7 +80,7 @@ public class TestSuperMethodProperties e
public void testConfigurationPrimitive() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
Byte b = (Byte) props.get("b");
@@ -123,7 +123,7 @@ public class TestSuperMethodProperties e
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
props = check.getProps();
b = (Byte) props.get("b");
@@ -168,7 +168,7 @@ public class TestSuperMethodProperties e
public void testConfigurationPrimitiveString() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
Byte b = (Byte) props.get("b");
@@ -211,7 +211,7 @@ public class TestSuperMethodProperties e
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
props = check.getProps();
b = (Byte) props.get("b");
@@ -256,7 +256,7 @@ public class TestSuperMethodProperties e
public void testConfigurationPrimitiveArrays() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
byte[] b = (byte[]) props.get("bs");
@@ -315,7 +315,7 @@ public class TestSuperMethodProperties e
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
props = check.getProps();
b = (byte[]) props.get("bs");
@@ -376,7 +376,7 @@ public class TestSuperMethodProperties e
public void testConfigurationPrimitiveArraysString() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
byte[] b = (byte[]) props.get("bs");
@@ -435,7 +435,7 @@ public class TestSuperMethodProperties e
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
props = check.getProps();
b = (byte[]) props.get("bs");
@@ -496,7 +496,7 @@ public class TestSuperMethodProperties e
public void testConfigurationObj() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
String s = (String) props.get("string");
@@ -517,7 +517,7 @@ public class TestSuperMethodProperties e
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
props = check.getProps();
s = (String) props.get("string");
@@ -539,7 +539,7 @@ public class TestSuperMethodProperties e
public void testConfigurationObjString() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
String s = (String) props.get("string");
@@ -560,7 +560,7 @@ public class TestSuperMethodProperties e
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
props = check.getProps();
s = (String) props.get("string");
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethod.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethod.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethod.java Sun Mar 9 08:03:56 2014
@@ -77,7 +77,7 @@ public class TestUpdatedMethod extends C
public void testComponentTypeConfiguration() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooProvider1.getInstanceName());
assertNotNull("Check FooService availability", ref);
- FooService fs = (FooService) osgiHelper.getServiceObject(ref);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(ref);
Properties toCheck = fs.fooProps();
Integer intProp = (Integer) toCheck.get("intProp");
@@ -157,7 +157,7 @@ public class TestUpdatedMethod extends C
ServiceReference sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-3");
assertNotNull("Check the availability of the FS service", sr);
- FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
Properties toCheck = fs.fooProps();
// Check service properties
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndConfigAdmin.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndConfigAdmin.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndConfigAdmin.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndConfigAdmin.java Sun Mar 9 08:03:56 2014
@@ -107,7 +107,7 @@ public class TestUpdatedMethodAndConfigA
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
Dictionary dict = (Dictionary) fs.fooProps().get("lastupdated");
@@ -153,7 +153,7 @@ public class TestUpdatedMethodAndConfigA
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
Dictionary dict = (Dictionary) fs.fooProps().get("lastupdated");
@@ -201,7 +201,7 @@ public class TestUpdatedMethodAndConfigA
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -255,7 +255,7 @@ public class TestUpdatedMethodAndConfigA
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -312,7 +312,7 @@ public class TestUpdatedMethodAndConfigA
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndManagedService.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndManagedService.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndManagedService.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndManagedService.java Sun Mar 9 08:03:56 2014
@@ -138,7 +138,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab");
conf.put("bar", new Integer(2));
conf.put("foo", "foo");
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -155,7 +155,7 @@ public class TestUpdatedMethodAndManaged
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
Dictionary dict = (Dictionary) fs.fooProps().get("lastupdated");
@@ -185,7 +185,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab");
conf.put("bar", new Integer(2));
conf.put("foo", "foo");
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -202,7 +202,7 @@ public class TestUpdatedMethodAndManaged
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
Dictionary dict = (Dictionary) fs.fooProps().get("lastupdated");
@@ -212,7 +212,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab2");
conf.put("foo", "oof2");
conf.put("bar", new Integer(0));
- ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -248,7 +248,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab");
conf.put("foo", "oof");
conf.put("bar", new Integer(0));
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -266,7 +266,7 @@ public class TestUpdatedMethodAndManaged
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -283,7 +283,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab2");
conf.put("foo", "oof2");
conf.put("bar", new Integer(0));
- ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -319,7 +319,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab");
conf.put("foo", "oof");
conf.put("bar", new Integer(0));
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -337,7 +337,7 @@ public class TestUpdatedMethodAndManaged
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -354,7 +354,7 @@ public class TestUpdatedMethodAndManaged
conf.put("baz", "zab2");
conf.put("foo", "oof2");
conf.put("bar", new Integer(0));
- ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndConfigAdmin.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndConfigAdmin.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndConfigAdmin.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndConfigAdmin.java Sun Mar 9 08:03:56 2014
@@ -107,7 +107,7 @@ public class TestUpdatedNoArgMethodAndCo
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
assertEquals("Check updated", 1, updated.intValue());
@@ -125,7 +125,7 @@ public class TestUpdatedNoArgMethodAndCo
assertEquals("Check bar equality -1", barP, null);
assertEquals("Check baz equality -1", bazP, null);
- ConfigurationAdmin admin = osgiHelper.getServiceObject(ConfigurationAdmin.class);
+ ConfigurationAdmin ad = osgiHelper.getServiceObject(ConfigurationAdmin.class);
assertNotNull("Check Configuration Admin availability", admin);
Configuration configuration = admin.getConfiguration(instance2.getInstanceName(),
@@ -151,7 +151,7 @@ public class TestUpdatedNoArgMethodAndCo
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
assertEquals("Check updated", 1, updated.intValue());
@@ -197,7 +197,7 @@ public class TestUpdatedNoArgMethodAndCo
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -249,7 +249,7 @@ public class TestUpdatedNoArgMethodAndCo
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -303,7 +303,7 @@ public class TestUpdatedNoArgMethodAndCo
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndManagedService.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndManagedService.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndManagedService.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndManagedService.java Sun Mar 9 08:03:56 2014
@@ -111,7 +111,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab");
conf.put("bar", new Integer(2));
conf.put("foo", "foo");
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -128,7 +128,7 @@ public class TestUpdatedNoArgMethodAndMa
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
assertEquals("Check updated", 1, updated.intValue());
}
@@ -153,7 +153,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab");
conf.put("bar", new Integer(2));
conf.put("foo", "foo");
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -170,7 +170,7 @@ public class TestUpdatedNoArgMethodAndMa
assertEquals("Check baz equality -2", bazP, "zab");
// Get Service
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Integer updated = (Integer) fs.fooProps().get("updated");
assertEquals("Check updated", 1, updated.intValue());
@@ -178,7 +178,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab2");
conf.put("foo", "oof2");
conf.put("bar", new Integer(0));
- ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -211,7 +211,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab");
conf.put("foo", "oof");
conf.put("bar", new Integer(0));
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -229,7 +229,7 @@ public class TestUpdatedNoArgMethodAndMa
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -244,7 +244,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab2");
conf.put("foo", "oof2");
conf.put("bar", new Integer(0));
- ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -278,7 +278,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab");
conf.put("foo", "oof");
conf.put("bar", new Integer(0));
- ManagedService ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ManagedService ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
@@ -296,7 +296,7 @@ public class TestUpdatedNoArgMethodAndMa
assertEquals("Check baz equality", bazP, "zab");
// Check field value
- FooService fs = (FooService) osgiHelper.getServiceObject(fooRef);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(fooRef);
Properties p = fs.fooProps();
fooP = (String) p.get("foo");
barP = (Integer) p.get("bar");
@@ -311,7 +311,7 @@ public class TestUpdatedNoArgMethodAndMa
conf.put("baz", "zab2");
conf.put("foo", "oof2");
conf.put("bar", new Integer(0));
- ms = (ManagedService) osgiHelper.getServiceObject(msRef);
+ ms = (ManagedService) osgiHelper.getRawServiceObject(msRef);
try {
ms.updated(conf);
} catch (ConfigurationException e) {
Propchange: felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 9 08:03:56 2014
@@ -0,0 +1,2 @@
+target
+*.iml
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/GermanHelloService.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/GermanHelloService.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/GermanHelloService.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/GermanHelloService.java Sun Mar 9 08:03:56 2014
@@ -20,10 +20,10 @@
package org.apache.felix.ipojo.runtime.core.test.components;
import org.apache.felix.ipojo.annotations.Component;
-import org.apache.felix.ipojo.annotations.Property;
-import org.apache.felix.ipojo.annotations.Provides;
import org.apache.felix.ipojo.runtime.core.test.services.HelloService;
+import javax.xml.parsers.SAXParser;
+
/**
* I intentionally left empty the component name plus the @Provides annotation.
* This is just to trigger the component manipulation
@@ -31,6 +31,8 @@ import org.apache.felix.ipojo.runtime.co
@Component
public class GermanHelloService implements HelloService {
+ SAXParser parser = null;
+
@Override
public String hello(final String name) {
return "Hallo " + name;
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/Common.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/Common.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/Common.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/Common.java Sun Mar 9 08:03:56 2014
@@ -19,12 +19,10 @@
package org.apache.felix.ipojo.runtime.core.test.declaration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.options.CompositeOption;
-import org.ops4j.pax.exam.options.DefaultCompositeOption;
import org.ow2.chameleon.testing.helpers.BaseTest;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import java.util.Arrays;
+import java.util.List;
/**
* Bootstrap the test from this project
@@ -32,6 +30,16 @@ import static org.ops4j.pax.exam.CoreOpt
public class Common extends BaseTest {
@Override
public boolean quiet() {
- return false;
+ return true;
+ }
+
+
+
+ @Override
+ public List<String> getExtraExports() {
+ // The important thing here is to make sure that this package is in the bundle
+ return Arrays.asList(
+ "org.apache.felix.ipojo.runtime.core.test.components"
+ );
}
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/TestDeclarationBuilderService.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/TestDeclarationBuilderService.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/TestDeclarationBuilderService.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/TestDeclarationBuilderService.java Sun Mar 9 08:03:56 2014
@@ -48,12 +48,6 @@ public class TestDeclarationBuilderServi
private DeclarationBuilderService builder;
private DeclarationHandle handle;
- @Override
- protected List<String> getExtraExports() {
- // The important thing here is to make sure that this package is in the bundle
- return Arrays.asList("org.apache.felix.ipojo.runtime.core.test.components");
- }
-
@Before
public void setUp() {
builder = osgiHelper.getServiceObject(DeclarationBuilderService.class);
@@ -143,6 +137,8 @@ public class TestDeclarationBuilderServi
.build();
instance.publish();
+ System.out.println(instance.getStatus().getMessage());
+
String filter = format("(instance.name=%s)", "german-hello");
osgiHelper.waitForService(HelloService.class, filter, 1000);
HelloService service = osgiHelper.getServiceObject(HelloService.class, filter);
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerTest.java Sun Mar 9 08:03:56 2014
@@ -22,6 +22,7 @@ import org.apache.felix.ipojo.ComponentI
import org.apache.felix.ipojo.HandlerManagerFactory;
import org.apache.felix.ipojo.architecture.Architecture;
import org.apache.felix.ipojo.runtime.externalhandlers.services.CheckService;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
@@ -31,6 +32,7 @@ import java.util.Dictionary;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -65,7 +67,7 @@ public class HandlerTest extends Common
assertNotNull("Check the check service availability", sr);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(sr);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(sr);
Dictionary<String, Object> p = cs.getProps();
assertEquals("Assert 'simple' equality", p.get("Simple"), "simple");
assertEquals("Assert 'a' equality", p.get("Map1"), "a");
@@ -88,7 +90,7 @@ public class HandlerTest extends Common
}
assertNotNull("Check the check service availability", sr);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(sr);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(sr);
Dictionary<String, Object> p = cs.getProps();
assertEquals("Assert 'simple' equality", p.get("Simple"), "Simple");
assertEquals("Assert 'a' equality", p.get("Map1"), "a");
@@ -109,7 +111,7 @@ public class HandlerTest extends Common
}
assertNotNull("Check the check service availability", sr);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(sr);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(sr);
Dictionary<String, Object> p = cs.getProps();
assertEquals("Assert 'simple' equality", p.get("Simple"), "Simple");
assertEquals("Size of p", 3, p.size()); // instance name, simple and changes.
@@ -131,13 +133,13 @@ public class HandlerTest extends Common
assertNotNull("Check the check service availability", sr);
ServiceReference sr_arch = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "HandlerTest-1");
- Architecture arch = (Architecture) osgiHelper.getServiceObject(sr_arch);
+ Architecture arch = (Architecture) osgiHelper.getRawServiceObject(sr_arch);
System.out.println("===");
Dumps.dumpArchitectures(context);
assertEquals("Check instance validity - 0", arch.getInstanceDescription().getState(), ComponentInstance.VALID);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(sr);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(sr);
Dictionary<String, Object> p = cs.getProps();
Integer changes = (Integer) p.get("changes");
assertNotNull("Check changes no null", changes);
@@ -174,18 +176,18 @@ public class HandlerTest extends Common
assertNotNull("Check the check service availability", sr);
ServiceReference sr_arch = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "HandlerTest-1");
- Architecture arch = (Architecture) osgiHelper.getServiceObject(sr_arch);
+ Architecture arch = (Architecture) osgiHelper.getRawServiceObject(sr_arch);
assertEquals("Check validity", arch.getInstanceDescription().getState(), ComponentInstance.VALID);
// Kill the handler factory
HandlerManagerFactory f = (HandlerManagerFactory) ipojoHelper.getHandlerFactory("check");
f.stop();
- sr = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "HandlerTest-1");
- assertNull("Check the check service unavailability", sr);
+ boolean av = ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "HandlerTest-1");
+ assertFalse("Check the check service unavailability", av);
- sr_arch = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "HandlerTest-1");
- assertNull("Check the architecture unavailability", sr_arch);
+ boolean av2 = ipojoHelper.isServiceAvailableByName(Architecture.class.getName(), "HandlerTest-1");
+ assertFalse("Check the architecture unavailability", av2);
// The instance is disposed, restart the handler
f.start();
@@ -204,7 +206,7 @@ public class HandlerTest extends Common
assertNotNull("Check the check service availability - 2", sr);
sr_arch = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "HandlerTest-1");
- arch = (Architecture) osgiHelper.getServiceObject(sr_arch);
+ arch = (Architecture) osgiHelper.getRawServiceObject(sr_arch);
assertEquals("Check validity - 2", arch.getInstanceDescription().getState(), ComponentInstance.VALID);
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerWithFieldInterceptorTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerWithFieldInterceptorTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerWithFieldInterceptorTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerWithFieldInterceptorTest.java Sun Mar 9 08:03:56 2014
@@ -60,7 +60,7 @@ public class HandlerWithFieldInterceptor
String name = "HandlerTest-1";
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), name);
assertNotNull("Check the check service availability", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
Dictionary<String, Object> p = cs.getProps();
assertEquals("Assert 'simple' equality", p.get("Simple"), "simple");
@@ -74,7 +74,7 @@ public class HandlerWithFieldInterceptor
ServiceReference ref2 = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), name);
assertNotNull("Check the foo service availability", ref2);
- FooService fs = (FooService) osgiHelper.getServiceObject(ref2);
+ FooService fs = (FooService) osgiHelper.getRawServiceObject(ref2);
fs.foo(); // This trigger the changes.
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigAdmin.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigAdmin.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigAdmin.java Sun Mar 9 08:03:56 2014
@@ -62,8 +62,8 @@ public class TestConfigAdmin extends Com
conf.delete();
grace();
- ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), pid);
- assertNull("Check instance deletion", ref);
+ boolean av = ipojoHelper.isServiceAvailableByName(FooService.class.getName(), pid);
+ assertFalse("Check instance deletion", av);
}
/**
@@ -92,8 +92,8 @@ public class TestConfigAdmin extends Com
conf.delete();
grace();
- ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), pid);
- assertNull("Check instance deletion", ref);
+ boolean av = ipojoHelper.isServiceAvailableByName(FooService.class.getName(), pid);
+ assertFalse("Check instance deletion", av);
}
/**
@@ -130,8 +130,8 @@ public class TestConfigAdmin extends Com
conf.delete();
grace();
- ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), pid);
- assertNull("Check instance deletion", ref);
+ boolean av = ipojoHelper.isServiceAvailableByName(FooService.class.getName(), pid);
+ assertFalse("Check instance deletion", av);
}
/**
@@ -167,8 +167,8 @@ public class TestConfigAdmin extends Com
conf.delete();
grace();
- ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), pid);
- assertNull("Check instance deletion", ref);
+ boolean av = ipojoHelper.isServiceAvailableByName(FooService.class.getName(), pid);
+ assertFalse("Check instance deletion", av);
}
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestObedience.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestObedience.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestObedience.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestObedience.java Sun Mar 9 08:03:56 2014
@@ -87,7 +87,7 @@ public class TestObedience extends Commo
// Stop the handler
hf.stop();
- HandlerManagerFactory hf2 = (HandlerManagerFactory) ipojoHelper.getHandlerFactory("controller");
+ HandlerManagerFactory hf2 = (HandlerManagerFactory) ipojoHelper.getFactoryHelper().getHandlerFactory("controller", 1, false);
assertNull("Check handler availability -2", hf2);
// Check the factory invalidity
@@ -96,8 +96,8 @@ public class TestObedience extends Commo
assertEquals("Check factory state -2", Factory.INVALID, cf.getState());
// Check the instance disappearance, the instance was disposed.
- ref_arch = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "SimpleInstance");
- assertNull("Check Architecture availability -1", ref_arch);
+ assertFalse("Check Architecture availability -1", ipojoHelper
+ .isServiceAvailableByName(Architecture.class.getName(), "SimpleInstance"));
// Restart the handler
hf.start();
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java Sun Mar 9 08:03:56 2014
@@ -99,7 +99,7 @@ public class FactoryVersionTest extends
// Version 1.0
ServiceReference refv1 = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "instance-v1");
Assert.assertNotNull(refv1);
- Architecture archv1 = (Architecture) osgiHelper.getServiceObject(refv1);
+ Architecture archv1 = (Architecture) osgiHelper.getRawServiceObject(refv1);
String version = archv1.getInstanceDescription().getComponentDescription().getVersion();
Assert.assertEquals("1.0", version);
@@ -107,7 +107,7 @@ public class FactoryVersionTest extends
// Version 1.1
ServiceReference refv11 = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "instance-v1.1");
Assert.assertNotNull(refv11);
- Architecture archv11 = (Architecture) osgiHelper.getServiceObject(refv11);
+ Architecture archv11 = (Architecture) osgiHelper.getRawServiceObject(refv11);
String version11 = archv11.getInstanceDescription().getComponentDescription().getVersion();
Assert.assertEquals("1.1", version11);
@@ -115,7 +115,7 @@ public class FactoryVersionTest extends
// No Version
ServiceReference refany = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "instance-any");
Assert.assertNotNull(refany);
- Architecture archany = (Architecture) osgiHelper.getServiceObject(refany);
+ Architecture archany = (Architecture) osgiHelper.getRawServiceObject(refany);
String any = archany.getInstanceDescription().getComponentDescription().getVersion();
Assert.assertNotNull(any);
@@ -123,7 +123,7 @@ public class FactoryVersionTest extends
// No version set in the factory, so no version.
ServiceReference refmci = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "MyComponentInstance");
Assert.assertNotNull(refmci);
- Architecture archmcy = (Architecture) osgiHelper.getServiceObject(refmci);
+ Architecture archmcy = (Architecture) osgiHelper.getRawServiceObject(refmci);
String mci = archmcy.getInstanceDescription().getComponentDescription().getVersion();
Assert.assertNull(mci);
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java Sun Mar 9 08:03:56 2014
@@ -202,7 +202,7 @@ public class VersionConflictTest extends
ServiceReference refv1 = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "mycons");
Assert.assertNotNull(refv1);
- Architecture arch = (Architecture) osgiHelper.getServiceObject(refv1);
+ Architecture arch = (Architecture) osgiHelper.getRawServiceObject(refv1);
HandlerDescription desc = arch.getInstanceDescription().getHandlerDescription("org.apache.felix.ipojo:requires");
Assert.assertNotNull(desc);
@@ -215,7 +215,7 @@ public class VersionConflictTest extends
Assert.assertEquals(Dependency.RESOLVED, dep.getState());
Assert.assertEquals(1, dep.getServiceReferences().size());
- ServiceReference r = (ServiceReference) dep.getServiceReferences().get(0);
+ ServiceReference r = dep.getServiceReferences().get(0);
Assert.assertEquals("provider", r.getProperty("factory.name"));
Assert.assertEquals("2.0", r.getProperty("factory.version"));
}
@@ -256,7 +256,7 @@ public class VersionConflictTest extends
ServiceReference refv1 = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "mycons");
Assert.assertNotNull(refv1);
- Architecture arch = (Architecture) osgiHelper.getServiceObject(refv1);
+ Architecture arch = (Architecture) osgiHelper.getRawServiceObject(refv1);
HandlerDescription desc = arch.getInstanceDescription().getHandlerDescription("org.apache.felix.ipojo:requires");
Assert.assertNotNull(desc);
@@ -269,7 +269,7 @@ public class VersionConflictTest extends
Assert.assertEquals(Dependency.RESOLVED, dep.getState());
Assert.assertEquals(1, dep.getServiceReferences().size());
- ServiceReference r = (ServiceReference) dep.getServiceReferences().get(0);
+ ServiceReference r = dep.getServiceReferences().get(0);
Assert.assertEquals("provider", r.getProperty("factory.name"));
Assert.assertEquals("1.0", r.getProperty("factory.version"));
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/IgnoreCaseHandlerSelectionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/IgnoreCaseHandlerSelectionTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/IgnoreCaseHandlerSelectionTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/IgnoreCaseHandlerSelectionTest.java Sun Mar 9 08:03:56 2014
@@ -129,7 +129,7 @@ public class IgnoreCaseHandlerSelectionT
public void testCreationOfIgnoreCase1() {
ServiceReference refv1 = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "IgnoreCase-1");
Assert.assertNotNull(refv1);
- Architecture arch = (Architecture) osgiHelper.getServiceObject(refv1);
+ Architecture arch = (Architecture) osgiHelper.getRawServiceObject(refv1);
Assert.assertEquals(ComponentInstance.VALID, arch.getInstanceDescription().getState());
HandlerDescription desc = arch.getInstanceDescription()
@@ -146,7 +146,7 @@ public class IgnoreCaseHandlerSelectionT
public void testCreationOfIgnoreCase2() {
ServiceReference refv1 = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "IgnoreCase-2");
Assert.assertNotNull(refv1);
- Architecture arch = (Architecture) osgiHelper.getServiceObject(refv1);
+ Architecture arch = (Architecture) osgiHelper.getRawServiceObject(refv1);
Assert.assertEquals(ComponentInstance.VALID, arch.getInstanceDescription().getState());
HandlerDescription desc = arch.getInstanceDescription()
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Tools.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Tools.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Tools.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Tools.java Sun Mar 9 08:03:56 2014
@@ -42,7 +42,7 @@ public class Tools {
if (ref != null) {
// Get the factory
- return (Factory) osgi.getServiceObject(ref);
+ return (Factory) osgi.getRawServiceObject(ref);
} else {
return null;
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestCallback.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestCallback.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestCallback.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestCallback.java Sun Mar 9 08:03:56 2014
@@ -64,7 +64,8 @@ public class TestCallback extends Common
// Check instance is invalid
ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance.getInstanceName());
assertNotNull("Check architecture availability", arch_ref);
- PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+ PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper
+ .getRawServiceObject(arch_ref)).getInstanceDescription();
assertTrue("Check instance invalidity - 1", id_dep.getState() == ComponentInstance.INVALID);
assertEquals("Check pojo count - 1", id_dep.getCreatedObjects().length, 0);
@@ -78,7 +79,7 @@ public class TestCallback extends Common
// Check service providing
ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
// Check int property
@@ -103,7 +104,7 @@ public class TestCallback extends Common
// Check service providing
cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
// Check int property
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallback.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallback.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallback.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallback.java Sun Mar 9 08:03:56 2014
@@ -64,7 +64,8 @@ public class TestImmediateCallback exten
// Check instance is invalid
ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance.getInstanceName());
assertNotNull("Check architecture availability", arch_ref);
- PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+ PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper
+ .getRawServiceObject(arch_ref)).getInstanceDescription();
assertTrue("Check instance invalidity - 1", id_dep.getState() == ComponentInstance.INVALID);
assertEquals("Check pojo count - 1", id_dep.getCreatedObjects().length, 0);
@@ -78,7 +79,7 @@ public class TestImmediateCallback exten
// Check service providing
ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
assertEquals("Check pojo count - 2", id_dep.getCreatedObjects().length, 1);
@@ -102,7 +103,7 @@ public class TestImmediateCallback exten
// Check service providing
cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
// Check int property
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSeveralFactories.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSeveralFactories.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSeveralFactories.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSeveralFactories.java Sun Mar 9 08:03:56 2014
@@ -67,8 +67,8 @@ public class TestImmediateCallbackSevera
ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(),
instance.getInstanceName());
assertNotNull("Check architecture availability", arch_ref);
- PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper.getServiceObject
- (arch_ref)).getInstanceDescription();
+ PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper
+ .getRawServiceObject(arch_ref)).getInstanceDescription();
assertTrue("Check instance invalidity - 1", id_dep.getState() == ComponentInstance.INVALID);
assertEquals("Check pojo count - 1", id_dep.getCreatedObjects().length, 0);
@@ -82,7 +82,7 @@ public class TestImmediateCallbackSevera
// Check service providing
ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
assertEquals("Check pojo count - 2", id_dep.getCreatedObjects().length, 1);
@@ -108,7 +108,7 @@ public class TestImmediateCallbackSevera
// Check service providing
cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
// Check int property
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSingletonFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSingletonFactory.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSingletonFactory.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSingletonFactory.java Sun Mar 9 08:03:56 2014
@@ -67,7 +67,8 @@ public class TestImmediateCallbackSingle
// Check instance is invalid
ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance.getInstanceName());
assertNotNull("Check architecture availability", arch_ref);
- PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+ PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper
+ .getRawServiceObject(arch_ref)).getInstanceDescription();
assertTrue("Check instance invalidity - 1", id_dep.getState() == ComponentInstance.INVALID);
assertEquals("Check pojo count - 1", id_dep.getCreatedObjects().length, 0);
@@ -81,7 +82,7 @@ public class TestImmediateCallbackSingle
// Check service providing
ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
assertEquals("Check pojo count - 2", id_dep.getCreatedObjects().length, 1);
@@ -105,7 +106,7 @@ public class TestImmediateCallbackSingle
// Check service providing
cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
// Check int property
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java Sun Mar 9 08:03:56 2014
@@ -49,7 +49,7 @@ public class TestImmediateLifeCycleContr
// The conf is correct, the PS must be provided
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under");
assertNotNull("Check service availability -1", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 1", cs.check());
bc.ungetService(ref);
@@ -61,9 +61,9 @@ public class TestImmediateLifeCycleContr
fail("The reconfiguration is not unacceptable and seems unacceptable : " + props);
}
- // The instance should now be invalid
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under");
- assertNull("Check service availability -2", ref);
+ // The instance should now be invalid
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under"));
// Reconfigure the instance with a valid configuration
props.put("conf", "foo"); // Bar is a bad conf
@@ -75,7 +75,7 @@ public class TestImmediateLifeCycleContr
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under");
assertNotNull("Check service availability -3", ref);
- cs = (CheckService) osgiHelper.getServiceObject(ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 2", cs.check());
bc.ungetService(ref);
under.dispose();
@@ -91,8 +91,8 @@ public class TestImmediateLifeCycleContr
assertEquals("check under state", under.getState(), ComponentInstance.INVALID);
// The conf is incorrect, the PS must not be provided
- ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under");
- assertNull("Check service availability -1", ref);
+ assertFalse("Check service availability -1",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under"));
// Reconfigure the instance with a correct configuration
props.put("conf", "foo");
@@ -102,9 +102,9 @@ public class TestImmediateLifeCycleContr
fail("The reconfiguration is not unacceptable and seems unacceptable : " + props);
}
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under");
+ ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under");
assertNotNull("Check service availability -2", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state ", cs.check());
bc.ungetService(ref);
under.dispose();
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestParentCallback.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestParentCallback.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestParentCallback.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestParentCallback.java Sun Mar 9 08:03:56 2014
@@ -64,7 +64,8 @@ public class TestParentCallback extends
// Check instance is invalid
ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance.getInstanceName());
assertNotNull("Check architecture availability", arch_ref);
- PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+ PrimitiveInstanceDescription id_dep = (PrimitiveInstanceDescription) ((Architecture) osgiHelper
+ .getRawServiceObject(arch_ref)).getInstanceDescription();
assertTrue("Check instance invalidity - 1", id_dep.getState() == ComponentInstance.INVALID);
// Start fooprovider
@@ -77,7 +78,6 @@ public class TestParentCallback extends
// Check service providing
ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
// Check int property
assertEquals("Check pojo count - 2", id_dep.getCreatedObjects().length, 1);
@@ -96,7 +96,7 @@ public class TestParentCallback extends
// Check service providing
cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance.getInstanceName());
assertNotNull("Check CheckService availability", cs_ref);
- cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
assertTrue("check CheckService invocation", cs.check());
// Clean up
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigurableLifeCycleController.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigurableLifeCycleController.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigurableLifeCycleController.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigurableLifeCycleController.java Sun Mar 9 08:03:56 2014
@@ -54,7 +54,7 @@ public class TestConfigurableLifeCycleCo
// The conf is correct, the PS must be provided
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -1", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 1", cs.check());
bc.ungetService(ref);
@@ -67,8 +67,8 @@ public class TestConfigurableLifeCycleCo
}
// The instance should now be invalid
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
- assertNull("Check service availability -2", ref);
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under1"));
// Reconfigure the instance with a valid configuration
props.put("state", "true");
@@ -80,7 +80,7 @@ public class TestConfigurableLifeCycleCo
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -3", ref);
- cs = (CheckService) osgiHelper.getServiceObject(ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 2", cs.check());
bc.ungetService(ref);
@@ -95,8 +95,8 @@ public class TestConfigurableLifeCycleCo
under = factory.createComponentInstance(props);
// The instance should now be invalid
- ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
- assertNull("Check service availability -2", ref);
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under1"));
// Reconfigure the instance
props.put("state", "true"); // Bar is a bad conf
@@ -112,9 +112,9 @@ public class TestConfigurableLifeCycleCo
// System.out.println(a.getInstanceDescription().getDescription());
// }
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
+ ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -1", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 1", cs.check());
bc.ungetService(ref);
@@ -128,8 +128,8 @@ public class TestConfigurableLifeCycleCo
}
// The instance should now be invalid
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
- assertNull("Check service availability -2", ref);
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under1"));
// Reconfigure the instance with a valid configuration
props.put("state", "true");
@@ -141,7 +141,7 @@ public class TestConfigurableLifeCycleCo
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -3", ref);
- cs = (CheckService) osgiHelper.getServiceObject(ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 2", cs.check());
bc.ungetService(ref);
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java Sun Mar 9 08:03:56 2014
@@ -49,7 +49,7 @@ public class TestImmediateLifeCycleContr
// The conf is correct, the PS must be provided
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -1", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 1", cs.check());
bc.ungetService(ref);
@@ -63,8 +63,8 @@ public class TestImmediateLifeCycleContr
}
// The instance should now be invalid
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
- assertNull("Check service availability -2", ref);
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under1"));
// Reconfigure the instance with a valid configuration
props.put("conf", "foo"); // Bar is a bad conf
@@ -76,7 +76,7 @@ public class TestImmediateLifeCycleContr
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -3", ref);
- cs = (CheckService) osgiHelper.getServiceObject(ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 2", cs.check());
bc.ungetService(ref);
@@ -93,8 +93,8 @@ public class TestImmediateLifeCycleContr
assertEquals("check under state", under.getState(), ComponentInstance.INVALID);
// The conf is incorrect, the PS must not be provided
- ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under2");
- assertNull("Check service availability -1", ref);
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under2"));
// Reconfigure the instance with a correct configuration
props.put("conf", "foo");
@@ -104,9 +104,9 @@ public class TestImmediateLifeCycleContr
fail("The reconfiguration is not unacceptable and seems unacceptable : " + props);
}
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under2");
+ ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under2");
assertNotNull("Check service availability -2", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state ", cs.check());
bc.ungetService(ref);
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestLifeCycleController.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestLifeCycleController.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestLifeCycleController.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestLifeCycleController.java Sun Mar 9 08:03:56 2014
@@ -54,7 +54,7 @@ public class TestLifeCycleController ext
// The conf is correct, the PS must be provided
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -1", ref);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 1", cs.check());
bc.ungetService(ref);
@@ -67,8 +67,8 @@ public class TestLifeCycleController ext
}
// The instance should now be invalid
- ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
- assertNull("Check service availability -2", ref);
+ assertFalse("Check service availability -2",
+ ipojoHelper.isServiceAvailableByName(CheckService.class.getName(), "under1"));
// Reconfigure the instance with a valid configuration
props.put("conf", "foo"); // Bar is a bad conf
@@ -80,7 +80,7 @@ public class TestLifeCycleController ext
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under1");
assertNotNull("Check service availability -3", ref);
- cs = (CheckService) osgiHelper.getServiceObject(ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state 2", cs.check());
bc.ungetService(ref);
@@ -104,13 +104,12 @@ public class TestLifeCycleController ext
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under2");
assertNotNull("Check service availability -1", ref);
- System.out.println("CS received : " + osgiHelper.getServiceObject(ref));
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ System.out.println("CS received : " + osgiHelper.getRawServiceObject(ref));
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertNotNull("Assert CS not null", cs);
try {
assertFalse("Check state (false)", cs.check());
} catch (Throwable e) {
- e.printStackTrace();
fail(e.getMessage());
}
@@ -128,7 +127,7 @@ public class TestLifeCycleController ext
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "under2");
assertNotNull("Check service availability -3", ref);
- cs = (CheckService) osgiHelper.getServiceObject(ref);
+ cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue("Check state ", cs.check());
bc.ungetService(ref);
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManifestLoggerInfo.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManifestLoggerInfo.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManifestLoggerInfo.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManifestLoggerInfo.java Sun Mar 9 08:03:56 2014
@@ -97,7 +97,6 @@ public class TestManifestLoggerInfo exte
ServiceReference r = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(),
"org.apache.felix.ipojo.runtime.core.components.MyComponent-0");
Assert.assertNotNull(r);
- System.out.println(((Architecture) osgiHelper.getServiceObject(r)).getInstanceDescription().getDescription());
ServiceReference[] refs = bc.getAllServiceReferences(null, null);
for (ServiceReference ref : refs) {
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestBindingInterceptors.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestBindingInterceptors.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestBindingInterceptors.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestBindingInterceptors.java Sun Mar 9 08:03:56 2014
@@ -58,7 +58,7 @@ public class TestBindingInterceptors ext
ServiceReference ref = osgiHelper.waitForService(CheckService.class.getName(),
"(instance.name=" + instance.getInstanceName() + ")",
1000, true);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
assertThat(check.check());
@@ -89,7 +89,7 @@ public class TestBindingInterceptors ext
ServiceReference ref = osgiHelper.waitForService(CheckService.class.getName(),
"(instance.name=" + instance.getInstanceName() + ")",
1000, true);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
assertThat(check.check());
@@ -147,7 +147,7 @@ public class TestBindingInterceptors ext
ServiceReference ref = osgiHelper.waitForService(CheckService.class.getName(),
"(instance.name=" + instance.getInstanceName() + ")",
1000, true);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
assertThat(check.check());
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestInterceptorsOnSeveralDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestInterceptorsOnSeveralDependencies.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestInterceptorsOnSeveralDependencies.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestInterceptorsOnSeveralDependencies.java Sun Mar 9 08:03:56 2014
@@ -67,8 +67,8 @@ public class TestInterceptorsOnSeveralDe
final ServiceReference ref2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(),
instance2.getInstanceName());
- CheckService cs1 = (CheckService) osgiHelper.getServiceObject(ref1);
- CheckService cs2 = (CheckService) osgiHelper.getServiceObject(ref2);
+ CheckService cs1 = (CheckService) osgiHelper.getRawServiceObject(ref1);
+ CheckService cs2 = (CheckService) osgiHelper.getRawServiceObject(ref2);
@SuppressWarnings("unchecked") Map<String, ?> props1 = (Map<String, ?>) cs1.getProps().get("props");
@SuppressWarnings("unchecked") Map<String, ?> props2 = (Map<String, ?>) cs2.getProps().get("props");