You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2012/07/02 16:11:38 UTC
svn commit: r1356237 -
/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
Author: fmeschbe
Date: Mon Jul 2 14:11:37 2012
New Revision: 1356237
URL: http://svn.apache.org/viewvc?rev=1356237&view=rev
Log:
Fix wrongly named tests (method names switched with respect to actual test)
Modified:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
Modified: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java?rev=1356237&r1=1356236&r2=1356237&view=diff
==============================================================================
--- felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java (original)
+++ felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java Mon Jul 2 14:11:37 2012
@@ -505,7 +505,7 @@ public class ConfigurationBaseTest exten
@Test
- public void test_basic_configuration_factory_configure_then_start() throws BundleException, IOException
+ public void test_basic_configuration_factory_start_then_configure() throws BundleException, IOException
{
final String factoryPid = "test_basic_configuration_factory_configure_then_start";
bundle = installBundle( factoryPid, ManagedServiceFactoryTestActivator.class );
@@ -541,13 +541,14 @@ public class ConfigurationBaseTest exten
@Test
- public void test_basic_configuration_factory_start_then_configure() throws BundleException, IOException
+ public void test_basic_configuration_factory_configure_then_start() throws BundleException, IOException
{
// 1. create config with pid and locationA
// 2. update config with properties
final String factoryPid = "test_basic_configuration_factory_start_then_configure";
final Configuration config = createFactoryConfiguration( factoryPid, null, true );
final String pid = config.getPid();
+ delay();
// 3. register ManagedService ms1 with pid from said locationA
bundle = installBundle( factoryPid, ManagedServiceFactoryTestActivator.class );