Merge pull request bndtools#1925 from bjhargrave/fix-test

core: Fix tests for bnd changes
eliasvasylenko · Aug 22, 2018 · eb31d0a · eb31d0a
2 parents 81e7d71 + 3cfdce9
commit eb31d0a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/bndtools.core/bnd.bnd b/bndtools.core/bnd.bnd
@@ -97,4 +97,3 @@ eclipse.deps: \
 	slf4j.simple,\
 	${junit},\
 	${mockito}
-
diff --git a/bndtools.core/test/bndtools/tasks/AnalyseBundleResolutionJobTest.java b/bndtools.core/test/bndtools/tasks/AnalyseBundleResolutionJobTest.java
@@ -114,18 +114,4 @@ public void testProvideCapability() {
             .get("uses"));
     }
 
-    public void testOptionalImport() {
-        AnalyseBundleResolutionJob job = new AnalyseBundleResolutionJob("resolve", Collections.singleton(new JarFileCapReqLoader(new File("test/example2.jar"))));
-
-        IStatus status = job.run(new NullProgressMonitor());
-        assertEquals(IStatus.OK, status.getCode());
-
-        Map<String, List<RequirementWrapper>> reqs = job.getRequirements();
-        assertEquals(2, reqs.size());
-
-        List<RequirementWrapper> imports = reqs.get("osgi.wiring.package");
-        assertEquals("optional", imports.get(0).requirement.getDirectives()
-            .get("resolution"));
-    }
-
 }
diff --git a/bndtools.core/test/example2.jar b/bndtools.core/test/example2.jar
diff --git a/bndtools.core/test/org/bndtools/core/editors/ImportPackageQuickFixProcessorTest.java b/bndtools.core/test/org/bndtools/core/editors/ImportPackageQuickFixProcessorTest.java
@@ -115,6 +115,7 @@ private void clearRepos() {
 
     static final Pattern FILTER = Pattern.compile(Pattern.quote(PackageNamespace.PACKAGE_NAMESPACE) + "\\s*=\\s*([^)= ]*)\\s*[)]");
 
+    @SuppressWarnings("unchecked")
     private void mockFindProviders(final String name, Repository repo) {
         doAnswer(new Answer<Map<Requirement, Collection<Capability>>>() {
 
@@ -143,7 +144,7 @@ public Map<Requirement, Collection<Capability>> answer(InvocationOnMock invocati
             }
 
         }).when(repo)
-            .findProviders(any());
+            .findProviders((Collection<? extends Requirement>) any());
     }
 
     private void mockRepositoryPlugin(String name, RepositoryPlugin p) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,4 +97,3 @@ eclipse.deps: \
		slf4j.simple,\
		${junit},\
		${mockito}