You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/10/11 17:41:19 UTC
svn commit: r1631065 -
/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
Author: pderop
Date: Sat Oct 11 15:41:19 2014
New Revision: 1631065
URL: http://svn.apache.org/r1631065
Log:
Iterate on the map of services using an iterator on the entry set
Modified:
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java?rev=1631065&r1=1631064&r2=1631065&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/AutoConfigTest.java Sat Oct 11 15:41:19 2014
@@ -1,8 +1,6 @@
package org.apache.felix.dm.itest;
-import java.util.Collection;
import java.util.Dictionary;
-import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -188,13 +186,15 @@ public class AutoConfigTest extends Test
Assert.assertNotNull(m_providers);
System.out.println("ConsumerMap.start: injected providers=" + m_providers);
Assert.assertTrue(m_providers.size() == 2);
- for (Provider provider : m_providers.keySet()) {
+ for (Map.Entry<Provider, Dictionary> e : m_providers.entrySet()) {
+ Provider provider = e.getKey();
+ Dictionary props = e.getValue();
+
provider.run();
-
if (provider.toString().equals("provider1")) {
- Assert.assertEquals(m_providers.get(provider).get(Constants.SERVICE_RANKING), 10);
+ Assert.assertEquals(props.get(Constants.SERVICE_RANKING), 10);
} else if (provider.toString().equals("provider2")) {
- Assert.assertEquals(m_providers.get(provider).get(Constants.SERVICE_RANKING), 20);
+ Assert.assertEquals(props.get(Constants.SERVICE_RANKING), 20);
} else {
Assert.fail("Did not find any properties for provider " + provider);
}