incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r803862 - in /sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it: BundleInstallTest.java ConfigInstallTest.java OsgiControllerTest.java OsgiControllerTestBase.java
Date Thu, 13 Aug 2009 12:29:10 GMT
Author: bdelacretaz
Date: Thu Aug 13 12:29:10 2009
New Revision: 803862

URL: http://svn.apache.org/viewvc?rev=803862&view=rev
Log:
SLING-1078 - separate tests in smaller classes, makes no difference to test execution time
as pax web starts framework for each test anyway

Added:
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java
  (with props)
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
  (with props)
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTestBase.java
      - copied, changed from r803855, sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java
Removed:
    sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java

Added: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java?rev=803862&view=auto
==============================================================================
--- sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java
(added)
+++ sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java
Thu Aug 13 12:29:10 2009
@@ -0,0 +1,233 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.osgi.installer.it;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.OsgiControllerStatistics;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+
+@RunWith(JUnit4TestRunner.class)
+public class BundleInstallTest extends OsgiControllerTestBase {
+
+    @org.ops4j.pax.exam.junit.Configuration
+    public static Option[] configuration() {
+    	return defaultConfiguration();
+    }
+    
+	@Test
+    public void testInstallUpgradeDowngradeBundle() throws Exception {
+    	final String symbolicName = "osgi-installer-testbundle";
+    	final String uri = symbolicName + JAR_EXT;
+    	final String BUNDLE_VERSION = "Bundle-Version";
+    	
+    	assertNull("Test bundle must not be present before test", findBundle(symbolicName));
+    	
+    	// Install first test bundle and check version
+    	long bundleId = 0;
+    	final OsgiController c = getService(OsgiController.class);
+    	{
+        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.1.jar")));
+        	assertNull("Test bundle must be absent right after scheduleInstallOrUpdate", findBundle(symbolicName));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(symbolicName);
+        	assertNotNull("Test bundle 1.1 must be found after executeScheduledOperations",
b);
+        	bundleId = b.getBundleId();
+        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
+        	assertEquals("Version must be 1.1", "1.1", b.getHeaders().get(BUNDLE_VERSION));
+    	}
+    	
+    	// Upgrade to later version, verify
+    	{
+        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.2.jar")));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(symbolicName);
+        	assertNotNull("Test bundle 1.2 must be found after executeScheduledOperations",
b);
+        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
+        	assertEquals("Version must be 1.2 after upgrade", "1.2", b.getHeaders().get(BUNDLE_VERSION));
+        	assertEquals("Bundle ID must not change after upgrade", bundleId, b.getBundleId());
+    	}
+    	
+    	// Downgrade to lower version, installed bundle must not change
+    	{
+        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.0.jar")));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(symbolicName);
+        	assertNotNull("Test bundle 1.2 must be found after executeScheduledOperations",
b);
+        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
+        	assertEquals("Version must be 1.2 after ignored downgrade", "1.2", b.getHeaders().get(BUNDLE_VERSION));
+        	assertEquals("Bundle ID must not change after downgrade", bundleId, b.getBundleId());
+    	}
+    	
+    	// Uninstall
+    	{
+        	c.scheduleUninstall(uri);
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(symbolicName);
+        	assertNull("Test bundle 1.2 must be gone", b);
+    	}
+    	
+    	// Install lower version, must work
+    	{
+        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.0.jar")));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(symbolicName);
+        	assertNotNull("Test bundle 1.0 must be found after executeScheduledOperations",
b);
+        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
+        	assertEquals("Version must be 1.0 after uninstall and downgrade", "1.0", b.getHeaders().get(BUNDLE_VERSION));
+        	assertFalse("Bundle ID must have changed after uninstall and reinstall", bundleId
== b.getBundleId());
+    	}
+    }
+    
+    @Test
+    public void testBundleStatePreserved() throws Exception {
+    	final OsgiController c = getService(OsgiController.class);
+    	
+    	// Install two bundles, one started, one stopped
+    	{
+        	c.scheduleInstallOrUpdate("otherBundleA.jar", 
+        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testA-1.0.jar")));
+        	c.executeScheduledOperations();
+    	}
+    	{
+        	c.scheduleInstallOrUpdate("testB.jar", 
+        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testB-1.0.jar")));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle("osgi-installer-testB");
+        	assertNotNull("Test bundle must be found", b);
+        	b.stop();
+    	}
+    	
+    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("osgi-installer-testA").getState());
+    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("osgi-installer-testB").getState());
+    	
+    	// Execute some OsgiController operations
+    	final String symbolicName = "osgi-installer-testbundle";
+    	final String uri = symbolicName + JAR_EXT;
+    	final String BUNDLE_VERSION = "Bundle-Version";
+    	c.scheduleInstallOrUpdate(uri, 
+    			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.1.jar")));
+    	c.executeScheduledOperations();
+    	c.scheduleInstallOrUpdate(uri, 
+    			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.2.jar")));
+    	c.executeScheduledOperations();
+    	c.scheduleInstallOrUpdate(uri, 
+    			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.0.jar")));
+    	c.executeScheduledOperations();
+    	final Bundle b = findBundle(symbolicName);
+    	assertNotNull("Installed bundle must be found", b);
+    	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
+    	assertEquals("Version must be 1.2", "1.2", b.getHeaders().get(BUNDLE_VERSION));
+    	
+    	// And check that bundles A and B have kept their states
+    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("osgi-installer-testA").getState());
+    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("osgi-installer-testB").getState());
+    }
+    
+    // needsB bundle requires testB, try loading needsB first,
+	// then testB, and verify that in the end needsB is started 	
+    @Test
+    public void testBundleDependencies() throws Exception {
+    	final OsgiController c = getService(OsgiController.class);
+    	
+    	final String testB = "osgi-installer-testB";
+    	final String needsB = "osgi-installer-needsB";
+    	
+    	{
+        	final Bundle b = findBundle(testB);
+        	if(b != null) {
+        		c.scheduleUninstall(testB + JAR_EXT);
+        		c.executeScheduledOperations();
+        	}
+        	assertNull(testB + " bundle must not be installed before test", findBundle(testB));
+    	}
+    	
+    	// without testB, needsB must not start
+    	{
+        	c.scheduleInstallOrUpdate(needsB + JAR_EXT,
+        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-needsB.jar")));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(needsB);
+        	assertNotNull(needsB + " must be installed", b);
+        	assertFalse(needsB + " must not be started, testB not present", b.getState() ==
Bundle.ACTIVE);
+    	}
+    	
+    	// Check SLING-1042 retry rules
+    	assertTrue("OsgiController must implement OsgiControllerStatistics", c instanceof OsgiControllerStatistics);
+    	final OsgiControllerStatistics stats = (OsgiControllerStatistics)c;
+    	
+    	{
+    	    long n = stats.getExecutedTasksCount();
+    	    c.executeScheduledOperations();
+            assertTrue("First retry must not wait for an event", stats.getExecutedTasksCount()
> n);
+            n = stats.getExecutedTasksCount();
+            c.executeScheduledOperations();
+    	    assertEquals("Retrying before a bundle event happens must not execute any OsgiControllerTask",
n, stats.getExecutedTasksCount());
+    	    
+            n = stats.getExecutedTasksCount();
+    	    generateBundleEvent();
+            c.executeScheduledOperations();
+            assertTrue("Retrying after a bundle event must execute at least one OsgiControllerTask",
stats.getExecutedTasksCount() > n);
+    	}
+    	
+    	{
+    	    // wait until no more events are received
+            final long timeout = System.currentTimeMillis() + 2000L;
+            while(System.currentTimeMillis() < timeout) {
+                final long n = stats.getExecutedTasksCount();
+                c.executeScheduledOperations();
+                if(n == stats.getExecutedTasksCount()) {
+                    break;
+                }
+                Thread.sleep(10L);
+            }
+            
+            if(System.currentTimeMillis() >= timeout) {
+                fail("Retries did not stop within specified time");
+            }
+    	}
+    	
+        {
+            long n = stats.getExecutedTasksCount();
+            c.executeScheduledOperations();
+            assertEquals("Retrying before a framework event happens must not execute any
OsgiControllerTask", n, stats.getExecutedTasksCount());
+            refreshPackages();
+            c.executeScheduledOperations();
+            assertTrue("Retrying after framework event must execute at least one OsgiControllerTask",
stats.getExecutedTasksCount() > n);
+        }
+        
+    	// now install testB -> needsB must start
+    	{
+        	c.scheduleInstallOrUpdate(testB + JAR_EXT,
+        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testB-1.0.jar")));
+        	c.executeScheduledOperations();
+        	final Bundle b = findBundle(needsB);
+        	assertNotNull(needsB + " must be installed", b);
+        	assertTrue(needsB + " must be started now that testB is installed", b.getState()
== Bundle.ACTIVE);
+    	}
+    }
+}

Propchange: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java?rev=803862&view=auto
==============================================================================
--- sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
(added)
+++ sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
Thu Aug 13 12:29:10 2009
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.osgi.installer.it;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.apache.sling.osgi.installer.DictionaryInstallableData;
+import org.apache.sling.osgi.installer.OsgiController;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+import org.osgi.service.cm.Configuration;
+
+@RunWith(JUnit4TestRunner.class)
+public class ConfigInstallTest extends OsgiControllerTestBase {
+    @org.ops4j.pax.exam.junit.Configuration
+    public static Option[] configuration() {
+    	return defaultConfiguration();
+    }
+    
+    @Test
+    public void testInstallAndRemoveConfig() throws Exception {
+    	final OsgiController c = getService(OsgiController.class);
+    	final Dictionary<String, Object> cfgData = new Hashtable<String, Object>();
+    	cfgData.put("foo", "bar");
+    	final String cfgPid = getClass().getName() + "." + System.currentTimeMillis();
+    	
+    	assertNull("Config " + cfgPid + " must not be found before test", findConfiguration(cfgPid));
+    	
+    	c.scheduleInstallOrUpdate(cfgPid, new DictionaryInstallableData(cfgData));
+    	assertNull("Config " + cfgPid + " must not be found right after scheduleInstall", findConfiguration(cfgPid));
+    	c.executeScheduledOperations();
+    	
+    	final Configuration cfg = findConfiguration(cfgPid);
+    	assertNotNull("Config " + cfgPid + " must be found right after executeScheduledOperations()",
cfg);
+    	final String value = (String)cfg.getProperties().get("foo");
+    	assertEquals("Config value must match", "bar", value);
+    	
+    	c.scheduleUninstall(cfgPid);
+    	assertNotNull("Config " + cfgPid + " must still be found right after scheduleUninstall",
cfg);
+    	c.executeScheduledOperations();
+    	assertNull("Config " + cfgPid + " must be gone after executeScheduledOperations", findConfiguration(cfgPid));
+    }
+    
+    @Test
+    public void testDeferredConfigInstall() throws Exception {
+    	
+    	final String cfgName = "org.apache.felix.configadmin";
+    	Bundle configAdmin = null;
+    	for(Bundle b : bundleContext.getBundles()) {
+    		if(b.getSymbolicName().equals(cfgName)) {
+    			configAdmin = b;
+    			break;
+    		}
+    	}
+    	assertNotNull(cfgName + " bundle must be found", configAdmin);
+    	waitForConfigAdmin(true);
+    	
+    	final OsgiController c = getService(OsgiController.class);
+    	final Dictionary<String, Object> cfgData = new Hashtable<String, Object>();
+    	cfgData.put("foo", "bar");
+    	final String cfgPid = getClass().getName() + ".deferred." + System.currentTimeMillis();
+    	assertNull("Config " + cfgPid + " must not be found before test", findConfiguration(cfgPid));
+    	
+    	c.scheduleInstallOrUpdate(cfgPid, new DictionaryInstallableData(cfgData));
+    	assertNull("Config " + cfgPid + " must not be found right after scheduleInstall", findConfiguration(cfgPid));
+    	
+    	// Config installs must be deferred if ConfigAdmin service is stopped
+    	configAdmin.stop();
+    	waitForConfigAdmin(false);
+    	c.executeScheduledOperations();
+    	configAdmin.start();
+    	waitForConfigAdmin(true);
+    	assertNull("Config " + cfgPid + " must not be installed if ConfigAdmin was stopped",
findConfiguration(cfgPid));
+    	
+    	// with configadmin back, executeScheduledOperations must install deferred configs
+    	c.executeScheduledOperations();
+    	assertNotNull("Config " + cfgPid + " must be installed after restarting ConfigAdmin",
findConfiguration(cfgPid));
+    	findConfiguration(cfgPid).delete();
+    	assertNull("Config " + cfgPid + " must be gone after test", findConfiguration(cfgPid));
+    }    
+}

Propchange: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTestBase.java
(from r803855, sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTestBase.java?p2=sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTestBase.java&p1=sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java&r1=803855&r2=803862&rev=803862&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTest.java
(original)
+++ sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiControllerTestBase.java
Thu Aug 13 12:29:10 2009
@@ -16,11 +16,7 @@
  */
 package org.apache.sling.osgi.installer.it;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -32,18 +28,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.util.Dictionary;
-import java.util.Hashtable;
 
-import org.apache.sling.osgi.installer.DictionaryInstallableData;
-import org.apache.sling.osgi.installer.OsgiController;
 import org.apache.sling.osgi.installer.OsgiControllerServices;
-import org.apache.sling.osgi.installer.OsgiControllerStatistics;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Inject;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkEvent;
@@ -53,15 +41,8 @@
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.packageadmin.PackageAdmin;
 
-/** Test the OsgiController running in the OSGi framework
- *  
- * 	This is a rather big test class, as Pax Exam currently starts
- *  the framework for each test class - having all tests here
- *  (as long as it's practical) allows them to run faster.
- *   
- */
-@RunWith(JUnit4TestRunner.class)
-public class OsgiControllerTest implements FrameworkListener {
+/** Base class for OsgiController testing */
+class OsgiControllerTestBase implements FrameworkListener {
 	public final static String POM_VERSION = System.getProperty("osgi.installer.pom.version");
 	public final static String JAR_EXT = ".jar";
 	private int packageRefreshEventsCount;
@@ -175,262 +156,7 @@
     	fail("ConfigurationAdmin service not available after waiting " + timeout + " seconds");
     }
     
-    @Test
-    public void testInstallAndRemoveConfig() throws Exception {
-    	final OsgiController c = getService(OsgiController.class);
-    	final Dictionary<String, Object> cfgData = new Hashtable<String, Object>();
-    	cfgData.put("foo", "bar");
-    	final String cfgPid = getClass().getName() + "." + System.currentTimeMillis();
-    	
-    	assertNull("Config " + cfgPid + " must not be found before test", findConfiguration(cfgPid));
-    	
-    	c.scheduleInstallOrUpdate(cfgPid, new DictionaryInstallableData(cfgData));
-    	assertNull("Config " + cfgPid + " must not be found right after scheduleInstall", findConfiguration(cfgPid));
-    	c.executeScheduledOperations();
-    	
-    	final Configuration cfg = findConfiguration(cfgPid);
-    	assertNotNull("Config " + cfgPid + " must be found right after executeScheduledOperations()",
cfg);
-    	final String value = (String)cfg.getProperties().get("foo");
-    	assertEquals("Config value must match", "bar", value);
-    	
-    	c.scheduleUninstall(cfgPid);
-    	assertNotNull("Config " + cfgPid + " must still be found right after scheduleUninstall",
cfg);
-    	c.executeScheduledOperations();
-    	assertNull("Config " + cfgPid + " must be gone after executeScheduledOperations", findConfiguration(cfgPid));
-    }
-    
-    @Test
-    public void testDeferredConfigInstall() throws Exception {
-    	
-    	final String cfgName = "org.apache.felix.configadmin";
-    	Bundle configAdmin = null;
-    	for(Bundle b : bundleContext.getBundles()) {
-    		if(b.getSymbolicName().equals(cfgName)) {
-    			configAdmin = b;
-    			break;
-    		}
-    	}
-    	assertNotNull(cfgName + " bundle must be found", configAdmin);
-    	waitForConfigAdmin(true);
-    	
-    	final OsgiController c = getService(OsgiController.class);
-    	final Dictionary<String, Object> cfgData = new Hashtable<String, Object>();
-    	cfgData.put("foo", "bar");
-    	final String cfgPid = getClass().getName() + ".deferred." + System.currentTimeMillis();
-    	assertNull("Config " + cfgPid + " must not be found before test", findConfiguration(cfgPid));
-    	
-    	c.scheduleInstallOrUpdate(cfgPid, new DictionaryInstallableData(cfgData));
-    	assertNull("Config " + cfgPid + " must not be found right after scheduleInstall", findConfiguration(cfgPid));
-    	
-    	// Config installs must be deferred if ConfigAdmin service is stopped
-    	configAdmin.stop();
-    	waitForConfigAdmin(false);
-    	c.executeScheduledOperations();
-    	configAdmin.start();
-    	waitForConfigAdmin(true);
-    	assertNull("Config " + cfgPid + " must not be installed if ConfigAdmin was stopped",
findConfiguration(cfgPid));
-    	
-    	// with configadmin back, executeScheduledOperations must install deferred configs
-    	c.executeScheduledOperations();
-    	assertNotNull("Config " + cfgPid + " must be installed after restarting ConfigAdmin",
findConfiguration(cfgPid));
-    	findConfiguration(cfgPid).delete();
-    	assertNull("Config " + cfgPid + " must be gone after test", findConfiguration(cfgPid));
-    }
-    
-    @Test
-    public void testInstallUpgradeDowngradeBundle() throws Exception {
-    	final String symbolicName = "osgi-installer-testbundle";
-    	final String uri = symbolicName + JAR_EXT;
-    	final String BUNDLE_VERSION = "Bundle-Version";
-    	
-    	assertNull("Test bundle must not be present before test", findBundle(symbolicName));
-    	
-    	// Install first test bundle and check version
-    	long bundleId = 0;
-    	final OsgiController c = getService(OsgiController.class);
-    	{
-        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.1.jar")));
-        	assertNull("Test bundle must be absent right after scheduleInstallOrUpdate", findBundle(symbolicName));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(symbolicName);
-        	assertNotNull("Test bundle 1.1 must be found after executeScheduledOperations",
b);
-        	bundleId = b.getBundleId();
-        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
-        	assertEquals("Version must be 1.1", "1.1", b.getHeaders().get(BUNDLE_VERSION));
-    	}
-    	
-    	// Upgrade to later version, verify
-    	{
-        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.2.jar")));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(symbolicName);
-        	assertNotNull("Test bundle 1.2 must be found after executeScheduledOperations",
b);
-        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
-        	assertEquals("Version must be 1.2 after upgrade", "1.2", b.getHeaders().get(BUNDLE_VERSION));
-        	assertEquals("Bundle ID must not change after upgrade", bundleId, b.getBundleId());
-    	}
-    	
-    	// Downgrade to lower version, installed bundle must not change
-    	{
-        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.0.jar")));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(symbolicName);
-        	assertNotNull("Test bundle 1.2 must be found after executeScheduledOperations",
b);
-        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
-        	assertEquals("Version must be 1.2 after ignored downgrade", "1.2", b.getHeaders().get(BUNDLE_VERSION));
-        	assertEquals("Bundle ID must not change after downgrade", bundleId, b.getBundleId());
-    	}
-    	
-    	// Uninstall
-    	{
-        	c.scheduleUninstall(uri);
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(symbolicName);
-        	assertNull("Test bundle 1.2 must be gone", b);
-    	}
-    	
-    	// Install lower version, must work
-    	{
-        	c.scheduleInstallOrUpdate(uri, new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.0.jar")));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(symbolicName);
-        	assertNotNull("Test bundle 1.0 must be found after executeScheduledOperations",
b);
-        	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
-        	assertEquals("Version must be 1.0 after uninstall and downgrade", "1.0", b.getHeaders().get(BUNDLE_VERSION));
-        	assertFalse("Bundle ID must have changed after uninstall and reinstall", bundleId
== b.getBundleId());
-    	}
-    }
-    
-    @Test
-    public void testBundleStatePreserved() throws Exception {
-    	final OsgiController c = getService(OsgiController.class);
-    	
-    	// Install two bundles, one started, one stopped
-    	{
-        	c.scheduleInstallOrUpdate("otherBundleA.jar", 
-        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testA-1.0.jar")));
-        	c.executeScheduledOperations();
-    	}
-    	{
-        	c.scheduleInstallOrUpdate("testB.jar", 
-        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testB-1.0.jar")));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle("osgi-installer-testB");
-        	assertNotNull("Test bundle must be found", b);
-        	b.stop();
-    	}
-    	
-    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("osgi-installer-testA").getState());
-    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("osgi-installer-testB").getState());
-    	
-    	// Execute some OsgiController operations
-    	final String symbolicName = "osgi-installer-testbundle";
-    	final String uri = symbolicName + JAR_EXT;
-    	final String BUNDLE_VERSION = "Bundle-Version";
-    	c.scheduleInstallOrUpdate(uri, 
-    			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.1.jar")));
-    	c.executeScheduledOperations();
-    	c.scheduleInstallOrUpdate(uri, 
-    			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.2.jar")));
-    	c.executeScheduledOperations();
-    	c.scheduleInstallOrUpdate(uri, 
-    			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testbundle-1.0.jar")));
-    	c.executeScheduledOperations();
-    	final Bundle b = findBundle(symbolicName);
-    	assertNotNull("Installed bundle must be found", b);
-    	assertEquals("Installed bundle must be started", Bundle.ACTIVE, b.getState());
-    	assertEquals("Version must be 1.2", "1.2", b.getHeaders().get(BUNDLE_VERSION));
-    	
-    	// And check that bundles A and B have kept their states
-    	assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("osgi-installer-testA").getState());
-    	assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("osgi-installer-testB").getState());
-    }
-    
-    // needsB bundle requires testB, try loading needsB first,
-	// then testB, and verify that in the end needsB is started 	
-    @Test
-    public void testBundleDependencies() throws Exception {
-    	final OsgiController c = getService(OsgiController.class);
-    	
-    	final String testB = "osgi-installer-testB";
-    	final String needsB = "osgi-installer-needsB";
-    	
-    	{
-        	final Bundle b = findBundle(testB);
-        	if(b != null) {
-        		c.scheduleUninstall(testB + JAR_EXT);
-        		c.executeScheduledOperations();
-        	}
-        	assertNull(testB + " bundle must not be installed before test", findBundle(testB));
-    	}
-    	
-    	// without testB, needsB must not start
-    	{
-        	c.scheduleInstallOrUpdate(needsB + JAR_EXT,
-        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-needsB.jar")));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(needsB);
-        	assertNotNull(needsB + " must be installed", b);
-        	assertFalse(needsB + " must not be started, testB not present", b.getState() ==
Bundle.ACTIVE);
-    	}
-    	
-    	// Check SLING-1042 retry rules
-    	assertTrue("OsgiController must implement OsgiControllerStatistics", c instanceof OsgiControllerStatistics);
-    	final OsgiControllerStatistics stats = (OsgiControllerStatistics)c;
-    	
-    	{
-    	    long n = stats.getExecutedTasksCount();
-    	    c.executeScheduledOperations();
-            assertTrue("First retry must not wait for an event", stats.getExecutedTasksCount()
> n);
-            n = stats.getExecutedTasksCount();
-            c.executeScheduledOperations();
-    	    assertEquals("Retrying before a bundle event happens must not execute any OsgiControllerTask",
n, stats.getExecutedTasksCount());
-    	    
-            n = stats.getExecutedTasksCount();
-    	    generateBundleEvent();
-            c.executeScheduledOperations();
-            assertTrue("Retrying after a bundle event must execute at least one OsgiControllerTask",
stats.getExecutedTasksCount() > n);
-    	}
-    	
-    	{
-    	    // wait until no more events are received
-            final long timeout = System.currentTimeMillis() + 2000L;
-            while(System.currentTimeMillis() < timeout) {
-                final long n = stats.getExecutedTasksCount();
-                c.executeScheduledOperations();
-                if(n == stats.getExecutedTasksCount()) {
-                    break;
-                }
-                Thread.sleep(10L);
-            }
-            
-            if(System.currentTimeMillis() >= timeout) {
-                fail("Retries did not stop within specified time");
-            }
-    	}
-    	
-        {
-            long n = stats.getExecutedTasksCount();
-            c.executeScheduledOperations();
-            assertEquals("Retrying before a framework event happens must not execute any
OsgiControllerTask", n, stats.getExecutedTasksCount());
-            refreshPackages();
-            c.executeScheduledOperations();
-            assertTrue("Retrying after framework event must execute at least one OsgiControllerTask",
stats.getExecutedTasksCount() > n);
-        }
-        
-    	// now install testB -> needsB must start
-    	{
-        	c.scheduleInstallOrUpdate(testB + JAR_EXT,
-        			new SimpleFileInstallableData(getTestBundle("org.apache.sling.osgi.installer.it-"
+ POM_VERSION + "-testB-1.0.jar")));
-        	c.executeScheduledOperations();
-        	final Bundle b = findBundle(needsB);
-        	assertNotNull(needsB + " must be installed", b);
-        	assertTrue(needsB + " must be started now that testB is installed", b.getState()
== Bundle.ACTIVE);
-    	}
-    }
-
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
+    public static Option[] defaultConfiguration() {
     	String vmOpt = "-Dosgi.installer.testing";
     	
     	// This runs in the VM that runs the build, but the tests run in another one.



Mime
View raw message