Repository: karaf Updated Branches: refs/heads/master 93ed3f5f1 -> da6911296
Fix junit tests Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/da691129 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/da691129 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/da691129 Branch: refs/heads/master Commit: da691129621fbf77546cc77aa372f04b88bd73e4 Parents: 93ed3f5 Author: Guillaume Nodet <gno...@gmail.com> Authored: Tue Apr 22 14:47:16 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Tue Apr 22 14:47:16 2014 +0200 ---------------------------------------------------------------------- .../apache/karaf/features/internal/region/SubsystemTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/da691129/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java ---------------------------------------------------------------------- diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java index c16de51..d64bb65 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java @@ -38,6 +38,7 @@ import org.apache.karaf.features.internal.service.RepositoryImpl; import org.apache.karaf.features.internal.download.simple.SimpleDownloader; import org.junit.Test; import org.osgi.framework.namespace.IdentityNamespace; +import org.osgi.framework.wiring.BundleRevision; import org.osgi.resource.Capability; import org.osgi.resource.Resource; import org.osgi.resource.Wire; @@ -63,7 +64,7 @@ public class SubsystemTest { SubsystemResolver resolver = new SubsystemResolver(new TestDownloadManager("data1")); resolver.resolve(Collections.<Repository>singletonList(repo), features, - Collections.<Resource>emptyList(), + Collections.<String, Set<BundleRevision>>emptyMap(), Collections.<String>emptySet(), FeaturesServiceImpl.DEFAULT_FEATURE_RESOLUTION_RANGE); @@ -93,7 +94,7 @@ public class SubsystemTest { SubsystemResolver resolver = new SubsystemResolver(new TestDownloadManager("data2")); resolver.resolve(Collections.<Repository>singletonList(repo), features, - Collections.<Resource>emptyList(), + Collections.<String, Set<BundleRevision>>emptyMap(), Collections.<String>emptySet(), FeaturesServiceImpl.DEFAULT_FEATURE_RESOLUTION_RANGE); @@ -113,7 +114,7 @@ public class SubsystemTest { SubsystemResolver resolver = new SubsystemResolver(new TestDownloadManager("data3")); resolver.resolve(Collections.<Repository>singletonList(repo), features, - Collections.<Resource>emptyList(), + Collections.<String, Set<BundleRevision>>emptyMap(), Collections.singleton("b"), FeaturesServiceImpl.DEFAULT_FEATURE_RESOLUTION_RANGE);
