svn commit: r1357128 - /felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java

[fmeschbe]

Author: fmeschbe
Date: Wed Jul  4 07:42:04 2012
New Revision: 1357128

URL: http://svn.apache.org/viewvc?rev=1357128&view=rev
Log:
Move factory configuration test to after creating it

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=1357128&r1=1357127&r2=1357128&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
 Wed Jul  4 07:42:04 2012
@@ -861,6 +861,10 @@ public class ConfigurationBaseTest exten
         TestCase.assertNotNull( cf );
         final String pid = cf.getPid();
 
+        // check factory configuration setup
+        TestCase.assertNotNull( "Configuration must have PID", pid );
+        TestCase.assertEquals( "Factory configuration must have requested 
factory PID", factoryPid, cf.getFactoryPid() );
+
         try
         {
             bundle = installBundle( factoryPid, 
ManagedServiceFactoryTestActivator.class );
@@ -870,9 +874,6 @@ public class ConfigurationBaseTest exten
             final ManagedServiceFactoryTestActivator tester = 
ManagedServiceFactoryTestActivator.INSTANCE;
             TestCase.assertEquals( "MSF must not be updated with new 
configuration", 0, tester.numManagedServiceFactoryUpdatedCalls );
 
-            TestCase.assertNotNull( "Configuration must have PID", pid );
-            TestCase.assertEquals( "Factory configuration must have requested 
factory PID", factoryPid, cf.getFactoryPid() );
-
             // assert getConfiguration returns the same configurtion
             final Configuration c1 = getConfigurationAdmin().getConfiguration( 
pid, null );
             TestCase.assertEquals( "getConfiguration must retrieve required 
PID", pid, c1.getPid() );