You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2012/06/20 15:27:05 UTC
svn commit: r1352090 [2/3] - in /felix/trunk/deploymentadmin: ./
deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/
deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ itest/
itest/src/ itest/src/test/ itest/src/test/java/ ...
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/CustomizerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/CustomizerTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/CustomizerTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/CustomizerTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,218 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import static org.osgi.service.deploymentadmin.DeploymentException.*;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.service.deploymentadmin.DeploymentException;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
+
+/**
+ * Provides test cases on the use of customizers in Deployment Admin.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class CustomizerTest extends BaseIntegrationTest {
+
+ /**
+ * Tests that if an exception is thrown during the commit-phase, the installation proceeds and succeeds.
+ */
+ @Test
+ public void testInstallBundleWithExceptionThrowingInCommitCauseNoRollbackOk() throws Exception {
+ System.setProperty("rp1", "commit");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ // Though the commit failed; the package should be installed...
+ assertBundleExists(getSymbolicName("rp1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the prepare-phase, the installation is cancelled and rolled back.
+ */
+ @Test
+ public void testInstallBundleWithExceptionThrowingInPrepareCausesRollbackOk() throws Exception {
+ System.setProperty("rp1", "prepare");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a failing deployment package?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(DeploymentException.CODE_COMMIT_ERROR, exception);
+ }
+
+ assertTrue("No bundles should be started!", getCurrentBundles().isEmpty());
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the processing of a resource, the installation is cancelled and rolled back.
+ */
+ @Test
+ public void testInstallResourceWithExceptionThrowingInProcessCausesRollbackOk() throws Exception {
+ System.setProperty("rp1", "process");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a failing deployment package?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(DeploymentException.CODE_RESOURCE_SHARING_VIOLATION, exception);
+ }
+
+ assertTrue("No bundles should be started!", getCurrentBundles().isEmpty());
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the dropping of a resource, the installation is continued and finishes normally.
+ */
+ @Test
+ public void testDropResourceWithExceptionThrowingInDroppedCausesRollbackOk() throws Exception {
+ System.setProperty("rp1", "dropped");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue("One bundle should be started!", getCurrentBundles().size() == 1);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the commit-phase, the installation proceeds and succeeds.
+ */
+ @Test
+ public void testInstallResourceProcessorWithExceptionThrowingInStartCausesRollbackOk() throws Exception {
+ System.setProperty("rp1", "start");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a failing RP?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_OTHER_ERROR, exception);
+ }
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+ assertTrue("Expected no artifacts to be installed?!", getCurrentBundles().isEmpty());
+ }
+
+ /**
+ * Tests that if a resource is installed which mentions a RP that does not belong to the same package, a rollback takes place.
+ */
+ @Test
+ public void testInstallResourceWithForeignCustomizerFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")));
+
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ assertBundleExists(getSymbolicName("rp1"), "1.0.0");
+
+ dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .disableVerification()
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a resource with an non-existing RP?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_FOREIGN_CUSTOMIZER, exception);
+ }
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ assertTrue("Expected no additional artifacts to be installed?!", getCurrentBundles().size() == 1);
+ }
+
+ /**
+ * Tests that if a resource is installed which mentions a RP that does not exist a rollback takes place.
+ */
+ @Test
+ public void testInstallResourceWithNonAvailableCustomizerFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .disableVerification()
+ .add(dpBuilder.createResource().setResourceProcessorPID("my.unknown.rp").setUrl(getTestResource("test-config1.xml")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a resource with an non-existing RP?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_PROCESSOR_NOT_FOUND, exception);
+ }
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+ assertTrue("Expected no artifacts to be installed?!", getCurrentBundles().isEmpty());
+ }
+
+}
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentAdminTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentAdminTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentAdminTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentAdminTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,125 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_BUNDLE_NAME_ERROR;
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_OTHER_ERROR;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder.JarManifestManipulatingFilter;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.service.deploymentadmin.DeploymentAdmin;
+import org.osgi.service.deploymentadmin.DeploymentException;
+
+/**
+ * Generic tests for {@link DeploymentAdmin}.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class DeploymentAdminTest extends BaseIntegrationTest {
+
+ @Test
+ public void testBundleSymbolicNameMustMatchManifestEntry() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle2"))
+ .setFilter(new JarManifestManipulatingFilter("Bundle-SymbolicName", "foo"))
+ );
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a bundle with a fake symbolic name?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_BUNDLE_NAME_ERROR, exception);
+ }
+ }
+
+ @Test
+ public void testBundleVersionMustMatchManifestEntry() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle2"))
+ .setFilter(new JarManifestManipulatingFilter("Bundle-Version", "1.1.0"))
+ );
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a bundle with a fake version?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_OTHER_ERROR, exception);
+ }
+ }
+
+ @Test
+ public void testManifestEntryMustMatchBundleSymbolicName() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setSymbolicName("foo")
+ .setUrl(getTestBundle("bundle2"))
+ );
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a bundle with a fake symbolic name?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_BUNDLE_NAME_ERROR, exception);
+ }
+ }
+
+ @Test
+ public void testManifestEntryMustMatchBundleVersion() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setVersion("1.1.0")
+ .setUrl(getTestBundle("bundle2"))
+ );
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a bundle with a fake version?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertDeploymentException(CODE_OTHER_ERROR, exception);
+ }
+ }
+}
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentPackageBuilderTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentPackageBuilderTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentPackageBuilderTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/DeploymentPackageBuilderTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,301 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+
+import junit.framework.TestCase;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder.JarManifestManipulatingFilter;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test cases for {@link DeploymentPackageBuilder}.
+ */
+public class DeploymentPackageBuilderTest extends TestCase {
+
+ private String m_testBundleBasePath;
+
+ @Before
+ public void setUp() throws Exception {
+ File f = new File("../testbundles").getAbsoluteFile();
+ assertTrue("Failed to find test bundles directory?!", f.exists() && f.isDirectory());
+
+ m_testBundleBasePath = f.getAbsolutePath();
+ }
+
+ /**
+ * Tests that we can build a deployment package with a bundle resource.
+ */
+ @Test
+ public void testCreateMissingBundleResourceOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = DeploymentPackageBuilder.create("dp-test", "1.0.0");
+ dpBuilder
+ .setFixPackage()
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1")).setMissing()
+ );
+
+ JarInputStream jis = new JarInputStream(dpBuilder.generate());
+ assertNotNull(jis);
+
+ Manifest manifest = jis.getManifest();
+ assertManifestHeader(manifest, "DeploymentPackage-SymbolicName", "dp-test");
+ assertManifestHeader(manifest, "DeploymentPackage-Version", "1.0.0");
+
+ String filename = getBundleName("bundle1");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.bundle1");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.0.0");
+ assertManifestEntry(manifest, filename, "DeploymentPackage-Missing", "true");
+
+ int count = countJarEntries(jis);
+
+ assertEquals("Expected two entries in the JAR!", 0, count);
+ }
+
+ /**
+ * Tests that we can build a deployment package with a bundle resource.
+ */
+ @Test
+ public void testCreateMinimalSingleBundleResourceOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = DeploymentPackageBuilder.create("dp-test", "1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ );
+
+ JarInputStream jis = new JarInputStream(dpBuilder.generate());
+ assertNotNull(jis);
+
+ Manifest manifest = jis.getManifest();
+ assertManifestHeader(manifest, "DeploymentPackage-SymbolicName", "dp-test");
+ assertManifestHeader(manifest, "DeploymentPackage-Version", "1.0.0");
+
+ String filename = getBundleName("bundle1");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.bundle1");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.0.0");
+
+ int count = countJarEntries(jis);
+
+ assertEquals("Expected two entries in the JAR!", 1, count);
+ }
+
+ /**
+ * Tests that we can filter a resource.
+ */
+ @Test
+ public void testResourceFilterOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = DeploymentPackageBuilder.create("dp-test", "1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle2")))
+ .add(dpBuilder.createBundleResource()
+ .setVersion("1.1.0")
+ .setFilter(new JarManifestManipulatingFilter("Bundle-Version", "1.1.0", "Foo", "bar"))
+ .setUrl(getTestBundle("bundle1")));
+
+ JarInputStream jis = new JarInputStream(dpBuilder.generate());
+ assertNotNull(jis);
+
+ Manifest manifest = jis.getManifest();
+ assertManifestHeader(manifest, "DeploymentPackage-SymbolicName", "dp-test");
+ assertManifestHeader(manifest, "DeploymentPackage-Version", "1.0.0");
+
+ String filename = getBundleName("bundle1");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.bundle1");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.1.0");
+
+ filename = getBundleName("bundle2");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.bundle2");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.0.0");
+
+ try {
+ byte[] buf = new byte[32 * 1024];
+
+ JarEntry entry;
+ while ((entry = jis.getNextJarEntry()) != null) {
+ if (entry.getName().endsWith("valid-bundle1.jar")) {
+ int read = jis.read(buf);
+
+ JarInputStream jis2 = new JarInputStream(new ByteArrayInputStream(Arrays.copyOf(buf, read)));
+ Manifest manifest2 = jis2.getManifest();
+
+ Attributes mainAttributes = manifest2.getMainAttributes();
+ assertEquals("1.1.0", mainAttributes.getValue("Bundle-Version"));
+ assertEquals("bar", mainAttributes.getValue("Foo"));
+
+ jis2.close();
+ }
+ jis.closeEntry();
+ }
+ }
+ finally {
+ jis.close();
+ }
+ }
+
+ /**
+ * Tests that we can build a deployment package with a "plain" resource and resource processor.
+ */
+ @Test
+ public void testCreateMinimalSingleResourceAndProcessorOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = DeploymentPackageBuilder.create("dp-test", "1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource()
+ .setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource()
+ .setResourceProcessorPID("org.apache.felix.deploymentadmin.test.rp1")
+ .setUrl(getTestResource("test-config1.xml"))
+ );
+
+ JarInputStream jis = new JarInputStream(dpBuilder.generate());
+ assertNotNull(jis);
+
+ Manifest manifest = jis.getManifest();
+ assertManifestHeader(manifest, "DeploymentPackage-SymbolicName", "dp-test");
+ assertManifestHeader(manifest, "DeploymentPackage-Version", "1.0.0");
+
+ String filename = getBundleName("rp1");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.rp1");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.0.0");
+
+ filename = "test-config1.xml";
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Resource-Processor", "org.apache.felix.deploymentadmin.test.rp1");
+
+ int count = countJarEntries(jis);
+
+ assertEquals("Expected two entries in the JAR!", 2, count);
+ }
+
+ /**
+ * Tests that we can build a deployment package with two bundle resources.
+ */
+ @Test
+ public void testCreateMinimalTwoBundleResourcesOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = DeploymentPackageBuilder.create("dp-test", "1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle2"))
+ );
+
+ JarInputStream jis = new JarInputStream(dpBuilder.generate());
+ assertNotNull(jis);
+
+ Manifest manifest = jis.getManifest();
+ assertManifestHeader(manifest, "DeploymentPackage-SymbolicName", "dp-test");
+ assertManifestHeader(manifest, "DeploymentPackage-Version", "1.0.0");
+
+ String filename = getBundleName("bundle1");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.bundle1");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.0.0");
+
+ filename = getBundleName("bundle2");
+
+ assertManifestEntry(manifest, filename, "Name", filename);
+ assertManifestEntry(manifest, filename, "Bundle-SymbolicName", "testbundles.bundle2");
+ assertManifestEntry(manifest, filename, "Bundle-Version", "1.0.0");
+
+ int count = countJarEntries(jis);
+
+ assertEquals("Expected two entries in the JAR!", 2, count);
+ }
+
+ private void assertAttributes(Attributes attributes, String headerName, String expectedValue)
+ throws RuntimeException {
+ assertNotNull("No attributes given!", attributes);
+ assertEquals(headerName, expectedValue, attributes.getValue(headerName));
+ }
+
+ private void assertManifestEntry(Manifest manifest, String key, String headerName, String expectedValue)
+ throws RuntimeException {
+ Attributes attributes = manifest.getEntries().get(key);
+ assertNotNull("No attributes found for: " + key, attributes);
+ assertAttributes(attributes, headerName, expectedValue);
+ }
+
+ private void assertManifestHeader(Manifest manifest, String headerName, String expectedValue)
+ throws RuntimeException {
+ assertAttributes(manifest.getMainAttributes(), headerName, expectedValue);
+ }
+
+ private int countJarEntries(JarInputStream jis) throws IOException {
+ int count = 0;
+ try {
+ while (jis.getNextJarEntry() != null) {
+ count++;
+ jis.closeEntry();
+ }
+ }
+ finally {
+ jis.close();
+ }
+ return count;
+ }
+
+ private String getBundleName(String baseName) {
+ return String.format("org.apache.felix.deploymentadmin.test.%1$s-1.0.0.jar", baseName);
+ }
+
+ private String getBundleFilename(String baseName) {
+ return String.format("%1$s/target/org.apache.felix.deploymentadmin.test.%1$s-1.0.0.jar", baseName);
+ }
+
+ private URL getTestBundle(String baseName) throws MalformedURLException {
+ File f = new File(m_testBundleBasePath, getBundleFilename(baseName));
+ assertTrue("No such bundle: " + f, f.exists() && f.isFile());
+ return f.toURI().toURL();
+ }
+
+ private URL getTestResource(String resourceName) {
+ if (!resourceName.startsWith("/")) {
+ resourceName = "/".concat(resourceName);
+ }
+ URL resource = getClass().getResource(resourceName);
+ assertNotNull("No such resource: " + resourceName, resource);
+ return resource;
+ }
+}
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallDeploymentPackageTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallDeploymentPackageTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallDeploymentPackageTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallDeploymentPackageTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,302 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
+
+/**
+ * Provides test cases regarding the use of "normal" deployment packages in DeploymentAdmin.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class InstallDeploymentPackageTest extends BaseIntegrationTest {
+
+ /**
+ * Tests that adding the dependency for a bundle in an update package causes the depending bundle to be resolved and started.
+ */
+ @Test
+ public void testInstallBundleWithDependencyInPackageUpdateOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ // missing bundle1 as dependency...
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp1.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertTrue(isBundleInstalled(dp1.getBundle(getSymbolicName("bundle2"))));
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue(isBundleActive(dp2.getBundle(getSymbolicName("bundle1"))));
+ assertTrue(isBundleActive(dp2.getBundle(getSymbolicName("bundle2"))));
+ }
+
+ /**
+ * Tests that installing a bundle with a dependency installed by another deployment package is not started, but is resolved.
+ */
+ @Test
+ public void testInstallBundleWithDependencyInSeparatePackageOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+
+ // We shouldn't be able to resolve the deps for bundle2...
+ assertFalse(m_packageAdmin.resolveBundles(new Bundle[] { dp1.getBundle(getSymbolicName("bundle2")) }));
+
+ assertTrue(isBundleInstalled(dp1.getBundle(getSymbolicName("bundle2"))));
+
+ dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ // as missing bundle1...
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+
+ // Now we should be able to resolve the dependencies for bundle2...
+ assertTrue(m_packageAdmin.resolveBundles(new Bundle[] { dp1.getBundle(getSymbolicName("bundle2")) }));
+
+ assertTrue(isBundleActive(dp2.getBundle(getSymbolicName("bundle1"))));
+ assertTrue(isBundleResolved(dp1.getBundle(getSymbolicName("bundle2"))));
+ }
+
+ /**
+ * Tests that if an exception is thrown in the start method of a bundle, the installation is not rolled back.
+ */
+ @Test
+ public void testInstallBundleWithExceptionThrownInStartCausesNoRollbackOk() throws Exception {
+ System.setProperty("bundle3", "start");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle1"))));
+ // the bundle threw an exception during start, so it is not active...
+ assertFalse(isBundleActive(dp.getBundle(getSymbolicName("bundle3"))));
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that installing a bundle whose dependencies cannot be met, is installed, but not started.
+ */
+ @Test
+ public void testInstallBundleWithMissingDependencyOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+
+ assertTrue(isBundleInstalled(dp.getBundle(getSymbolicName("bundle2"))));
+ }
+
+ /**
+ * Tests that installing a bundle along with other (non-bundle) artifacts succeeds.
+ */
+ @Test
+ public void testInstallBundleWithOtherArtifactsOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(
+ dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1)
+ .setUrl(getTestResource("test-config1.xml")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ // Though the commit failed; the package should be installed...
+ assertBundleExists(getSymbolicName("rp1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that installing a new bundle works as expected.
+ */
+ @Test
+ public void testInstallSingleValidBundleOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertNotNull("Failed to obtain test service?!", awaitService(TEST_SERVICE_NAME));
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle1"))));
+ }
+
+ /**
+ * Tests that installing two bundles works as expected.
+ */
+ @Test
+ public void testInstallTwoValidBundlesOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertNotNull("Failed to obtain test service?!", awaitService(TEST_SERVICE_NAME));
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle1"))));
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle2"))));
+ }
+
+ /**
+ * Tests that if an exception is thrown during the stop of a bundle, the installation/update continues and succeeds.
+ */
+ @Test
+ public void testUpdateBundleWithExceptionThrownInStopCauseNoRollbackOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ System.setProperty("bundle3", "stop");
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle1"))));
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle2"))));
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle3"))));
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the uninstall of a bundle, the installation/update continues and succeeds.
+ */
+ @Test
+ public void testUninstallBundleWithExceptionThrownInStopCauseNoRollbackOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ System.setProperty("bundle3", "stop");
+
+ dpBuilder = dpBuilder.create("1.0.1");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+ assertBundleNotExists(getSymbolicName("bundle3"), "1.0.0");
+
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle1"))));
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle2"))));
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+}
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,548 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import static org.osgi.service.deploymentadmin.DeploymentException.*;
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_MISSING_BUNDLE;
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_MISSING_FIXPACK_TARGET;
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_MISSING_RESOURCE;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+import org.osgi.service.deploymentadmin.DeploymentException;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
+
+/**
+ * Provides test cases regarding the use of "fix-packages" in DeploymentAdmin.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class InstallFixPackageTest extends BaseIntegrationTest {
+
+ /**
+ * Tests that we can install a new bundle through a fix-package.
+ */
+ @Test
+ public void testInstallBundleWithDependencyInFixPackageUpdateOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp1.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertEquals(Bundle.INSTALLED, bundle.getState());
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ bundle = dp2.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from bundle context?!", bundle);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+
+ assertTrue(isBundleActive(bundle));
+ }
+
+ /**
+ * Tests that it is not possible to install a fix package if it specifies a fix-version range that falls outside the installed target deployment package.
+ */
+ @Test
+ public void testInstallFixPackageOutsideLowerTargetRangeFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp1.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertEquals(Bundle.INSTALLED, bundle.getState());
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("(1.0,2.0)") // should not include version 1.0.0!
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing fix package for undefined target package?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(CODE_MISSING_FIXPACK_TARGET, exception);
+ }
+ }
+
+ /**
+ * Tests that it is not possible to install a fix package if it specifies a fix-version range that falls outside the installed target deployment package.
+ */
+ @Test
+ public void testInstallFixPackageOutsideUpperTargetRangeFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp1.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertEquals(Bundle.INSTALLED, bundle.getState());
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[0.9,1.0)") // should not include version 1.0.0!
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing fix package for undefined target package?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(CODE_MISSING_FIXPACK_TARGET, exception);
+ }
+ }
+
+ /**
+ * Tests that a fix package can only be installed after at least one version of the denoted target package is installed.
+ */
+ @Test
+ public void testInstallFixPackageWithoutTargetFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Should not be able to install fix package without target?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(CODE_MISSING_FIXPACK_TARGET, exception);
+ }
+ }
+
+ /**
+ * Tests that installing a fix-package causes the original target package to be replaced.
+ */
+ @Test
+ public void testInstallFixPackageReplacesOriginalTargetPackageOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ assertEquals("Expected only a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ awaitRefreshPackagesEvent();
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected only a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that installing a fix-package that mentions a bundle that is not in the target package fails.
+ */
+ @Test
+ public void testInstallFixPackageWithMissingTargetBundleFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ // missed valid-bundle1 as dependency...
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ assertEquals("Expected only a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ awaitRefreshPackagesEvent();
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a fix-package with a missing bundle on target?!");
+ }
+ catch (DeploymentException exception) {
+ assertDeploymentException(CODE_MISSING_BUNDLE, exception);
+ }
+ }
+
+ /**
+ * Tests that installing a fix-package that mentions a resource that is not in the target package fails.
+ */
+ @Test
+ public void testInstallFixPackageWithMissingTargetResourceFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ assertEquals("Expected only a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ awaitRefreshPackagesEvent();
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")).setMissing());
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a fix-package with a missing bundle on target?!");
+ }
+ catch (DeploymentException exception) {
+ assertDeploymentException(CODE_MISSING_RESOURCE, exception);
+ }
+ }
+
+ /**
+ * Tests that installing a fix-package that mentions a resource processor that is not in the target package fails.
+ */
+ @Test
+ public void testInstallFixPackageWithMissingTargetResourceProcessorFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ assertEquals("Expected only a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ awaitRefreshPackagesEvent();
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")).setMissing())
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a fix-package with a missing bundle on target?!");
+ }
+ catch (DeploymentException exception) {
+ assertDeploymentException(CODE_MISSING_BUNDLE, exception);
+ }
+ }
+
+ /**
+ * Tests that installing a fix-package that mentions a bundle that does exist (in another DP), but is not in the target package fails.
+ */
+ @Test
+ public void testInstallFixPackageWithMissingTargetBundleFromOtherPackageFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected only a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected only a single deployment package?!", 2, m_deploymentAdmin.listDeploymentPackages().length);
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")).setMissing())
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Succeeded into installing a fix-package with a missing bundle on target?!");
+ }
+ catch (DeploymentException exception) {
+ assertDeploymentException(CODE_BUNDLE_SHARING_VIOLATION, exception);
+ }
+ }
+
+ /**
+ * Tests that only in a fix-package bundle can be marked as missing.
+ */
+ @Test
+ public void testMissingBundlesOnlyInFixPackageFail() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp1.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertEquals(Bundle.INSTALLED, bundle.getState());
+
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .disableVerification()
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ try {
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Failed to install missing bundle?!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertEquals("Invalid exception code?!", CODE_BAD_HEADER, exception.getCode());
+ }
+ }
+
+ /**
+ * Tests the removal of a bundle through a fix package.
+ */
+ @Test
+ public void testRemoveBundleInFixPackageUpdateOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ Bundle bundle = dp1.getBundle(getSymbolicName("bundle2"));
+ assertNotNull("Failed to obtain bundle from deployment package?!", bundle);
+
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+
+ // valid-bundle2 is to be removed by this fix package...
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")).setMissing());
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleNotExists(getSymbolicName("bundle2"), "1.0.0");
+ }
+
+ /**
+ * Tests that we can uninstall a fix-package.
+ */
+ @Test
+ public void testUninstallBundleAddedInFixPackageOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ // Add valid-bundle1 through fix-package...
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+
+ // Uninstall the deployment package; should yield the original situation again...
+ dp2.uninstall();
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+
+ // None of our installed bundles should remain...
+ assertBundleNotExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleNotExists(getSymbolicName("bundle2"), "1.0.0");
+ }
+
+ /**
+ * Tests that we can uninstall a fix-package.
+ */
+ @Test
+ public void testUninstallBundleRemovedInFixPackageOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ // remove valid-bundle1 through fix package...
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleNotExists(getSymbolicName("bundle2"), "1.0.0");
+
+ // Uninstall the deployment package; should yield the initial situation again...
+ dp2.uninstall();
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+
+ // None of our installed bundles should remain...
+ assertBundleNotExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleNotExists(getSymbolicName("bundle2"), "1.0.0");
+ }
+
+ /**
+ * Tests that we can uninstall a fix-package and that this will only uninstall the bundles installed by the fix-package.
+ */
+ @Test
+ public void testUninstallFixPackageOnlyRemovesOwnArtifactsOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+
+ DeploymentPackage dp2 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp2);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected two deployment packages?!", 2, m_deploymentAdmin.listDeploymentPackages().length);
+
+ // add bundle2 through fix package...
+ dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
+ dpBuilder
+ .setFixPackage("[1.0,2.0)")
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+
+ DeploymentPackage dp3 = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp3);
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected two deployment packages?!", 2, m_deploymentAdmin.listDeploymentPackages().length);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle2"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ // Uninstall the deployment package; should yield the initial situation again...
+ dp3.uninstall();
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected a single deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ // None of our installed bundles should remain...
+ assertBundleNotExists(getSymbolicName("bundle3"), "1.0.0");
+ assertBundleNotExists(getSymbolicName("bundle2"), "1.0.0");
+ // The bundle installed in another deployment package should still remain...
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ }
+}
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,132 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder.JarManifestManipulatingFilter;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+import org.osgi.service.deploymentadmin.DeploymentAdmin;
+import org.osgi.service.deploymentadmin.DeploymentException;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
+
+/**
+ * Generic tests for {@link DeploymentAdmin}.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class ResourceSharingTest extends BaseIntegrationTest {
+
+ @Test
+ public void testBundleCanBelongToOneDeploymentPackageOnly() throws Exception {
+ DeploymentPackageBuilder dpBuilder1 = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder1
+ .add(dpBuilder1.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder1.createBundleResource()
+ .setUrl(getTestBundle("bundle2"))
+ );
+
+ DeploymentPackageBuilder dpBuilder2 = createNewDeploymentPackageBuilder("0.8.0");
+ dpBuilder2
+ .add(dpBuilder2.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ );
+
+ DeploymentPackage dp1 = m_deploymentAdmin.installDeploymentPackage(dpBuilder1.generate());
+ assertNotNull("No deployment package returned?!", dp1);
+
+ awaitRefreshPackagesEvent();
+
+ try {
+ // should fail: valid-bundle1 belongs to another DP...
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder2.generate());
+ fail("Expected a DeploymentException with code " + DeploymentException.CODE_BUNDLE_SHARING_VIOLATION);
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertEquals(DeploymentException.CODE_BUNDLE_SHARING_VIOLATION, exception.getCode());
+ }
+ }
+
+ @Test
+ public void testBundleCannotBeSharedWithNonDeploymentPackagedBundle() throws Exception {
+ // Manually install a bundle...
+ Bundle result = m_context.installBundle(getTestBundle("bundle1").toExternalForm());
+ assertNotNull(result);
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle1"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle2"))
+ );
+
+ try {
+ // should fail: valid-bundle1 is installed, but does not belong to any DP...
+ m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ fail("Expected a DeploymentException with code " + DeploymentException.CODE_BUNDLE_SHARING_VIOLATION);
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected...
+ assertEquals(DeploymentException.CODE_BUNDLE_SHARING_VIOLATION, exception.getCode());
+ }
+ }
+
+ @Test
+ public void testForeignBundleCanCoexistWithPackagedBundleIfVersionsDiffer() throws Exception {
+ // Manually install a bundle...
+ Bundle result = m_context.installBundle(getTestBundle("bundle1").toExternalForm());
+ assertNotNull(result);
+
+ long bundleId = result.getBundleId();
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertTrue(isBundleInstalled(result));
+
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource()
+ .setVersion("1.1.0")
+ .setUrl(getTestBundle("bundle1"))
+ .setFilter(new JarManifestManipulatingFilter("Bundle-Version", "1.1.0"))
+ )
+ .add(dpBuilder.createBundleResource()
+ .setUrl(getTestBundle("bundle2"))
+ );
+
+ // should succeed: valid-bundle1 is installed, but has a different version than the one in our DP...
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
+ assertBundleExists(getSymbolicName("bundle1"), "1.1.0");
+
+ // The manually installed bundle should still be in the installed or resolved state...
+ assertTrue(isBundleInstalled(m_context.getBundle(bundleId)) || isBundleResolved(m_context.getBundle(bundleId)));
+ assertTrue(isBundleActive(dp.getBundle(getSymbolicName("bundle1"))));
+ }
+}
Added: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java?rev=1352090&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java (added)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java Wed Jun 20 13:27:02 2012
@@ -0,0 +1,238 @@
+/*
+ * 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.felix.deploymentadmin.itest;
+
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_COMMIT_ERROR;
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_OTHER_ERROR;
+import static org.osgi.service.deploymentadmin.DeploymentException.CODE_PROCESSOR_NOT_FOUND;
+
+import org.apache.felix.deploymentadmin.itest.util.DeploymentPackageBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+import org.osgi.service.deploymentadmin.DeploymentException;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
+
+/**
+ * Provides test cases regarding the use of "normal" deployment packages in DeploymentAdmin.
+ */
+@RunWith(JUnit4TestRunner.class)
+public class UninstallDeploymentPackageTest extends BaseIntegrationTest {
+
+ /**
+ * Tests that if a resource processor is missing (uninstalled) during the forced uninstallation of a deployment package this will ignored and the uninstall completes.
+ */
+ @Test
+ public void testForcedUninstallDeploymentPackageWithMissingResourceProcessorSucceeds() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ Bundle rpBundle = dp.getBundle(getSymbolicName("rp1"));
+ rpBundle.uninstall();
+
+ assertTrue("One bundle should be started!", getCurrentBundles().size() == 1);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ assertTrue(dp.uninstallForced());
+
+ assertTrue("No bundle should be started!", getCurrentBundles().isEmpty());
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the commit-phase, the installation is continued normally.
+ */
+ @Test
+ public void testUninstallDeploymentPackageWithExceptionThrowingInCommitCausesNoRollbackOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ System.setProperty("rp1", "commit");
+
+ dp.uninstall();
+
+ assertTrue("No bundles should be started! " + getCurrentBundles(), getCurrentBundles().isEmpty());
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the dropping of a resource, the installation is rolled back.
+ */
+ @Test
+ public void testUninstallDeploymentPackageWithExceptionThrowingInDropAllResourcesCausesRollbackOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ System.setProperty("rp1", "dropAllResources");
+
+ try {
+ dp.uninstall();
+ fail("Expected uninstall to fail and rollback!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(CODE_OTHER_ERROR, exception);
+ }
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the prepare-phase, the installation is rolled back.
+ */
+ @Test
+ public void testUninstallDeploymentPackageWithExceptionThrowingInPrepareCausesRollbackOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ System.setProperty("rp1", "prepare");
+
+ try {
+ dp.uninstall();
+ fail("Expected uninstall to fail and rollback!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(CODE_COMMIT_ERROR, exception);
+ }
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+
+ /**
+ * Tests that if an exception is thrown during the uninstall of a bundle, the installation/update continues and succeeds.
+ */
+ @Test
+ public void testUninstallDeploymentPackageWithExceptionThrownInStopCauseNoRollbackOk() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertBundleExists(getSymbolicName("bundle3"), "1.0.0");
+
+ System.setProperty("bundle3", "stop");
+
+ dp.uninstall();
+
+ awaitRefreshPackagesEvent();
+
+ assertEquals("Expected no deployment package?!", 0, m_deploymentAdmin.listDeploymentPackages().length);
+
+ assertTrue("Expected no bundles to remain?!", getCurrentBundles().isEmpty());
+ }
+
+ /**
+ * Tests that if a resource processor is missing (uninstalled) during the uninstallation of a deployment package, this is regarded an error and a rollback is performed.
+ */
+ @Test
+ public void testUninstallDeploymentPackageWithMissingResourceProcessorCausesRollback() throws Exception {
+ DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
+ dpBuilder
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
+
+ DeploymentPackage dp = m_deploymentAdmin.installDeploymentPackage(dpBuilder.generate());
+ assertNotNull("No deployment package returned?!", dp);
+
+ awaitRefreshPackagesEvent();
+
+ assertTrue("Two bundles should be started!", getCurrentBundles().size() == 2);
+
+ Bundle rpBundle = dp.getBundle(getSymbolicName("rp1"));
+ rpBundle.uninstall();
+
+ assertTrue("One bundle should be started!", getCurrentBundles().size() == 1);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+
+ try {
+ dp.uninstall();
+ fail("Expected uninstall to fail and rollback!");
+ }
+ catch (DeploymentException exception) {
+ // Ok; expected
+ assertDeploymentException(CODE_PROCESSOR_NOT_FOUND, exception);
+ }
+
+ assertTrue("One bundle should be started!", getCurrentBundles().size() == 1);
+
+ assertEquals("Expected no deployment package?!", 1, m_deploymentAdmin.listDeploymentPackages().length);
+ }
+}