svn commit: r1330141 - in /felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration: ConfigurationAdminUpdateStressTest.java FELIX2813_ConfigurationAdminStartupTest.java

[fmeschbe]

Author: fmeschbe
Date: Wed Apr 25 07:52:09 2012
New Revision: 1330141

URL: http://svn.apache.org/viewvc?rev=1330141&view=rev
Log:
Use Hashtable<String, Object> because Properties (extends Hashtable<Object, 
Object>) is not compatible with Dictionary<String, Object> without casting.

Modified:
    
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
    
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java

Modified: 
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java?rev=1330141&r1=1330140&r2=1330141&view=diff
==============================================================================
--- 
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
 (original)
+++ 
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
 Wed Apr 25 07:52:09 2012
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Dictionary;
 import java.util.HashSet;
-import java.util.Properties;
+import java.util.Hashtable;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -258,7 +258,7 @@ public class ConfigurationAdminUpdateStr
                 ConfigurationAdmin cm = ( ConfigurationAdmin ) 
_tracker.waitForService( 2000 );
                 setupLatches();
                 Factory factory = new Factory();
-                Properties serviceProps = new Properties();
+                Hashtable<String, Object> serviceProps = new Hashtable<String, 
Object>();
                 serviceProps.put( "service.pid", _FACTORYPID );
                 _bc.registerService( ManagedServiceFactory.class.getName(), 
factory, serviceProps );
 
@@ -266,7 +266,7 @@ public class ConfigurationAdminUpdateStr
                 {
                     // Create factory configuration
                     org.osgi.service.cm.Configuration conf = 
cm.createFactoryConfiguration( _FACTORYPID, null );
-                    Properties props = new Properties();
+                    Hashtable<String, Object> props = new Hashtable<String, 
Object>();
                     props.put( "foo", "bar" );
                     conf.update( props );
 
@@ -279,7 +279,7 @@ public class ConfigurationAdminUpdateStr
                     // Update factory configuration many times
                     for ( int i = 0; i < UPDATE_LOOP; i++ )
                     {
-                        props = new Properties();
+                        props = new Hashtable<String, Object>();
                         props.put( "foo", "bar" + i );
                         props.put( "number", new Long( UPDATE_LOOP - i ) );
                         conf.update( props );

Modified: 
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java?rev=1330141&r1=1330140&r2=1330141&view=diff
==============================================================================
--- 
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
 (original)
+++ 
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
 Wed Apr 25 07:52:09 2012
@@ -21,9 +21,8 @@ package org.apache.felix.cm.integration;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.List;
-import java.util.Properties;
-
 import junit.framework.TestCase;
 
 import org.junit.Test;
@@ -130,7 +129,7 @@ public class FELIX2813_ConfigurationAdmi
             try
             {
                 org.osgi.service.cm.Configuration config = 
ca.getConfiguration( "test" );
-                Properties props = new Properties();
+                Hashtable<String, Object> props = new Hashtable<String, 
Object>();
                 props.put( "abc", "123" );
                 config.update( props );
             }