[MAINTENANCE] Fix missing cast when nice mock is created

Author: alien11689

subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/ResolveContextTest.java

@@ -59,7 +59,7 @@ public boolean addAll(int index, Collection<? extends Capability> c) {
                     throw new UnsupportedOperationException();
                 }
             };
-            caps.add(0, EasyMock.createNiceMock(HostedCapability.class));
+            caps.add(0, (Capability) EasyMock.createNiceMock(HostedCapability.class));
 
             assertEquals(1, rc.insertHostedCapability(caps, hc));
             assertSame(hc, caps.get(1));

subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/ResourceHelperTest.java

@@ -32,16 +32,20 @@ public void testMandatoryDirectiveAbsent() {
 				.attribute("a", "b")
 				.attribute("b", "c")
 				.attribute("c", "d")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		Requirement req = new BasicRequirement.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
 				.directive(PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE,
 						"(&(osgi.wiring.package=com.foo)(a=b)(b=c))")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		assertTrue("Capability should match requirement", ResourceHelper.matches(req, cap));
 	}
-	
-	@Test
+
+    private static Resource createResourceMock() {
+        return EasyMock.createNiceMock(Resource.class);
+    }
+
+    @Test
 	public void testMandatoryDirectiveAndNullFilterDirective() {
 		Capability cap = new BasicCapability.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
@@ -50,10 +54,10 @@ public void testMandatoryDirectiveAndNullFilterDirective() {
 				.attribute("b", "c")
 				.attribute("c", "d")
 				.directive(PackageNamespace.CAPABILITY_MANDATORY_DIRECTIVE, "b")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		Requirement req = new BasicRequirement.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		assertFalse("Capability should not match requirement", ResourceHelper.matches(req, cap));
 	}
 
@@ -66,12 +70,12 @@ public void testMandatoryDirectiveCaseSensitive() {
 				.attribute("bAr", "c")
 				.attribute("c", "d")
 				.directive(PackageNamespace.CAPABILITY_MANDATORY_DIRECTIVE, "bAr")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		Requirement req = new BasicRequirement.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
 				.directive(PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE,
 						"(&(osgi.wiring.package=com.foo)(a=b)(baR=c)(c=d))")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		assertFalse("Capability should not match requirement", ResourceHelper.matches(req, cap));
 	}
 
@@ -84,13 +88,13 @@ public void testMandatoryDirectiveExportPackageFail() {
 				.attribute("b", "c")
 				.attribute("c", "d")
 				.directive(PackageNamespace.CAPABILITY_MANDATORY_DIRECTIVE, "a,c")
-				.resource(EasyMock.createNiceMock(Resource.class))
+				.resource(createResourceMock())
 				.build();
 		Requirement req = new BasicRequirement.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
 				.directive(PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE,
 						"(&(osgi.wiring.package=com.foo)(a=b)(b=c))")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		assertFalse("Capability should not match requirement", ResourceHelper.matches(req, cap));
 	}
 
@@ -103,13 +107,13 @@ public void testMandatoryDirectiveExportPackagePass() {
 				.attribute("b", "c")
 				.attribute("c", "d")
 				.directive(PackageNamespace.CAPABILITY_MANDATORY_DIRECTIVE, "a,c")
-				.resource(EasyMock.createNiceMock(Resource.class))
+				.resource(createResourceMock())
 				.build();
 		Requirement req = new BasicRequirement.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
 				.directive(PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE,
 						"(&(osgi.wiring.package=com.foo)(a=b)(c=d))")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		assertTrue("Capability should match requirement", ResourceHelper.matches(req, cap));
 	}
 
@@ -122,13 +126,13 @@ public void testMandatoryDirectiveWithWhitespace() {
 				.attribute("b", "c")
 				.attribute("c", "d")
 				.directive(PackageNamespace.CAPABILITY_MANDATORY_DIRECTIVE, "\ra\n, c	")
-				.resource(EasyMock.createNiceMock(Resource.class))
+				.resource(createResourceMock())
 				.build();
 		Requirement req = new BasicRequirement.Builder()
 				.namespace(PackageNamespace.PACKAGE_NAMESPACE)
 				.directive(PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE,
 						"(&(osgi.wiring.package=com.foo)(a=b)(c=d))")
-				.resource(EasyMock.createNiceMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		assertTrue("Capability should match requirement", ResourceHelper.matches(req, cap));
 	}
 }

subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AriesSubsystemTest.java

@@ -155,7 +155,7 @@ public void testAddRequirementsKeepsEdgesOtherThanParentChild() throws Exception
 					.directive(
 							PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE, 
 							"(osgi.wiring.package=org.osgi.framework)")
-					.resource(EasyMock.createMock(Resource.class))
+					.resource(createResourceMock())
 					.build();
 			applicationB.addRequirements(Collections.singleton(requirement));
 			bRegion = getRegion(applicationB);
@@ -180,7 +180,7 @@ public void testAddRequirementsKeepsEdgesOtherThanParentChild() throws Exception
 					.directive(
 							PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE, 
 							"(osgi.wiring.package=org.osgi.framework.wiring)")
-					.resource(EasyMock.createMock(Resource.class))
+					.resource(createResourceMock())
 					.build();
 			applicationB.addRequirements(Collections.singleton(requirement));
 			rootRegion = getRegion(getRootSubsystem());
@@ -195,8 +195,12 @@ public void testAddRequirementsKeepsEdgesOtherThanParentChild() throws Exception
 			uninstallSubsystemSilently(compositeA);
 		}
 	}
-	
-	/*
+
+    private static Resource createResourceMock() {
+        return EasyMock.createMock(Resource.class);
+    }
+
+    /*
 	 * Test the AriesSubsystem.addRequirements(Collection<Requirement>) method.
 	 * 
 	 * There are several things to consider for this test.
@@ -231,7 +235,7 @@ public void testAddRequirements() throws Exception {
 				.directive(
 					PackageNamespace.REQUIREMENT_FILTER_DIRECTIVE, 
 					"(osgi.wiring.package=org.osgi.framework)")
-					.resource(EasyMock.createMock(Resource.class))
+					.resource(createResourceMock())
 					.build();
 			compositeA.addRequirements(Collections.singleton(requirement));
 			// Test that the bundles were copied over to the newly created region.
@@ -266,7 +270,7 @@ public void testAddRequirementWithVisibleBundleNamespace() throws Exception {
 		Requirement requirement = new BasicRequirement.Builder()
 				.namespace(RegionFilter.VISIBLE_BUNDLE_NAMESPACE)
 				.directive(Namespace.REQUIREMENT_FILTER_DIRECTIVE, "(id=0)")
-				.resource(EasyMock.createMock(Resource.class)).build();
+				.resource(createResourceMock()).build();
 		AriesSubsystem compositeA = (AriesSubsystem) installSubsystemFromFile(COMPOSITE_A);
 		try {
 			startSubsystem(compositeA);