summaryrefslogtreecommitdiffstats
path: root/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-11-07 21:06:56 +0100
committergjoranv <gv@oath.com>2019-01-21 15:09:26 +0100
commit01705ccfef4a08cebd98a4eb4251e7032b1eac98 (patch)
tree935991a6ae245248f2115ced47ca7a9ce70f520d /bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java
parent40b2f22a2e0920dea7bfd456f07aab29b2ac745f (diff)
Improve integration test
- Add nested classes - Put back commented assert and remove stale comment + Add comment to replace jrt.jar. It's compile scoped and had a much smaller dependency tree when it was added compared to now. Now, it adds loads of Import-Packages, increasing the risk of invalidating the integration test that verifies that the required imports have been added to the manifest.
Diffstat (limited to 'bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java')
-rw-r--r--bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java
index 10f8f4e976c..5b4fdda06f7 100644
--- a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java
+++ b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java
@@ -4,7 +4,6 @@ package com.yahoo;
import com.yahoo.osgi.maven.ProjectBundleClassPaths;
import com.yahoo.vespa.config.VespaVersion;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import java.io.File;
@@ -81,9 +80,15 @@ public class BundleIT {
@Test
public void require_that_manifest_contains_inferred_imports() {
String importPackage = mainAttributes.getValue("Import-Package");
+
+ // From SimpleSearcher
assertThat(importPackage, containsString("com.yahoo.prelude.hitfield"));
- //Not available from jdisc at the moment, scope temporarily changed to compile.
- //assertThat(importPackage, containsString("org.json"));
+ assertThat(importPackage, containsString("org.json"));
+
+ // From SimpleSearcher2
+ assertThat(importPackage, containsString("com.yahoo.processing"));
+ assertThat(importPackage, containsString("com.yahoo.metrics.simple"));
+ assertThat(importPackage, containsString("com.google.inject"));
}
@Test
@@ -104,6 +109,8 @@ public class BundleIT {
}
@Test
+ // TODO: use another jar than jrt, which now pulls in a lot of dependencies that pollute the manifest of the
+ // generated bundle. (It's compile scoped in pom.xml to be added to the bundle-cp.)
public void require_that_manifest_contains_bundle_class_path() {
String bundleClassPath = mainAttributes.getValue("Bundle-ClassPath");
assertThat(bundleClassPath, containsString(".,"));