felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1629179 - /felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
Date Fri, 03 Oct 2014 10:40:44 GMT
Author: pderop
Date: Fri Oct  3 10:40:44 2014
New Revision: 1629179

URL: http://svn.apache.org/r1629179
Log:
Fixed bug in the MyComponent1 inner class: the type of the "m_service2", "m_service3_xx",
and "m_service3_yy" fields was wrong.

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java?rev=1629179&r1=1629178&r2=1629179&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/MultipleExtraDependenciesTest.java
Fri Oct  3 10:40:44 2014
@@ -20,6 +20,8 @@ package org.apache.felix.dm.itest;
 
 import java.util.Hashtable;
 
+import junit.framework.Assert;
+
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyManager;
@@ -157,9 +159,9 @@ public class MultipleExtraDependenciesTe
     public static class Service3Impl2 implements Service3 {}
 
     public static class MyComponent1 implements Service1 {
-        Service1 m_service2;
-        Service2 m_service3_xx;
-        Service2 m_service3_yy;
+        Service2 m_service2;
+        Service3 m_service3_xx;
+        Service3 m_service3_yy;
         Ensure m_ensure;
         
         public MyComponent1(Ensure e) {
@@ -187,12 +189,14 @@ public class MultipleExtraDependenciesTe
         
         void start() {
             System.out.println("MyComponent1.start");
+            Assert.assertNotNull(m_service2);
+            Assert.assertNotNull(m_service3_xx);
+            Assert.assertNotNull(m_service3_yy);
             m_ensure.step(2);
         }
     }
     
     public static class MyComponent2 {
-        Service1 m_service1;
         Ensure m_ensure;
         
         public MyComponent2(Ensure e) {
@@ -201,6 +205,7 @@ public class MultipleExtraDependenciesTe
 
         void added(Service1 s1) {
             System.out.println("MyComponent2.bind(" + s1 + ")");
+            Assert.assertNotNull(s1);
             m_ensure.step(3);
         }
         



Mime
View raw message