svn commit: r1535690 - /felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java

[uiterlix]

Author: uiterlix
Date: Fri Oct 25 11:15:41 2013
New Revision: 1535690

URL: http://svn.apache.org/r1535690
Log:
Fixed ResourceAdapterDependencyAddAndRemoveTest2 expected behavior.

Modified:
    
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java

Modified: 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java?rev=1535690&r1=1535689&r2=1535690&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
 (original)
+++ 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
 Fri Oct 25 11:15:41 2013
@@ -98,9 +98,6 @@ public class ResourceAdapterDependencyAd
         // wait until the changed callback is invoked
         e.waitForStep(2, 5000);
         
-        System.out.println("Sleeping");
-        e.waitForStep(3, 5000);
-        e.waitForStep(4, 5000);
         System.out.println("Done!");
      }
     
@@ -250,7 +247,6 @@ public class ResourceAdapterDependencyAd
     static class ComponentStateListenerImpl implements ComponentStateListener {
        
        private final Ensure m_ensure;
-       int startcount = 0;
        
        public ComponentStateListenerImpl(Ensure e) {
                this.m_ensure = e;
@@ -262,10 +258,6 @@ public class ResourceAdapterDependencyAd
 
                public void starting(Component c) {
                        System.out.println("starting");
-                       if (startcount == 1) {
-                               m_ensure.step(4);
-                       }
-                       startcount++;
                }
 
                public void stopped(Component c) {
@@ -274,7 +266,6 @@ public class ResourceAdapterDependencyAd
 
                public void stopping(Component c) {
                        System.out.println("stopping");
-                       m_ensure.step(3);
                }
     }
 }