Author: clement
Date: Thu Jul 3 07:49:52 2008
New Revision: 673695
URL: http://svn.apache.org/viewvc?rev=673695&view=rev
Log:
Fix some minor bugs in tests: Some instances were not disposed when test ends.
Modify the artifact version to be consistent with the other projects.
Modified:
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
felix/trunk/ipojo/tests/tests.temporal.dependency/pom.xml
felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
Modified:
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java?rev=673695&r1=673694&r2=673695&view=diff
==============================================================================
---
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
(original)
+++
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
Thu Jul 3 07:49:52 2008
@@ -183,7 +183,7 @@
fooFactory2.start();
}
- public void atestArchitecture() { //TODO : to reactive
+ public void atestArchitecture() { // TODO fix and reactivate the method.
Properties props = new Properties();
props.put("name", "under");
ComponentInstance under = null;
Modified:
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java?rev=673695&r1=673694&r2=673695&view=diff
==============================================================================
---
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
(original)
+++
felix/trunk/ipojo/tests/tests.composite.service.instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
Thu Jul 3 07:49:52 2008
@@ -189,15 +189,5 @@
fact2.start();
fact3.start();
}
-
-
-
-
-
-
-
-
-
-
}
Modified: felix/trunk/ipojo/tests/tests.temporal.dependency/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.temporal.dependency/pom.xml?rev=673695&r1=673694&r2=673695&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/tests.temporal.dependency/pom.xml (original)
+++ felix/trunk/ipojo/tests/tests.temporal.dependency/pom.xml Thu Jul 3
07:49:52 2008
@@ -22,17 +22,17 @@
<name>iPOJO Temporal Dependency Test Suite</name>
<artifactId>tests.temporal.dependency</artifactId>
<groupId>ipojo.tests</groupId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>ipojo.examples</groupId>
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
@@ -71,7 +71,7 @@
org.apache.felix.ipojo.test*
</Private-Package>
<Test-Suite>
-
org.apache.felix.ipojo.test.scenarios.temporal.TemporalTestSuite
+
org.apache.felix.ipojo.test.scenarios.temporal.TemporalTestSuite
</Test-Suite>
</instructions>
</configuration>
@@ -79,7 +79,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<executions>
<execution>
<goals>
Modified:
felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java?rev=673695&r1=673694&r2=673695&view=diff
==============================================================================
---
felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
(original)
+++
felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DelayTest.java
Thu Jul 3 07:49:52 2008
@@ -220,6 +220,8 @@
provider1.stop();
provider2.stop();
+ provider1.dispose();
+ provider2.dispose();
under.stop();
under.dispose();
}
