This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.osgi-mock-2.2.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit dbbe410c173928b3ef52c3261b6f782ad1d3d423 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Mar 14 21:47:48 2017 +0000 SLING-6641 osgi-mock: MockOsgi.setConfigForPid convenience method git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock@1786956 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/testing/mock/osgi/MockOsgi.java | 36 ++++++++++++++++++++++ .../sling/testing/mock/osgi/package-info.java | 2 +- .../mock/osgi/MockConfigurationAdminTest.java | 16 +++------- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java b/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java index a4e9923..7c07578 100644 --- a/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java +++ b/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java @@ -22,12 +22,14 @@ import static org.apache.sling.testing.mock.osgi.MapMergeUtil.propertiesMergeWit import static org.apache.sling.testing.mock.osgi.MapUtil.toDictionary; import static org.apache.sling.testing.mock.osgi.MapUtil.toMap; +import java.io.IOException; import java.util.Dictionary; import java.util.Map; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.ServiceReference; +import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.component.ComponentContext; import org.osgi.service.log.LogService; @@ -272,6 +274,40 @@ public final class MockOsgi { } /** + * Set configuration via ConfigurationAdmin service in bundle context for component with given pid. + * @param bundleContext Bundle context + * @param pid PID + * @param properties Configuration properties + */ + public static void setConfigForPid(BundleContext bundleContext, String pid, Map<String,Object> properties) { + setConfigForPid(bundleContext, pid, toDictionary(properties)); + } + + /** + * Set configuration via ConfigurationAdmin service in bundle context for component with given pid. + * @param bundleContext Bundle context + * @param pid PID + * @param properties Configuration properties + */ + public static void setConfigForPid(BundleContext bundleContext, String pid, Object... properties) { + setConfigForPid(bundleContext, pid, toDictionary(properties)); + } + + private static void setConfigForPid(BundleContext bundleContext, String pid, Dictionary<String, Object> properties) { + ConfigurationAdmin configAdmin = getConfigAdmin(bundleContext); + if (configAdmin == null) { + throw new RuntimeException("ConfigurationAdmin service is not registered in bundle context."); + } + try { + Configuration config = configAdmin.getConfiguration(pid); + config.update(properties); + } + catch (IOException ex) { + throw new RuntimeException("Unable to update configuration for pid '" + pid + "'.", ex); + } + } + + /** * Deactivates all bundles registered in the mocked bundle context. * @param bundleContext Bundle context */ diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/package-info.java b/src/main/java/org/apache/sling/testing/mock/osgi/package-info.java index 94cd4bc..d1f57fc 100644 --- a/src/main/java/org/apache/sling/testing/mock/osgi/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/osgi/package-info.java @@ -19,5 +19,5 @@ /** * Mock implementation of selected OSGi APIs. */ [email protected]("3.2") [email protected]("3.3") package org.apache.sling.testing.mock.osgi; diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/MockConfigurationAdminTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/MockConfigurationAdminTest.java index ded699f..857ebb7 100644 --- a/src/test/java/org/apache/sling/testing/mock/osgi/MockConfigurationAdminTest.java +++ b/src/test/java/org/apache/sling/testing/mock/osgi/MockConfigurationAdminTest.java @@ -22,8 +22,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.io.IOException; -import java.util.Dictionary; -import java.util.Hashtable; import org.apache.sling.testing.mock.osgi.OsgiMetadataUtilTest.ServiceWithMetadata; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; @@ -31,8 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; -import org.osgi.service.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; import com.google.common.collect.ImmutableMap; @@ -48,14 +44,10 @@ public class MockConfigurationAdminTest { @Test public void testGetConfigurationString() throws IOException { - ConfigurationAdmin configAdmin = context.getService(ConfigurationAdmin.class); - - Configuration config = configAdmin.getConfiguration("org.apache.sling.testing.mock.osgi.OsgiMetadataUtilTest$ServiceWithMetadata"); - Dictionary<String, Object> configProps = new Hashtable<String, Object>(); - configProps.put(Constants.SERVICE_RANKING, 3000); - configProps.put("adaptables", TEST_ADAPTABLES); - configProps.put("prop2", 2); - config.update(configProps); + MockOsgi.setConfigForPid(context.bundleContext(), "org.apache.sling.testing.mock.osgi.OsgiMetadataUtilTest$ServiceWithMetadata", + Constants.SERVICE_RANKING, 3000, + "adaptables", TEST_ADAPTABLES, + "prop2", 2); context.registerInjectActivateService(new ServiceWithMetadata(), ImmutableMap.<String, Object>builder() .put(Constants.SERVICE_RANKING, 4000) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
