From 170af02d92a5f5e5442c45d6041cd367e46be3ad Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@gmail.com>
Date: Mon, 9 Jan 2023 08:25:27 +0100
Subject: Revert "More user friendly class resolution"

---
 .../container/core/config/ApplicationBundleLoaderTest.java   | 12 ------------
 .../java/com/yahoo/container/core/config/BundleTestUtil.java |  3 +--
 .../java/com/yahoo/container/core/config/TestBundle.java     | 10 ----------
 3 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'container-core/src/test/java/com/yahoo')

diff --git a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java
index e973dd28838..e646e916521 100644
--- a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java
+++ b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java
@@ -2,7 +2,6 @@
 package com.yahoo.container.core.config;
 
 import com.yahoo.container.di.Osgi.GenerationStatus;
-import com.yahoo.jdisc.application.BsnVersion;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.osgi.framework.Bundle;
@@ -36,7 +35,6 @@ public class ApplicationBundleLoaderTest {
     @Test
     void bundles_are_installed_and_started() {
         bundleLoader.useBundles(List.of(BUNDLE_1_REF));
-        bundleLoader.completeGeneration(GenerationStatus.SUCCESS);
         assertEquals(1, osgi.getInstalledBundles().size());
 
         // The bundle is installed and started
@@ -49,16 +47,6 @@ public class ApplicationBundleLoaderTest {
         assertEquals(BUNDLE_1_REF, bundleLoader.getActiveFileReferences().get(0));
     }
 
-    @Test
-    void current_bundles_metadata_can_be_retrieved() {
-        bundleLoader.useBundles(List.of(BUNDLE_1_REF, BUNDLE_2_REF));
-        bundleLoader.completeGeneration(GenerationStatus.SUCCESS);
-
-        List<BsnVersion> activeBundles = bundleLoader.activeBundlesBsnVersion();
-        assertEquals(new BsnVersion(BUNDLE_1), activeBundles.get(0));
-        assertEquals(new BsnVersion(BUNDLE_2), activeBundles.get(1));
-    }
-
     @Test
     void generation_must_be_marked_complete_before_using_new_bundles() {
         bundleLoader.useBundles(List.of(BUNDLE_1_REF));
diff --git a/container-core/src/test/java/com/yahoo/container/core/config/BundleTestUtil.java b/container-core/src/test/java/com/yahoo/container/core/config/BundleTestUtil.java
index 60ea9009e1e..fddbeaf42be 100644
--- a/container-core/src/test/java/com/yahoo/container/core/config/BundleTestUtil.java
+++ b/container-core/src/test/java/com/yahoo/container/core/config/BundleTestUtil.java
@@ -4,7 +4,6 @@ import com.yahoo.config.FileReference;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
 import com.yahoo.osgi.Osgi;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +16,7 @@ public class BundleTestUtil {
     public static final FileReference BUNDLE_1_REF = new FileReference("bundle-1");
     public static final Bundle BUNDLE_1 = new TestBundle(BUNDLE_1_REF.value());
     public static final FileReference BUNDLE_2_REF = new FileReference("bundle-2");
-    public static final Bundle BUNDLE_2 = new TestBundle(BUNDLE_2_REF.value(), new Version(2, 0, 0, "SNAPSHOT"));
+    public static final Bundle BUNDLE_2 = new TestBundle(BUNDLE_2_REF.value());
 
     public static Map<String, Bundle> testBundles() {
         return Map.of(BUNDLE_1_REF.value(), BUNDLE_1,
diff --git a/container-core/src/test/java/com/yahoo/container/core/config/TestBundle.java b/container-core/src/test/java/com/yahoo/container/core/config/TestBundle.java
index babc936494e..17709844f99 100644
--- a/container-core/src/test/java/com/yahoo/container/core/config/TestBundle.java
+++ b/container-core/src/test/java/com/yahoo/container/core/config/TestBundle.java
@@ -21,17 +21,11 @@ public class TestBundle extends MockBundle {
     private static final BundleRevision revision = new TestBundleRevision();
 
     private final String symbolicName;
-    private final Version version;
 
     boolean started = false;
 
     public TestBundle(String symbolicName) {
-        this(symbolicName, BundleVersion);
-    }
-
-    public TestBundle(String symbolicName, Version version) {
         this.symbolicName = symbolicName;
-        this.version = version;
     }
 
     @Override
@@ -44,10 +38,6 @@ public class TestBundle extends MockBundle {
         return symbolicName;
     }
 
-    @Override
-    public Version getVersion() {
-        return version;
-    }
 
     @SuppressWarnings("unchecked")
     @Override
-- 
cgit v1.2.3