diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-19 13:40:35 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-20 13:15:21 +0200 |
commit | 43298ad59815c9731e0d2f0cd8604af08a119021 (patch) | |
tree | d8b3a52ec2d618e66f107181a5c791ba63ec5b07 /bundle-plugin-test | |
parent | 94e3449f4b57647b199a03e2e59f91ee902b35eb (diff) |
Rewrite ProjectBundleClassPaths to Java
Diffstat (limited to 'bundle-plugin-test')
-rw-r--r-- | bundle-plugin-test/pom.xml | 10 | ||||
-rw-r--r-- | bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java | 14 |
2 files changed, 6 insertions, 18 deletions
diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index ebc60f86b93..2112d616523 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -42,16 +42,6 @@ <artifactId>jrt</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>scalalib</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> 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 a7d27a449e6..f088007ebb7 100644 --- a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java +++ b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java @@ -1,11 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo; -import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths; +import com.yahoo.osgi.maven.ProjectBundleClassPaths; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import scala.collection.JavaConverters; import java.io.File; import java.io.FilenameFilter; @@ -132,18 +131,17 @@ public class BundleIT { @SuppressWarnings("unchecked") @Test - public void bundle_class_path_mappings_are_generated() throws URISyntaxException { - URL mappingsUrl = getClass().getResource("/" + ProjectBundleClassPaths.classPathMappingsFileName()); + public void bundle_class_path_mappings_are_generated() throws URISyntaxException, IOException { + URL mappingsUrl = getClass().getResource("/" + com.yahoo.osgi.maven.ProjectBundleClassPaths.CLASSPATH_MAPPINGS_FILENAME); assertNotNull( - "Could not find " + ProjectBundleClassPaths.classPathMappingsFileName() + " in the test output directory", + "Could not find " + ProjectBundleClassPaths.CLASSPATH_MAPPINGS_FILENAME + " in the test output directory", mappingsUrl); ProjectBundleClassPaths bundleClassPaths = ProjectBundleClassPaths.load(Paths.get(mappingsUrl.toURI())); - assertThat(bundleClassPaths.mainBundle().bundleSymbolicName(), is("bundle-plugin-test")); + assertThat(bundleClassPaths.mainBundle.bundleSymbolicName, is("bundle-plugin-test")); - Collection<String> mainBundleClassPaths = - JavaConverters.asJavaCollectionConverter(bundleClassPaths.mainBundle().classPathElements()).asJavaCollection(); + Collection<String> mainBundleClassPaths = bundleClassPaths.mainBundle.classPathElements; assertThat(mainBundleClassPaths, hasItems( |