commit bfd7e0f4c17b23e48c5adfe1824566f58aaa9da4
author Radu Cotescu <radu@apache.org> Thu May 28 12:06:43 2020 +0200
committer Radu Cotescu <radu@apache.org> Thu May 28 12:06:43 2020 +0200
tree c43bf09f186ca6f7d4f66170ac2bec3d01df2c80
parent 7679c08c55c8526559639e12a82d67cf11b0bb92

SLING-9477 - Teleported tests cannot be executed on the latest Sling Starter App

* made the BundleTestsProvider rely on the value of component.name for reporting
a value for its pid

src/main/java/org/apache/sling/junit/impl/BundleTestsProvider.java

diff --git a/src/main/java/org/apache/sling/junit/impl/BundleTestsProvider.java b/src/main/java/org/apache/sling/junit/impl/BundleTestsProvider.java
index 4adfb38..d4367da 100644
--- a/src/main/java/org/apache/sling/junit/impl/BundleTestsProvider.java
+++ b/src/main/java/org/apache/sling/junit/impl/BundleTestsProvider.java
@@ -32,7 +32,6 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleListener;
-import org.osgi.framework.Constants;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,9 +44,10 @@
 @Service
 public class BundleTestsProvider implements TestsProvider, BundleListener {
     private final Logger log = LoggerFactory.getLogger(getClass());
+private static final String COMPONENT_NAME = "component.name";
     private long lastModified;
     private BundleContext bundleContext;
-    private String pid;
+    private String componentName;
     
     public static final String SLING_TEST_REGEXP = "Sling-Test-Regexp";
     
@@ -74,7 +74,7 @@
         }
         
         lastModified = System.currentTimeMillis();
-        pid = (String)ctx.getProperties().get(Constants.SERVICE_PID);
+        componentName = (String)ctx.getProperties().get(COMPONENT_NAME);
     }
     
     protected void deactivate(ComponentContext ctx) {
@@ -85,7 +85,7 @@
     
     @Override
     public String toString() {
-        return getClass().getSimpleName() + ", pid=" + pid;
+        return getClass().getSimpleName() + ", componentName(pid)=" + componentName;
     }
 
     /** Update testClasses if bundle changes require it */
@@ -217,7 +217,7 @@
     }
 
     public String getServicePid() {
-        return pid;
+        return componentName;
     }
 
     public List<String> getTestNames() {