Add file reference status to test.

2 files changed, 21 insertions, 0 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
index 3497cf45c75..313bb0dfee2 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
@@ -10,8 +10,10 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.wiring.BundleRevision;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -232,4 +234,8 @@ public class BundleLoader {
         customBundleInstaller = bundleInstaller;
     }
 
+    // Only for testing
+    List<FileReference> getActiveFileReferences() {
+        return new ArrayList<>(reference2Bundles.keySet());
+    }
 }
diff --git a/container-core/src/test/java/com/yahoo/container/core/config/BundleLoaderTest.java b/container-core/src/test/java/com/yahoo/container/core/config/BundleLoaderTest.java
index e5939ba7b30..9272ba1cacd 100644
--- a/container-core/src/test/java/com/yahoo/container/core/config/BundleLoaderTest.java
+++ b/container-core/src/test/java/com/yahoo/container/core/config/BundleLoaderTest.java
@@ -38,9 +38,14 @@ public class BundleLoaderTest {
         bundleLoader.use(List.of(BUNDLE_1_REF));
         assertEquals(1, osgi.getInstalledBundles().size());
 
+        // The bundle is installed and started
         TestBundle installedBundle = (TestBundle)osgi.getInstalledBundles().get(0);
         assertEquals(BUNDLE_1.getSymbolicName(), installedBundle.getSymbolicName());
         assertTrue(installedBundle.started);
+
+        // The file reference is active
+        assertEquals(1, bundleLoader.getActiveFileReferences().size());
+        assertEquals(BUNDLE_1_REF, bundleLoader.getActiveFileReferences().get(0));
     }
 
     @Test
@@ -60,6 +65,12 @@ public class BundleLoaderTest {
         assertEquals(2, osgi.getCurrentBundles().size());
         assertEquals(BUNDLE_1.getSymbolicName(), osgi.getCurrentBundles().get(0).getSymbolicName());
         assertEquals(BUNDLE_2.getSymbolicName(), osgi.getCurrentBundles().get(1).getSymbolicName());
+
+
+        // Both file references are active
+        assertEquals(2, bundleLoader.getActiveFileReferences().size());
+        assertEquals(BUNDLE_1_REF, bundleLoader.getActiveFileReferences().get(0));
+        assertEquals(BUNDLE_2_REF, bundleLoader.getActiveFileReferences().get(1));
     }
 
     @Test
@@ -79,6 +90,10 @@ public class BundleLoaderTest {
         // Only bundle-2 is current
         assertEquals(1, osgi.getCurrentBundles().size());
         assertEquals(BUNDLE_2.getSymbolicName(), osgi.getCurrentBundles().get(0).getSymbolicName());
+
+        // Only the bundle-2 file reference is active
+        assertEquals(1, bundleLoader.getActiveFileReferences().size());
+        assertEquals(BUNDLE_2_REF, bundleLoader.getActiveFileReferences().get(0));
     }