summaryrefslogtreecommitdiffstats
path: root/jdisc_core_test/integration_test
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-09-25 11:53:40 +0200
committergjoranv <gv@oath.com>2018-09-26 16:46:30 +0200
commit66f479c351c593e63f36039c4d85c7f02a8f5b03 (patch)
treed92f750b04a772b7d7bd858e3096bd273da617d3 /jdisc_core_test/integration_test
parenta246879bed135a7c5861eab5ad0da85e16e539d7 (diff)
Create separate packages for activator test bundles.
- When running tests in IntelliJ, classes from the two bundles are confused.
Diffstat (limited to 'jdisc_core_test/integration_test')
-rw-r--r--jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java
index 6388643148c..03e56d7c26d 100644
--- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java
+++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java
@@ -22,7 +22,7 @@ public class BundleActivatorIntegrationTest {
OsgiFramework osgi = driver.osgiFramework();
BundleInstaller installer = new BundleInstaller(driver.osgiFramework());
Bundle bundle = installer.installAndStart("my-bundle-activator.jar").get(0);
- Class<?> serviceClass = bundle.loadClass("com.yahoo.jdisc.bundle.MyService");
+ Class<?> serviceClass = bundle.loadClass("com.yahoo.jdisc.bundle.my_act.MyService");
assertNotNull(serviceClass);
BundleContext ctx = osgi.bundleContext();
ServiceReference<?> serviceRef = ctx.getServiceReference(serviceClass.getName());
@@ -37,7 +37,7 @@ public class BundleActivatorIntegrationTest {
public void requireThatApplicationBundleActivatorHasAccessToCurrentContainer() throws Exception {
TestDriver driver = TestDriver.newApplicationBundleInstance("app-g-act.jar", false);
OsgiFramework osgi = driver.osgiFramework();
- Class<?> serviceClass = osgi.bundles().get(1).loadClass("com.yahoo.jdisc.bundle.MyService");
+ Class<?> serviceClass = osgi.bundles().get(1).loadClass("com.yahoo.jdisc.bundle.g_act.MyService");
assertNotNull(serviceClass);
BundleContext ctx = osgi.bundleContext();
ServiceReference<?> serviceRef = ctx.getServiceReference(serviceClass.getName());