diff options
author | gjoranv <gv@oath.com> | 2018-09-25 11:53:40 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-09-26 16:46:30 +0200 |
commit | 66f479c351c593e63f36039c4d85c7f02a8f5b03 (patch) | |
tree | d92f750b04a772b7d7bd858e3096bd273da617d3 /jdisc_core_test | |
parent | a246879bed135a7c5861eab5ad0da85e16e539d7 (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')
8 files changed, 12 insertions, 12 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()); diff --git a/jdisc_core_test/test_bundles/app-g-act/pom.xml b/jdisc_core_test/test_bundles/app-g-act/pom.xml index b91b95f9fdd..aaa740efade 100644 --- a/jdisc_core_test/test_bundles/app-g-act/pom.xml +++ b/jdisc_core_test/test_bundles/app-g-act/pom.xml @@ -23,13 +23,13 @@ <configuration> <instructions> <X-JDisc-Application> - com.yahoo.jdisc.bundle.ApplicationG + com.yahoo.jdisc.bundle.g_act.ApplicationG </X-JDisc-Application> <Bundle-Activator> - com.yahoo.jdisc.bundle.MyBundleActivator + com.yahoo.jdisc.bundle.g_act.MyBundleActivator </Bundle-Activator> <Export-Package> - com.yahoo.jdisc.bundle + com.yahoo.jdisc.bundle.g_act </Export-Package> </instructions> </configuration> diff --git a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/ApplicationG.java b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/g_act/ApplicationG.java index 9b4d7501ac0..02a9cd5a542 100644 --- a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/ApplicationG.java +++ b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/g_act/ApplicationG.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.bundle; +package com.yahoo.jdisc.bundle.g_act; import com.yahoo.jdisc.application.Application; diff --git a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/g_act/MyBundleActivator.java index 51a95b8e3a9..c60f4939409 100644 --- a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java +++ b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/g_act/MyBundleActivator.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.bundle; +package com.yahoo.jdisc.bundle.g_act; import com.yahoo.jdisc.service.CurrentContainer; import org.osgi.framework.BundleActivator; diff --git a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyService.java b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/g_act/MyService.java index a5cb9be9a47..518f7304100 100644 --- a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyService.java +++ b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/g_act/MyService.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.bundle; +package com.yahoo.jdisc.bundle.g_act; import com.yahoo.jdisc.service.AbstractServerProvider; import com.yahoo.jdisc.service.CurrentContainer; diff --git a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml index 531af08b915..8931c26a73e 100644 --- a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml +++ b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml @@ -23,10 +23,10 @@ <configuration> <instructions> <Bundle-Activator> - com.yahoo.jdisc.bundle.MyBundleActivator + com.yahoo.jdisc.bundle.my_act.MyBundleActivator </Bundle-Activator> <Export-Package> - com.yahoo.jdisc.bundle + com.yahoo.jdisc.bundle.my_act </Export-Package> </instructions> </configuration> diff --git a/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java b/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/my_act/MyBundleActivator.java index b4af03bdf60..4212fc2fd09 100644 --- a/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java +++ b/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/my_act/MyBundleActivator.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.bundle; +package com.yahoo.jdisc.bundle.my_act; import com.yahoo.jdisc.service.CurrentContainer; import org.osgi.framework.BundleActivator; diff --git a/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/MyService.java b/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/my_act/MyService.java index 8eb1543776d..b24ee137f59 100644 --- a/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/MyService.java +++ b/jdisc_core_test/test_bundles/my-bundle-activator/src/main/java/com/yahoo/jdisc/bundle/my_act/MyService.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.bundle; +package com.yahoo.jdisc.bundle.my_act; /** * @author Simon Thoresen Hult |