fixed broken test

This commit is contained in:
Adrian Cole 2012-08-12 10:00:17 -07:00
parent 0f0bc429c1
commit 0666a6fbde
1 changed files with 4 additions and 4 deletions

View File

@ -32,7 +32,7 @@ import com.google.inject.Provides;
/**
* @author Adrian Cole
*/
@Test(groups = "unit", singleThreaded = true, testName = "PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest")
@Test(groups = "unit", testName = "PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest")
public class PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest {
Extension keypairs = Extension.builder().alias("os-keypairs").name("Keypairs").namespace(
@ -119,8 +119,8 @@ public class PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensio
private PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet whenExtensionsAndAliasesInclude(
final Set<Extension> extensions, final Multimap<URI, URI> aliases) {
final LoadingCache<String, Set<Extension>> extensionsForZone = CacheBuilder.newBuilder().build(
CacheLoader.from(Functions.forMap(ImmutableMap.of("expectedzone", extensions, "differentzone",
final LoadingCache<String, Set<? extends Extension>> extensionsForZone = CacheBuilder.newBuilder().build(
CacheLoader.from(Functions.forMap(ImmutableMap.<String, Set<? extends Extension>>of("expectedzone", extensions, "differentzone",
ImmutableSet.<Extension> of()))));
PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet fn = Guice.createInjector(
@ -130,7 +130,7 @@ public class PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensio
}
@Provides
LoadingCache<String, Set<Extension>> getExtensions() {
LoadingCache<String, Set<? extends Extension>> getExtensions() {
return extensionsForZone;
}