commit 9f116ffc010b6c860dc9ed88db15049d2bedb779
author Marcel Reutegger <mreutegg@adobe.com> Wed Nov 08 16:22:52 2017 +0100
committer Marcel Reutegger <mreutegg@adobe.com> Wed Nov 08 16:22:52 2017 +0100
tree 8b6eb64be1031094b62249718c0a913e70808383
parent 30b3eceb3a7e82291c64713f7133747a0c7e7290

SLING-7233: MockConfigurationAdmin ignores configuration PID

Use component name when there is no configuration PID

src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java

diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java b/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
index 6769a97..1fca7a5 100644
--- a/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
+++ b/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
@@ -263,7 +263,7 @@
         if (nodes != null && nodes.getLength() > 0) {
             return getAttributeValue(nodes.item(0), "name");
         }
-        return null;
+        return clazz.getName();
     }
 
     private static String[] getConfigurationPID(Class clazz, Document metadata) {
@@ -274,7 +274,7 @@
             value = getAttributeValue(nodes.item(0), "configuration-pid");
         }
         if (value == null) {
-            value = clazz.getName();
+            value = getComponentName(clazz, metadata);
         }
         return StringUtils.split(value);
     }