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 [1/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...
Author: clement
Date: Sun Mar 9 08:03:56 2014
New Revision: 1575671
URL: http://svn.apache.org/r1575671
Log:
Update equinox and KF versions
Update OSGi testing helper library to 0.6.2
Update test to use the new API (required for KF)
Added:
felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/PlainHelloImpl.java (with props)
felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/PlainHello.java (with props)
Modified:
felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/CompositeTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/PrimitiveComponentTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/SingletonComponentTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/annotations/TestDependency.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdated.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexConfigurations.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestBothProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConstructorInjectionOfProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestFieldProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestListeners.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestMethodProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertyModifier.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSuperMethodProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethod.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndConfigAdmin.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedMethodAndManagedService.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndConfigAdmin.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdatedNoArgMethodAndManagedService.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/ (props changed)
felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/GermanHelloService.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/Common.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-declaration-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/declaration/TestDeclarationBuilderService.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/src/test/java/org/apache/felix/ipojo/runtime/externalhandlers/test/HandlerWithFieldInterceptorTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigAdmin.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestObedience.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/IgnoreCaseHandlerSelectionTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Tools.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestCallback.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallback.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSeveralFactories.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateCallbackSingletonFactory.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestParentCallback.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConfigurableLifeCycleController.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestImmediateLifeCycleController.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestLifeCycleController.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManifestLoggerInfo.java
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
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
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestDelayedOptionalDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestDelayedOptionalMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestMethodDelayedOptionalDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestMethodDelayedOptionalMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestMethodOptionalDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestMethodOptionalMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestOptionalDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestOptionalMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestOptionalNoNullableDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestProxiedDelayedOptionalDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestProxiedDelayedOptionalMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/optional/TestProxiedOptionalDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/comparator/TestComparator.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxiedCollectionMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxiedDelayedMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxiedDelayedSimpleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxiedListMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxiedSetMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxiedSimpleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/proxies/TestProxyTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestCollectionMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestDelayedMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestDelayedSimpleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestDependencyArchitecture.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestListMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestMethodDelayedMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestMethodDelayedSimpleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestMethodMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestMethodSimpleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestModifyDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestSetMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestSimpleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestVectorMultipleDependencies.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DefaultImplementationTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DelayTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/EmptyTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullableTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/TimeoutTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestClass.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicProps.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExposition.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNullCheck.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestOSGiProperties.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertiesInAnonymousClass.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestProvidedServiceArchitecture.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSimplePS.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestStaticPropsReconfiguration.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/inheritence/InheritanceTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategy2Test.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategyTest.java
felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/PerInstanceStrategyTest.java
felix/trunk/ipojo/runtime/core-it/pom.xml
Added: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/PlainHelloImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/PlainHelloImpl.java?rev=1575671&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/PlainHelloImpl.java (added)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/PlainHelloImpl.java Sun Mar 9 08:03:56 2014
@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.felix.ipojo.runtime.core.api.components;
+
+import org.apache.felix.ipojo.runtime.core.api.services.PlainHello;
+
+
+public class PlainHelloImpl implements PlainHello {
+
+ public void sayHello() {
+ System.out.println("Plainly Hello :D");
+
+ }
+
+ public PlainHelloImpl() {
+ System.out.println("in constructor");
+ }
+
+
+ public void start() {
+
+ System.out.println("Hello, this is the plain hello component start method");
+ }
+
+ public void stop() {
+ System.out.println("Bye, this is the plain hello component stop method");
+ }
+
+
+}
Propchange: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/PlainHelloImpl.java
------------------------------------------------------------------------------
svn:executable = *
Added: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/PlainHello.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/PlainHello.java?rev=1575671&view=auto
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/PlainHello.java (added)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/PlainHello.java Sun Mar 9 08:03:56 2014
@@ -0,0 +1,24 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.felix.ipojo.runtime.core.api.services;
+
+public interface PlainHello {
+ public void sayHello();
+
+}
\ No newline at end of file
Propchange: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/PlainHello.java
------------------------------------------------------------------------------
svn:executable = *
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/CompositeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/CompositeTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/CompositeTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/CompositeTest.java Sun Mar 9 08:03:56 2014
@@ -83,7 +83,7 @@ public class CompositeTest extends Commo
"(component.providedServiceSpecifications=" + Foo.class.getName() + ")");
assertThat(refs.length, is(not(0)));
- Factory factory = (Factory) osgiHelper.getServiceObject(refs[0]);
+ Factory factory = (Factory) osgiHelper.getRawServiceObject(refs[0]);
System.out.println(factory.getComponentDescription().getDescription());
CompositeComponentType type = new CompositeComponentType()
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/PrimitiveComponentTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/PrimitiveComponentTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/PrimitiveComponentTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/PrimitiveComponentTest.java Sun Mar 9 08:03:56 2014
@@ -19,16 +19,14 @@
package org.apache.felix.ipojo.runtime.core.api;
-import org.apache.felix.ipojo.ComponentInstance;
-import org.apache.felix.ipojo.ConfigurationException;
-import org.apache.felix.ipojo.MissingHandlerException;
-import org.apache.felix.ipojo.UnacceptableConfiguration;
+import org.apache.felix.ipojo.*;
import org.apache.felix.ipojo.api.Dependency;
import org.apache.felix.ipojo.api.PrimitiveComponentType;
import org.apache.felix.ipojo.api.Service;
import org.apache.felix.ipojo.api.SingletonComponentType;
import org.apache.felix.ipojo.runtime.core.api.components.FooImpl;
import org.apache.felix.ipojo.runtime.core.api.components.MyComponentImpl;
+import org.apache.felix.ipojo.runtime.core.api.components.PlainHelloImpl;
import org.apache.felix.ipojo.runtime.core.api.services.Foo;
import org.junit.Before;
import org.junit.Test;
@@ -79,15 +77,13 @@ public class PrimitiveComponentTest exte
PrimitiveComponentType type = createAProvider();
ci = type.createInstance();
assertThat("Ci is valid", ci.getState(), is(ComponentInstance.VALID));
- ServiceReference ref = ipojoHelper.getServiceReferenceByName(Foo.class
- .getName(), ci.getInstanceName());
- assertThat(ref, is(notNullValue()));
+ assertThat(ipojoHelper.isServiceAvailableByName(Foo.class.getName(), ci
+ .getInstanceName()), is(true));
type.stop();
assertThat("Ci is disposed", ci.getState(),
is(ComponentInstance.DISPOSED));
- ref = ipojoHelper.getServiceReferenceByName(Foo.class.getName(), ci
- .getInstanceName());
- assertThat(ref, is(nullValue()));
+ assertThat(ipojoHelper.isServiceAvailableByName(Foo.class.getName(), ci
+ .getInstanceName()), is(false));
}
@@ -134,6 +130,29 @@ public class PrimitiveComponentTest exte
assertThat("cons2 is valid", cons2.getState(), is(ComponentInstance.VALID));
}
+ @Test
+ public void notManipulatedComponent() throws Exception {
+ assertThat(context, is(notNullValue()));
+ ComponentInstance ci;
+
+ PrimitiveComponentType x= new PrimitiveComponentType()
+ .setBundleContext(context)
+ .setClassName(PlainHelloImpl.class.getName())
+ .setValidateMethod("start")
+ .setInvalidateMethod("stop");
+
+ x.start();
+
+ assertThat(x, is(notNullValue()));
+ assertThat(x.getFactory().getState(), is(Factory.VALID));
+
+ ci = x.createInstance();
+ ci.start();
+ assertThat(ci.getState(), is(ComponentInstance.VALID));
+
+ x.stop();
+ }
+
private PrimitiveComponentType createAProvider() {
return new PrimitiveComponentType()
.setBundleContext(context)
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/SingletonComponentTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/SingletonComponentTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/SingletonComponentTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/SingletonComponentTest.java Sun Mar 9 08:03:56 2014
@@ -77,9 +77,8 @@ public class SingletonComponentTest exte
type.stop();
assertThat("Ci is disposed", ci.getState(),
is(ComponentInstance.DISPOSED));
- ref = ipojoHelper.getServiceReferenceByName(Foo.class.getName(), ci
- .getInstanceName());
- assertThat(ref, is(nullValue()));
+ assertThat(ipojoHelper.isServiceAvailableByName(Foo.class.getName(), ci
+ .getInstanceName()), is(false));
}
@Test
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java Sun Mar 9 08:03:56 2014
@@ -109,7 +109,7 @@ public abstract class Common extends Bas
bundle.add(HelloServiceProvider.class);
InputStream inputStream = bundle
.set(Constants.BUNDLE_SYMBOLICNAME, "iPOJO-Hello-Provider")
- .set(Constants.IMPORT_PACKAGE, "*")
+ //.set(Constants.IMPORT_PACKAGE, "*")
.build(IPOJOStrategy.withiPOJO());
try {
@@ -138,7 +138,7 @@ public abstract class Common extends Bas
bundle.add(HelloServiceConsumer.class);
InputStream inputStream = bundle
.set(Constants.BUNDLE_SYMBOLICNAME, "iPOJO-Hello-Consumer")
- .set(Constants.IMPORT_PACKAGE, "*")
+ //.set(Constants.IMPORT_PACKAGE, "*")
.build(IPOJOStrategy.withiPOJO());
try {
@@ -175,7 +175,7 @@ public abstract class Common extends Bas
InputStream inputStream = bundle
.set(Constants.BUNDLE_SYMBOLICNAME, "hello-provider-scr")
- .set(Constants.IMPORT_PACKAGE, "*")
+ //.set(Constants.IMPORT_PACKAGE, "*")
.set("Service-Component", "scr/provider.xml")
.build(withBnd());
@@ -210,7 +210,7 @@ public abstract class Common extends Bas
InputStream inputStream = bundle
.set(Constants.BUNDLE_SYMBOLICNAME, "hello-consumer-scr")
- .set(Constants.IMPORT_PACKAGE, "*")
+ // .set(Constants.IMPORT_PACKAGE, "*")
.set("Service-Component", "scr/consumer.xml")
.build(withBnd());
@@ -248,7 +248,7 @@ public abstract class Common extends Bas
InputStream inputStream = bundle
.set(Constants.BUNDLE_SYMBOLICNAME, "hello-provider-blueprint")
- .set(Constants.IMPORT_PACKAGE, "*")
+ // .set(Constants.IMPORT_PACKAGE, "*")
.set("Bundle-Blueprint", "blueprint/provider.xml")
.build(withBnd());
@@ -283,7 +283,7 @@ public abstract class Common extends Bas
InputStream inputStream = bundle
.set(Constants.BUNDLE_SYMBOLICNAME, "hello-consumer-blueprint")
- .set(Constants.IMPORT_PACKAGE, "*")
+ // .set(Constants.IMPORT_PACKAGE, "*")
.set("Bundle-Blueprint", "blueprint/consumer.xml")
.build(withBnd());
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java Sun Mar 9 08:03:56 2014
@@ -35,11 +35,9 @@ import static org.ops4j.pax.exam.CoreOpt
*/
public class TestBeingConsumedByEquinoxSCR1_4_100 extends Common {
- public static String DS_URL = "http://www.dynamis-technologies.com/ipojo/bundles/org.eclipse.equinox.ds_1.4.100" +
- ".v20130515-2026.jar";
+ public static String DS_URL = "http://people.apache.org/~clement/ipojo/bundle4tests/org.eclipse.equinox.ds_1.4.101.v20130813-1853.jar";
- public static String UTILS_URL = "http://www.dynamis-technologies.com/ipojo/bundles/org.eclipse.equinox.util_1.0" +
- ".500.v20130404-1337.jar";
+ public static String UTILS_URL = "http://people.apache.org/~clement/ipojo/bundle4tests/org.eclipse.equinox.util_1.0.500.v20130404-1337.jar";
@Override
public Option[] bundles() {
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java Sun Mar 9 08:03:56 2014
@@ -38,11 +38,9 @@ import static org.ops4j.pax.exam.CoreOpt
*/
public class TestConsumingProviderUsingEquinoxSCR1_4_100 extends Common {
- public static String DS_URL = "http://www.dynamis-technologies.com/ipojo/bundles/org.eclipse.equinox.ds_1.4.100" +
- ".v20130515-2026.jar";
+ public static String DS_URL = "http://people.apache.org/~clement/ipojo/bundle4tests/org.eclipse.equinox.ds_1.4.101.v20130813-1853.jar";
- public static String UTILS_URL = "http://www.dynamis-technologies.com/ipojo/bundles/org.eclipse.equinox.util_1.0" +
- ".500.v20130404-1337.jar";
+ public static String UTILS_URL = "http://people.apache.org/~clement/ipojo/bundle4tests/org.eclipse.equinox.util_1.0.500.v20130404-1337.jar";
@Override
public Option[] bundles() {
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/annotations/TestDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/annotations/TestDependency.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/annotations/TestDependency.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/annotations/TestDependency.java Sun Mar 9 08:03:56 2014
@@ -126,7 +126,7 @@ public class TestDependency extends Comm
assertNotNull(ref);
- CheckService svc = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService svc = (CheckService) osgiHelper.getRawServiceObject(ref);
assertFalse(svc.check());
// The following instantiation exposes the BarService required by instance.
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdated.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdated.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdated.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestUpdated.java Sun Mar 9 08:03:56 2014
@@ -48,11 +48,10 @@ public class TestUpdated extends Common
Configuration configuration = admin.createFactoryConfiguration(factoryName, "?");
configuration.update(props);
- ServiceReference ref = osgiHelper.waitForService(FooService.class.getName(),
+ FooService fs = osgiHelper.waitForService(FooService.class,
"(instance.name=" + configuration.getPid() + ")",
1000);
- FooService fs = (FooService) osgiHelper.getServiceObject(ref);
assertEquals(fs.getInt(), 1);
// Update the property
@@ -88,11 +87,10 @@ public class TestUpdated extends Common
Configuration configuration = admin.createFactoryConfiguration(factoryName, "?");
configuration.update(props);
- ServiceReference ref = osgiHelper.waitForService(FooService.class.getName(),
+ FooService fs = osgiHelper.waitForService(FooService.class,
"(instance.name=" + configuration.getPid() + ")",
1000);
- FooService fs = (FooService) osgiHelper.getServiceObject(ref);
assertEquals(fs.getInt(), 1);
// Update the property using the managed service.
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexConfigurations.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexConfigurations.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexConfigurations.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexConfigurations.java Sun Mar 9 08:03:56 2014
@@ -124,18 +124,15 @@ public class TestComplexConfigurations e
TimeUtils.grace(500);
osgiHelper.waitForService(FooService.class, null, 10000);
- ServiceReference ref1 = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "complex1");
- Assert.assertNotNull(ref1);
- FooService fs1 = (FooService) osgiHelper.getServiceObject(ref1);
+ FooService fs1 = ipojoHelper.getServiceObjectByName(FooService.class, "complex1");
Properties props1 = fs1.fooProps();
Assert.assertTrue(((String)props1.get("content")).contains("I'm file 1"));
Assert.assertEquals(((Bean)props1.get("bean")).getMessage(), "I'm 1");
Assert.assertEquals(((Bean)props1.get("bean")).getCount(), 1);
Assert.assertEquals(((Map<String, String>)props1.get("map")).get("a"), "b");
- ServiceReference ref2 = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "complex2");
- Assert.assertNotNull(ref2);
- FooService fs2 = (FooService) osgiHelper.getServiceObject(ref2);
+ FooService fs2 = ipojoHelper.getServiceObjectByName(FooService.class, "complex2");
+ Assert.assertNotNull(fs2);
Properties props2 = fs2.fooProps();
Assert.assertTrue(((String)props2.get("content")).contains("I'm file 2"));
Assert.assertEquals(((Bean)props2.get("bean")).getMessage(), "I'm 2");
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestBothProperties.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/TestBothProperties.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/TestBothProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestBothProperties.java Sun Mar 9 08:03:56 2014
@@ -86,7 +86,7 @@ public class TestBothProperties extends
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");
@@ -129,7 +129,7 @@ public class TestBothProperties extends
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");
@@ -174,7 +174,7 @@ public class TestBothProperties extends
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");
@@ -217,7 +217,7 @@ public class TestBothProperties extends
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");
@@ -262,7 +262,7 @@ public class TestBothProperties extends
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");
@@ -321,7 +321,7 @@ public class TestBothProperties extends
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");
@@ -382,7 +382,7 @@ public class TestBothProperties extends
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");
@@ -441,7 +441,7 @@ public class TestBothProperties extends
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");
@@ -502,7 +502,7 @@ public class TestBothProperties extends
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");
@@ -523,7 +523,7 @@ public class TestBothProperties extends
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");
@@ -545,7 +545,7 @@ public class TestBothProperties extends
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");
@@ -566,7 +566,7 @@ public class TestBothProperties extends
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");
@@ -636,7 +636,7 @@ public class TestBothProperties extends
public void testConfigurationPrimitiveNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -679,7 +679,7 @@ public class TestBothProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -724,7 +724,7 @@ public class TestBothProperties extends
public void testConfigurationPrimitiveArraysNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -767,7 +767,7 @@ public class TestBothProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -828,7 +828,7 @@ public class TestBothProperties extends
public void testConfigurationObjNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
@@ -849,7 +849,7 @@ public class TestBothProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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/TestComplexProperties.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/TestComplexProperties.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/TestComplexProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestComplexProperties.java Sun Mar 9 08:03:56 2014
@@ -44,7 +44,7 @@ public class TestComplexProperties exten
public void setUp() {
m_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), "complex");
assertNotNull("Complex service availability", m_ref);
- m_check = (CheckService) osgiHelper.getServiceObject(m_ref);
+ m_check = (CheckService) osgiHelper.getRawServiceObject(m_ref);
}
@After
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConstructorInjectionOfProperties.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/TestConstructorInjectionOfProperties.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/TestConstructorInjectionOfProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestConstructorInjectionOfProperties.java Sun Mar 9 08:03:56 2014
@@ -49,7 +49,7 @@ public class TestConstructorInjectionOfP
"(instance.name=" + instance.getInstanceName() +")",
1000);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertEquals(cs.getProps().getProperty("message"), "message");
}
@@ -65,7 +65,7 @@ public class TestConstructorInjectionOfP
"(instance.name=" + instance.getInstanceName() +")",
1000);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertEquals(cs.getProps().getProperty("message"), "message");
}
@@ -78,7 +78,7 @@ public class TestConstructorInjectionOfP
"(instance.name=" + instance.getInstanceName() +")",
1000);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertEquals(cs.getProps().getProperty("message"), "message");
}
@@ -94,7 +94,7 @@ public class TestConstructorInjectionOfP
"(instance.name=" + instance.getInstanceName() +")",
1000);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertEquals(cs.getProps().getProperty("message"), "message");
assertEquals(cs.getProps().getProperty("product"), "ipojo");
}
@@ -111,7 +111,7 @@ public class TestConstructorInjectionOfP
"(instance.name=" + instance.getInstanceName() +")",
1000);
- CheckService cs = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref);
assertEquals(cs.getProps().getProperty("message"), "message");
assertNotNull(cs.getProps().get("context"));
assertTrue(cs.getProps().get("context") instanceof BundleContext);
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestFieldProperties.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/TestFieldProperties.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/TestFieldProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestFieldProperties.java Sun Mar 9 08:03:56 2014
@@ -96,7 +96,7 @@ public class TestFieldProperties extends
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");
@@ -121,7 +121,7 @@ public class TestFieldProperties extends
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");
@@ -148,7 +148,7 @@ public class TestFieldProperties extends
public void testConfigurationPrimitiveNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -173,7 +173,7 @@ public class TestFieldProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -200,7 +200,7 @@ public class TestFieldProperties extends
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");
@@ -225,7 +225,7 @@ public class TestFieldProperties extends
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");
@@ -252,7 +252,7 @@ public class TestFieldProperties extends
public void testConfigurationPrimitiveStringNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -277,7 +277,7 @@ public class TestFieldProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -304,7 +304,7 @@ public class TestFieldProperties extends
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");
@@ -345,7 +345,7 @@ public class TestFieldProperties extends
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");
@@ -388,7 +388,7 @@ public class TestFieldProperties extends
public void testConfigurationPrimitiveArraysNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -413,7 +413,7 @@ public class TestFieldProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -456,7 +456,7 @@ public class TestFieldProperties extends
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");
@@ -497,7 +497,7 @@ public class TestFieldProperties extends
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");
@@ -540,7 +540,7 @@ public class TestFieldProperties extends
public void testConfigurationPrimitiveArraysStringNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -565,7 +565,7 @@ public class TestFieldProperties extends
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -608,7 +608,7 @@ public class TestFieldProperties extends
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");
@@ -622,8 +622,7 @@ public class TestFieldProperties extends
reconfigure(instance);
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");
@@ -638,8 +637,7 @@ public class TestFieldProperties extends
@Test
public void testConfigurationObjNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -651,10 +649,8 @@ public class TestFieldProperties extends
reconfigure(instance2);
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
ss = (String[]) props.get("strings");
@@ -667,8 +663,7 @@ public class TestFieldProperties extends
@Test
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");
@@ -682,8 +677,7 @@ public class TestFieldProperties extends
reconfigureString(instance);
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");
@@ -698,8 +692,7 @@ public class TestFieldProperties extends
@Test
public void testConfigurationObjStringNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -711,8 +704,8 @@ public class TestFieldProperties extends
reconfigureString(instance2);
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.getInstanceName());
- assertNotNull("Test check service availability", ref);
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ assertNotNull("TeosgiHelper.getRawServiceObjectty", 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/TestListeners.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/TestListeners.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/TestListeners.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestListeners.java Sun Mar 9 08:03:56 2014
@@ -82,7 +82,7 @@ public class TestListeners extends Commo
// Get the service
ServiceReference ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProvider-42");
- foo = (FooService) osgiHelper.getServiceObject(ref);
+ foo = (FooService) osgiHelper.getRawServiceObject(ref);
}
@After
@@ -194,9 +194,12 @@ public class TestListeners extends Commo
fooConfig.addListener(null);
}
- @Test(expected = NoSuchElementException.class)
+ /**
+ * This test was initially expecting a NoSuchElementException, in 1.11.2, we changed the method to ignore missing
+ * listeners.
+ */
+ @Test
public void testRemoveNonexistentProvidedServiceListener() {
- // Should fail!
fooConfig.removeListener(new ThrowingListener());
}
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestMethodProperties.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/TestMethodProperties.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/TestMethodProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestMethodProperties.java Sun Mar 9 08:03:56 2014
@@ -126,7 +126,7 @@ public class TestMethodProperties extend
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");
@@ -169,7 +169,7 @@ public class TestMethodProperties extend
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");
@@ -214,7 +214,7 @@ public class TestMethodProperties extend
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");
@@ -257,7 +257,7 @@ public class TestMethodProperties extend
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");
@@ -302,7 +302,7 @@ public class TestMethodProperties extend
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");
@@ -361,7 +361,7 @@ public class TestMethodProperties extend
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");
@@ -422,7 +422,7 @@ public class TestMethodProperties extend
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");
@@ -481,7 +481,7 @@ public class TestMethodProperties extend
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");
@@ -542,7 +542,7 @@ public class TestMethodProperties extend
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");
@@ -563,7 +563,7 @@ public class TestMethodProperties extend
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");
@@ -585,7 +585,7 @@ public class TestMethodProperties extend
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");
@@ -606,7 +606,7 @@ public class TestMethodProperties extend
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");
@@ -628,7 +628,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitive2() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -671,7 +671,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -716,7 +716,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitive2String() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -759,7 +759,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -804,7 +804,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitiveArrays2() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -863,7 +863,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -924,7 +924,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitiveArrays2String() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -983,7 +983,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -1044,7 +1044,7 @@ public class TestMethodProperties extend
public void testConfigurationObj2() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -1065,7 +1065,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -1087,7 +1087,7 @@ public class TestMethodProperties extend
public void testConfigurationObj2String() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -1108,7 +1108,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.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");
@@ -1178,7 +1178,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitiveNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1221,7 +1221,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1266,7 +1266,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitiveStringNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1309,7 +1309,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1354,7 +1354,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitiveArraysNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.getInstanceName());
assertNotNull("Test check service availability", ref);
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
Properties props = check.getProps();
@@ -1398,7 +1398,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1459,7 +1459,7 @@ public class TestMethodProperties extend
public void testConfigurationPrimitiveArraysStringNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1503,7 +1503,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1564,7 +1564,7 @@ public class TestMethodProperties extend
public void testConfigurationObjNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1584,7 +1584,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1606,7 +1606,7 @@ public class TestMethodProperties extend
public void testConfigurationObjStringNoValue() {
ServiceReference ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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");
@@ -1626,7 +1626,7 @@ public class TestMethodProperties extend
ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.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/TestPropertyModifier.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/TestPropertyModifier.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/TestPropertyModifier.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertyModifier.java Sun Mar 9 08:03:56 2014
@@ -64,7 +64,7 @@ public class TestPropertyModifier extend
// Not exposed here:
assertNull("Classes -0", ref.getProperty("classes"));
- CheckService check = (CheckService) osgiHelper.getServiceObject(ref);
+ CheckService check = (CheckService) osgiHelper.getRawServiceObject(ref);
assertTrue(check.check());
// Property exposed now.
@@ -95,7 +95,7 @@ public class TestPropertyModifier extend
assertEquals("Classes[1] -3", CheckService.class.getName(), str[1].getName());
- check = (CheckService) osgiHelper.getServiceObject(ref);
+ check = (CheckService) osgiHelper.getRawServiceObject(ref);
p = check.getProps();
str2 = (Class[]) p.get("classes");
assertEquals("Classes size -4", 2, str2.length);