Author: clement
Date: Fri May 3 07:28:42 2013
New Revision: 1478662
URL: http://svn.apache.org/r1478662
Log:
Update to newest osgi-helpers
Removed:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPOJOCreation.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSeveralConstructor.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadata.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadataAPI.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestAnnotationProcessing.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDuplicateMethods.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExceptionHandling.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGenericList.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGetComponentInstance.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNestedClasses.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypes.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypesWithNumberInNames.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSwitches.java
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestTypeBoxing.java
Modified: felix/trunk/ipojo/manipulator/manipulator-it/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/pom.xml?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/pom.xml Fri May 3 07:28:42
2013
@@ -205,7 +205,7 @@
<dependency>
<groupId>org.ow2.chameleon.testing</groupId>
<artifactId>osgi-helpers</artifactId>
- <version>0.6.0</version>
+ <version>0.6.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -396,4 +396,13 @@
</build>
</profile>
</profiles>
+
+ <repositories>
+ <!-- Temporal addition of this repository until the osgi-helper are
released -->
+ <!-- TODO remove this before the release -->
+ <repository>
+ <id>ow2.snapshots</id>
+
<url>http://repository.ow2.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPOJOCreation.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPOJOCreation.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPOJOCreation.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPOJOCreation.java
Fri May 3 07:28:42 2013
@@ -27,7 +27,10 @@ import org.apache.felix.ipojo.runtime.co
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+import java.util.Arrays;
+import java.util.List;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
@@ -36,7 +39,7 @@ import static org.junit.Assert.*;
/**
* Check the different method to create POJO object.
*/
-public class TestPOJOCreation extends Common {
+public class TestPOJOCreation extends BaseTest {
private ComponentInstance ci_lazzy;
private ComponentInstance ci_immediate;
@@ -58,6 +61,11 @@ public class TestPOJOCreation extends Co
private Architecture lazzyArchSingM;
private Architecture lazzyArchSevM;
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
@Before
public void setUp() {
String factName = "ManipulationCreation-FooProviderType-1";
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSeveralConstructor.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSeveralConstructor.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSeveralConstructor.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-creation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSeveralConstructor.java
Fri May 3 07:28:42 2013
@@ -24,12 +24,13 @@ import org.apache.felix.ipojo.runtime.co
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class TestSeveralConstructor extends Common {
+public class TestSeveralConstructor extends BaseTest {
private ComponentInstance ci, ci2, ci3;
@@ -38,7 +39,6 @@ public class TestSeveralConstructor exte
ci =
ipojoHelper.createComponentInstance("org.apache.felix.ipojo.runtime.core.components.SeveralConstructors");
ci2 =
ipojoHelper.createComponentInstance("org.apache.felix.ipojo.runtime.core.components.NoEmptyConstructor");
ci3 =
ipojoHelper.createComponentInstance("org.apache.felix.ipojo.runtime.core.components.NoEmptyConstructorWithParentClass");
-
}
@Test
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadata.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadata.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadata.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadata.java
Fri May 3 07:28:42 2013
@@ -26,6 +26,7 @@ import org.apache.felix.ipojo.parser.Par
import org.apache.felix.ipojo.runtime.core.services.BarService;
import org.apache.felix.ipojo.runtime.core.services.FooService;
import org.junit.Test;
+import org.ow2.chameleon.testing.helpers.BaseTest;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.*;
@@ -33,11 +34,11 @@ import static org.junit.Assert.*;
/**
* Check manipulation metadata written in the manifest.
*/
-public class TestManipulationMetadata extends Common {
+public class TestManipulationMetadata extends BaseTest {
@Test
public void testGetMetadata() {
- String header = (String)
testedBundle.getHeaders().get("iPOJO-Components");
+ String header = (String)
getTestBundle().getHeaders().get("iPOJO-Components");
Element elem = null;
try {
elem = ManifestMetadataParser.parseHeaderMetadata(header);
@@ -212,7 +213,7 @@ public class TestManipulationMetadata ex
}
private Element getManipulationForComponent(String comp_name) {
- String header = (String)
testedBundle.getHeaders().get("iPOJO-Components");
+ String header = (String)
getTestBundle().getHeaders().get("iPOJO-Components");
Element elem = null;
try {
elem = ManifestMetadataParser.parseHeaderMetadata(header);
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadataAPI.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadataAPI.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadataAPI.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-metadata-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestManipulationMetadataAPI.java
Fri May 3 07:28:42 2013
@@ -26,11 +26,12 @@ import org.apache.felix.ipojo.runtime.co
import org.apache.felix.ipojo.runtime.core.services.FooService;
import org.junit.Before;
import org.junit.Test;
+import org.ow2.chameleon.testing.helpers.BaseTest;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.*;
-public class TestManipulationMetadataAPI extends Common {
+public class TestManipulationMetadataAPI extends BaseTest {
PojoMetadata FooProviderType1, FooBarProviderType1, FooProviderTypeDyn,
PrimitiveManipulationTester, SimpleMultipleCheckServiceProvider;
@@ -54,7 +55,7 @@ public class TestManipulationMetadataAPI
@Test
public void testGetMetadata() {
- String header = (String)
testedBundle.getHeaders().get("iPOJO-Components");
+ String header = (String)
getTestBundle().getHeaders().get("iPOJO-Components");
Element elem = null;
try {
elem = ManifestMetadataParser.parseHeaderMetadata(header);
@@ -276,7 +277,7 @@ public class TestManipulationMetadataAPI
private PojoMetadata getManipulationMetadataForComponent(String comp_name)
{
- String header = (String)
testedBundle.getHeaders().get("iPOJO-Components");
+ String header = (String)
getTestBundle().getHeaders().get("iPOJO-Components");
Element elem = null;
try {
elem = ManifestMetadataParser.parseHeaderMetadata(header);
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestAnnotationProcessing.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestAnnotationProcessing.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestAnnotationProcessing.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestAnnotationProcessing.java
Fri May 3 07:28:42 2013
@@ -23,16 +23,18 @@ import org.apache.felix.ipojo.runtime.co
import org.apache.felix.ipojo.runtime.core.components.SubMarker;
import org.junit.Before;
import org.junit.Test;
+import org.ow2.chameleon.testing.helpers.BaseTest;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.Arrays;
+import java.util.List;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-public class TestAnnotationProcessing extends Common {
+public class TestAnnotationProcessing extends BaseTest {
private Class clazz;
@@ -46,6 +48,10 @@ public class TestAnnotationProcessing ex
}
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
@Test
public void testAnnotationOnMethod() {
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDuplicateMethods.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDuplicateMethods.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDuplicateMethods.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDuplicateMethods.java
Fri May 3 07:28:42 2013
@@ -22,11 +22,15 @@ package org.apache.felix.ipojo.runtime.c
import org.apache.felix.ipojo.runtime.core.services.Plop;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+
+import java.util.Arrays;
+import java.util.List;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class TestDuplicateMethods extends Common {
+public class TestDuplicateMethods extends BaseTest {
@Test
@@ -39,4 +43,9 @@ public class TestDuplicateMethods extend
assertEquals("Check result", "plop", o);
ipojoHelper.dispose();
}
+
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExceptionHandling.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExceptionHandling.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExceptionHandling.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExceptionHandling.java
Fri May 3 07:28:42 2013
@@ -26,6 +26,10 @@ import org.apache.felix.ipojo.runtime.co
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+
+import java.util.Arrays;
+import java.util.List;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -33,7 +37,7 @@ import static org.junit.Assert.fail;
/**
* Test exception handling. POJO exception must be propagated.
*/
-public class TestExceptionHandling extends Common {
+public class TestExceptionHandling extends BaseTest {
private ComponentInstance ci_lazzy;
@@ -88,4 +92,9 @@ public class TestExceptionHandling exten
}
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGenericList.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGenericList.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGenericList.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGenericList.java
Fri May 3 07:28:42 2013
@@ -25,14 +25,16 @@ import org.apache.felix.ipojo.runtime.co
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.*;
-public class TestGenericList extends Common {
+public class TestGenericList extends BaseTest {
ComponentInstance foo1, foo2;
ComponentInstance checker;
@@ -76,4 +78,9 @@ public class TestGenericList extends Com
assertEquals("Check size - 3", 1, list.size());
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGetComponentInstance.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGetComponentInstance.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGetComponentInstance.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestGetComponentInstance.java
Fri May 3 07:28:42 2013
@@ -26,7 +26,10 @@ import org.apache.felix.ipojo.PrimitiveI
import org.apache.felix.ipojo.runtime.core.services.FooService;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+import java.util.Arrays;
+import java.util.List;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
@@ -35,7 +38,7 @@ import static org.junit.Assert.*;
/**
* Check the getComponentInstance method on a POJO
*/
-public class TestGetComponentInstance extends Common {
+public class TestGetComponentInstance extends BaseTest {
/**
* Check if a pojo can correctly be cast in POJO.
@@ -90,4 +93,9 @@ public class TestGetComponentInstance ex
assertNull("FS available, but component instance stopped", ref);
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNestedClasses.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNestedClasses.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNestedClasses.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNestedClasses.java
Fri May 3 07:28:42 2013
@@ -26,14 +26,17 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+import java.util.Arrays;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class TestNestedClasses extends Common {
+public class TestNestedClasses extends BaseTest {
private ComponentInstance instance;
private CheckService service;
@@ -212,4 +215,9 @@ public class TestNestedClasses extends C
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypes.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypes.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypes.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypes.java
Fri May 3 07:28:42 2013
@@ -24,6 +24,10 @@ import org.apache.felix.ipojo.runtime.co
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+
+import java.util.Arrays;
+import java.util.List;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.*;
@@ -31,7 +35,7 @@ import static org.junit.Assert.*;
/**
* Check the manipulation of primitive type (boxed and unboxed).
*/
-public class TestPrimitiveTypes extends Common {
+public class TestPrimitiveTypes extends BaseTest {
PrimitiveManipulationTestService prim;
@@ -104,5 +108,10 @@ public class TestPrimitiveTypes extends
assertEquals("Check - 2", prim.getChar(), 'b');
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypesWithNumberInNames.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypesWithNumberInNames.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypesWithNumberInNames.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPrimitiveTypesWithNumberInNames.java
Fri May 3 07:28:42 2013
@@ -25,6 +25,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+
+import java.util.Arrays;
+import java.util.List;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.*;
@@ -33,7 +37,7 @@ import static org.junit.Assert.*;
* Check the manipulation of primitive type (boxed and unboxed).
* The targeted implementation contains numbers in the package and class name.
*/
-public class TestPrimitiveTypesWithNumberInNames extends Common {
+public class TestPrimitiveTypesWithNumberInNames extends BaseTest {
PrimitiveManipulationTestService prim;
@@ -109,4 +113,9 @@ public class TestPrimitiveTypesWithNumbe
assertEquals("Check - 2", prim.getChar(), 'b');
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSwitches.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSwitches.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSwitches.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSwitches.java
Fri May 3 07:28:42 2013
@@ -28,13 +28,16 @@ import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+import java.util.Arrays;
+import java.util.List;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class TestSwitches extends Common {
+public class TestSwitches extends BaseTest {
private ComponentInstance instance;
private CheckService service;
@@ -75,5 +78,10 @@ public class TestSwitches extends Common
assertEquals(properties.get("switchOnEnumRed"), "RED");
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
Modified:
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestTypeBoxing.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestTypeBoxing.java?rev=1478662&r1=1478661&r2=1478662&view=diff
==============================================================================
---
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestTypeBoxing.java
(original)
+++
felix/trunk/ipojo/manipulator/manipulator-it/src/it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestTypeBoxing.java
Fri May 3 07:28:42 2013
@@ -25,14 +25,17 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.BaseTest;
+import java.util.Arrays;
+import java.util.List;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class TestTypeBoxing extends Common {
+public class TestTypeBoxing extends BaseTest {
ComponentInstance instance; // Instance under test
@@ -73,4 +76,9 @@ public class TestTypeBoxing extends Comm
assertEquals("Check - 2", prim.getLong(), 2);
}
+ @Override
+ protected List<String> getExtraExports() {
+ return Arrays.asList("org.apache.felix.ipojo.runtime.core.components");
+ }
+
}
