Author: jbonofre
Date: Fri Jun 6 13:29:58 2014
New Revision: 1600882
URL: http://svn.apache.org/r1600882
Log:
Fix compilation in jmx itests
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java?rev=1600882&r1=1600881&r2=1600882&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
Fri Jun 6 13:29:58 2014
@@ -57,7 +57,7 @@ import org.osgi.framework.ServiceReferen
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public abstract class AbstractIntegrationTest extends
org.apache.aries.itest.AbstractIntegrationTest {
- protected ServiceReference<MBeanServer> reference;
+ protected ServiceReference reference;
@Inject
protected MBeanServer mbeanServer;
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java?rev=1600882&r1=1600881&r2=1600882&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
Fri Jun 6 13:29:58 2014
@@ -320,7 +320,7 @@ public class BundleStateMBeanTest extend
private Version getPackageVersion(String packageName) {
Bundle systemBundle = context().getBundle(0);
- BundleWiring wiring = systemBundle.adapt(BundleWiring.class);
+ BundleWiring wiring = (BundleWiring)
systemBundle.adapt(BundleWiring.class);
List<BundleCapability> packages =
wiring.getCapabilities(BundleRevision.PACKAGE_NAMESPACE);
for (BundleCapability pkg : packages) {
Map<String, Object> attrs = pkg.getAttributes();
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java?rev=1600882&r1=1600881&r2=1600882&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
Fri Jun 6 13:29:58 2014
@@ -142,7 +142,7 @@ public class FrameworkMBeanTest extends
Bundle bundleA = getBundleByName("org.apache.aries.jmx.test.bundlea");
Bundle bundleB = getBundleByName("org.apache.aries.jmx.test.bundleb");
- BundleWiring bw = bundleB.adapt(BundleWiring.class);
+ BundleWiring bw = (BundleWiring) bundleB.adapt(BundleWiring.class);
List<BundleWire> initialRequiredWires =
bw.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(1, initialRequiredWires.size());
@@ -152,7 +152,7 @@ public class FrameworkMBeanTest extends
assertEquals("Precondition", new Version("1.0"),
capabilityAttributes.get(Constants.BUNDLE_VERSION_ATTRIBUTE));
assertEquals("Precondition", "org.apache.aries.jmx.test.bundlea.api",
capabilityAttributes.get(BundleRevision.PACKAGE_NAMESPACE));
- Collection<Bundle> expectedDC =
context().getBundle(0).adapt(FrameworkWiring.class).getDependencyClosure(Collections.singleton(bundleA));
+ Collection<Bundle> expectedDC = ((FrameworkWiring)
context().getBundle(0).adapt(FrameworkWiring.class)).getDependencyClosure(Collections.singleton(bundleA));
Set<Long> expectedClosure = new TreeSet<Long>();
for (Bundle b : expectedDC) {
expectedClosure.add(b.getBundleId());
@@ -169,12 +169,12 @@ public class FrameworkMBeanTest extends
@Test
public void testRefreshBundleAndWait() throws Exception {
- FrameworkWiring frameworkWiring =
context().getBundle(0).adapt(FrameworkWiring.class);
+ FrameworkWiring frameworkWiring = (FrameworkWiring)
context().getBundle(0).adapt(FrameworkWiring.class);
Bundle bundleA = getBundleByName("org.apache.aries.jmx.test.bundlea");
Bundle bundleB = getBundleByName("org.apache.aries.jmx.test.bundleb");
- BundleWiring bw = bundleB.adapt(BundleWiring.class);
+ BundleWiring bw = (BundleWiring) bundleB.adapt(BundleWiring.class);
List<BundleWire> initialRequiredWires =
bw.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(1, initialRequiredWires.size());
@@ -200,20 +200,20 @@ public class FrameworkMBeanTest extends
assertEquals("Precondition", 0,
frameworkWiring.getRemovalPendingBundles().size());
assertEquals(0, framework.getRemovalPendingBundles().length);
- assertEquals("Precondition", 1,
bundleA.adapt(BundleRevisions.class).getRevisions().size());
+ assertEquals("Precondition", 1, ((BundleRevisions)
bundleA.adapt(BundleRevisions.class)).getRevisions().size());
bundleA.update(new ByteArrayInputStream(baos.toByteArray()));
- assertEquals("There should be 2 revisions now", 2,
bundleA.adapt(BundleRevisions.class).getRevisions().size());
+ assertEquals("There should be 2 revisions now", 2, ((BundleRevisions)
bundleA.adapt(BundleRevisions.class)).getRevisions().size());
assertEquals("No refresh called, the bundle wiring for B should still
be the old one",
bw, bundleB.adapt(BundleWiring.class));
assertEquals("Precondition", 1,
frameworkWiring.getRemovalPendingBundles().size());
assertEquals(1, framework.getRemovalPendingBundles().length);
-
assertEquals(frameworkWiring.getRemovalPendingBundles().iterator().next().getBundleId(),
+ assertEquals(((Bundle)
frameworkWiring.getRemovalPendingBundles().iterator().next()).getBundleId(),
framework.getRemovalPendingBundles()[0]);
assertTrue(framework.refreshBundleAndWait(bundleB.getBundleId()));
- List<BundleWire> requiredWires =
bundleB.adapt(BundleWiring.class).getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
+ List<BundleWire> requiredWires = ((BundleWiring)
bundleB.adapt(BundleWiring.class)).getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(2, requiredWires.size());
List<String> imported = new ArrayList<String>();
for (BundleWire w : requiredWires) {
@@ -235,7 +235,7 @@ public class FrameworkMBeanTest extends
Bundle bundleA = getBundleByName("org.apache.aries.jmx.test.bundlea");
Bundle bundleB = getBundleByName("org.apache.aries.jmx.test.bundleb");
- BundleWiring bw = bundleB.adapt(BundleWiring.class);
+ BundleWiring bw = (BundleWiring) bundleB.adapt(BundleWiring.class);
List<BundleWire> initialRequiredWires =
bw.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(1, initialRequiredWires.size());
@@ -258,9 +258,9 @@ public class FrameworkMBeanTest extends
addResourceToJar("org/apache/aries/jmx/test/bundlea/impl/A2.class",
jos, bundleA);
jos.close();
- assertEquals("Precondition", 1,
bundleA.adapt(BundleRevisions.class).getRevisions().size());
+ assertEquals("Precondition", 1, ((BundleRevisions)
bundleA.adapt(BundleRevisions.class)).getRevisions().size());
bundleA.update(new ByteArrayInputStream(baos.toByteArray()));
- assertEquals("There should be 2 revisions now", 2,
bundleA.adapt(BundleRevisions.class).getRevisions().size());
+ assertEquals("There should be 2 revisions now", 2, ((BundleRevisions)
bundleA.adapt(BundleRevisions.class)).getRevisions().size());
assertEquals("No refresh called, the bundle wiring for B should still
be the old one",
bw, bundleB.adapt(BundleWiring.class));
@@ -269,7 +269,7 @@ public class FrameworkMBeanTest extends
assertTrue((Boolean) result.get(FrameworkMBean.SUCCESS));
assertTrue(Arrays.equals(new Long[] {bundleB.getBundleId()}, (Long [])
result.get(FrameworkMBean.COMPLETED)));
- List<BundleWire> requiredWires =
bundleB.adapt(BundleWiring.class).getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
+ List<BundleWire> requiredWires = ((BundleWiring)
bundleB.adapt(BundleWiring.class)).getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(2, requiredWires.size());
List<String> imported = new ArrayList<String>();
for (BundleWire w : requiredWires) {
@@ -291,7 +291,7 @@ public class FrameworkMBeanTest extends
Bundle bundleA = getBundleByName("org.apache.aries.jmx.test.bundlea");
Bundle bundleB = getBundleByName("org.apache.aries.jmx.test.bundleb");
- BundleWiring bw = bundleB.adapt(BundleWiring.class);
+ BundleWiring bw = (BundleWiring) bundleB.adapt(BundleWiring.class);
List<BundleWire> initialRequiredWires =
bw.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(1, initialRequiredWires.size());
@@ -314,11 +314,11 @@ public class FrameworkMBeanTest extends
addResourceToJar("org/apache/aries/jmx/test/bundlea/impl/A2.class",
jos, bundleA);
jos.close();
- assertEquals("Precondition", 1,
bundleA.adapt(BundleRevisions.class).getRevisions().size());
+ assertEquals("Precondition", 1, ((BundleRevisions)
bundleA.adapt(BundleRevisions.class)).getRevisions().size());
bundleA.update(new ByteArrayInputStream(baos.toByteArray()));
- assertEquals("There should be 2 revisions now", 2,
bundleA.adapt(BundleRevisions.class).getRevisions().size());
+ assertEquals("There should be 2 revisions now", 2, ((BundleRevisions)
bundleA.adapt(BundleRevisions.class)).getRevisions().size());
assertEquals("No refresh called, the bundle wiring for B should still
be the old one",
- bw, bundleB.adapt(BundleWiring.class));
+ bw, ((BundleWiring) bundleB.adapt(BundleWiring.class)));
FrameworkMBean framework = getMBean(FrameworkMBean.OBJECTNAME,
FrameworkMBean.class);
CompositeData result = framework.refreshBundlesAndWait(null);
@@ -326,7 +326,7 @@ public class FrameworkMBeanTest extends
assertTrue(completed.contains(bundleA.getBundleId()));
assertTrue(completed.contains(bundleB.getBundleId()));
- List<BundleWire> requiredWires =
bundleB.adapt(BundleWiring.class).getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
+ List<BundleWire> requiredWires = ((BundleWiring)
bundleB.adapt(BundleWiring.class)).getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
assertEquals(2, requiredWires.size());
List<String> imported = new ArrayList<String>();
for (BundleWire w : requiredWires) {
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java?rev=1600882&r1=1600881&r2=1600882&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
Fri Jun 6 13:29:58 2014
@@ -111,20 +111,20 @@ public class ServiceStateMBeanTest exten
// get services
- ServiceReference<?> refA =
bundleContext.getServiceReference(InterfaceA.class.getName());
+ ServiceReference refA =
bundleContext.getServiceReference(InterfaceA.class.getName());
assertNotNull(refA);
long serviceAId = (Long) refA.getProperty(Constants.SERVICE_ID);
assertTrue(serviceAId > -1);
- ServiceReference<?> refB =
bundleContext.getServiceReference(InterfaceB.class.getName());
+ ServiceReference refB =
bundleContext.getServiceReference(InterfaceB.class.getName());
assertNotNull(refB);
long serviceBId = (Long) refB.getProperty(Constants.SERVICE_ID);
assertTrue(serviceBId > -1);
- ServiceReference<?>[] refs =
bundleContext.getServiceReferences(ManagedServiceFactory.class.getName(), "(" +
Constants.SERVICE_PID + "=jmx.test.B.factory)");
+ ServiceReference[] refs =
bundleContext.getServiceReferences(ManagedServiceFactory.class.getName(), "(" +
Constants.SERVICE_PID + "=jmx.test.B.factory)");
assertNotNull(refs);
assertEquals(1, refs.length);
- ServiceReference<?> msf = refs[0];
+ ServiceReference msf = refs[0];
// getBundleIdentifier
@@ -156,7 +156,7 @@ public class ServiceStateMBeanTest exten
// listServices
- ServiceReference<?>[] allSvsRefs =
bundleContext.getAllServiceReferences(null, null);
+ ServiceReference[] allSvsRefs =
bundleContext.getAllServiceReferences(null, null);
TabularData allServices = mbean.listServices();
assertNotNull(allServices);
assertEquals(allSvsRefs.length, allServices.values().size());
@@ -218,7 +218,7 @@ public class ServiceStateMBeanTest exten
long[] idsWithout = mbean.getServiceIds();
String svc = "A String Service";
- ServiceRegistration<?> reg =
bundleContext.registerService(String.class.getName(), svc, null);
+ ServiceRegistration reg =
bundleContext.registerService(String.class.getName(), svc, null);
long id = (Long) reg.getReference().getProperty(Constants.SERVICE_ID);
long[] idsWith = new long[idsWithout.length + 1];
@@ -254,7 +254,7 @@ public class ServiceStateMBeanTest exten
@Test
public void testGetServiceIds() throws Exception {
- ServiceReference<?>[] allSvsRefs =
bundleContext.getAllServiceReferences(null, null);
+ ServiceReference[] allSvsRefs =
bundleContext.getAllServiceReferences(null, null);
long[] expectedServiceIds = new long[allSvsRefs.length];
for (int i=0; i < allSvsRefs.length; i++) {
expectedServiceIds[i] = (Long)
allSvsRefs[i].getProperty(Constants.SERVICE_ID);
@@ -268,7 +268,7 @@ public class ServiceStateMBeanTest exten
@Test
public void testGetServiceAndGetProperty() throws Exception {
- ServiceReference<InterfaceA> sref =
bundleContext.getServiceReference(InterfaceA.class);
+ ServiceReference sref =
bundleContext.getServiceReference(InterfaceA.class);
// Get service to increase service references
context().getService(sref);
Long serviceID = (Long) sref.getProperty(Constants.SERVICE_ID);
@@ -305,9 +305,9 @@ public class ServiceStateMBeanTest exten
@Test
@SuppressWarnings("unchecked")
public void testServicePropertiesInListServices() throws Exception {
- ServiceReference<?>[] refs =
bundleContext.getAllServiceReferences(InterfaceA.class.getName(), null);
+ ServiceReference[] refs =
bundleContext.getAllServiceReferences(InterfaceA.class.getName(), null);
assertEquals("Precondition", 1, refs.length);
- ServiceReference<?> ref = refs[0];
+ ServiceReference ref = refs[0];
TabularData svcTab = mbean.listServices();
CompositeData svcData = svcTab.get(new Object []
{ref.getProperty(Constants.SERVICE_ID)});
@@ -344,11 +344,11 @@ public class ServiceStateMBeanTest exten
@Test
public void testListServices() throws Exception {
String filter = "(" + Constants.SERVICE_PID + "=*)";
- ServiceReference<?>[] refs =
bundleContext.getAllServiceReferences(null, filter);
+ ServiceReference[] refs = bundleContext.getAllServiceReferences(null,
filter);
TabularData svcData = mbean.listServices(null, filter);
assertEquals(refs.length, svcData.size());
- ServiceReference<InterfaceA> sref =
bundleContext.getServiceReference(InterfaceA.class);
+ ServiceReference sref =
bundleContext.getServiceReference(InterfaceA.class);
TabularData svcTab = mbean.listServices(InterfaceA.class.getName(),
null);
assertEquals(1, svcTab.size());
CompositeData actualSvc = (CompositeData)
svcTab.values().iterator().next();
@@ -360,12 +360,12 @@ public class ServiceStateMBeanTest exten
@Test
public void testListServicesSelectiveItems() throws Exception {
String filter =
"(|(service.pid=org.apache.aries.jmx.test.ServiceB)(service.pid=jmx.test.B.factory))";
- ServiceReference<?>[] refs =
bundleContext.getAllServiceReferences(null, filter);
+ ServiceReference[] refs = bundleContext.getAllServiceReferences(null,
filter);
TabularData svcData = mbean.listServices(null, filter,
ServiceStateMBean.BUNDLE_IDENTIFIER);
assertEquals(refs.length, svcData.size());
long id = refs[0].getBundle().getBundleId();
- for (ServiceReference<?> ref : refs) {
+ for (ServiceReference ref : refs) {
assertEquals("Precondition", id, ref.getBundle().getBundleId());
}
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java?rev=1600882&r1=1600881&r2=1600882&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
Fri Jun 6 13:29:58 2014
@@ -87,7 +87,7 @@ public class BundleWiringStateMBeanTest
@Test
public void testGetCurrentRevisionDeclaredRequirements() throws Exception {
Bundle a = getBundleByName("org.apache.aries.jmx.test.bundlea");
- BundleRevision br = a.adapt(BundleRevision.class);
+ BundleRevision br = (BundleRevision) a.adapt(BundleRevision.class);
List<BundleRequirement> requirements =
br.getDeclaredRequirements(BundleRevision.PACKAGE_NAMESPACE);
CompositeData[] jmxRequirements =
brsMBean.getCurrentRevisionDeclaredRequirements(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
@@ -100,7 +100,7 @@ public class BundleWiringStateMBeanTest
@Test
public void testGetCurrentRevisionDeclaredCapabilities() throws Exception {
- BundleRevision br = bundleA.adapt(BundleRevision.class);
+ BundleRevision br = (BundleRevision)
bundleA.adapt(BundleRevision.class);
List<BundleCapability> capabilities =
br.getDeclaredCapabilities(BundleRevision.PACKAGE_NAMESPACE);
CompositeData[] jmxCapabilities =
brsMBean.getCurrentRevisionDeclaredCapabilities(bundleA.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
@@ -113,14 +113,14 @@ public class BundleWiringStateMBeanTest
@Test
public void testGetRevisionsDeclaredRequirements() throws Exception {
- BundleRevisions revisions = bundleA.adapt(BundleRevisions.class);
+ BundleRevisions revisions = (BundleRevisions)
bundleA.adapt(BundleRevisions.class);
Assert.assertEquals("Precondition", 1,
revisions.getRevisions().size());
TabularData jmxRequirementsTable =
brsMBean.getRevisionsDeclaredRequirements(bundleA.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
Assert.assertEquals(1, jmxRequirementsTable.size());
- List<BundleRequirement> requirements =
revisions.getRevisions().iterator().next().getDeclaredRequirements(BundleRevision.PACKAGE_NAMESPACE);
+ List<BundleRequirement> requirements = ((BundleRevision)
revisions.getRevisions().iterator().next()).getDeclaredRequirements(BundleRevision.PACKAGE_NAMESPACE);
CompositeData jmxRevRequirements = (CompositeData)
jmxRequirementsTable.values().iterator().next();
CompositeData[] jmxRequirements = (CompositeData[])
jmxRevRequirements.get(BundleWiringStateMBean.REQUIREMENTS);
@@ -131,14 +131,14 @@ public class BundleWiringStateMBeanTest
@Test
public void testGetRevisionsDeclaredCapabilities() throws Exception {
- BundleRevisions revisions = bundleA.adapt(BundleRevisions.class);
+ BundleRevisions revisions = (BundleRevisions)
bundleA.adapt(BundleRevisions.class);
Assert.assertEquals("Precondition", 1,
revisions.getRevisions().size());
TabularData jmxCapabilitiesTable =
brsMBean.getRevisionsDeclaredCapabilities(bundleA.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
Assert.assertEquals(1, jmxCapabilitiesTable.size());
- List<BundleCapability> capabilities =
revisions.getRevisions().iterator().next().getDeclaredCapabilities(BundleRevision.PACKAGE_NAMESPACE);
+ List<BundleCapability> capabilities = ((BundleRevision)
revisions.getRevisions().iterator().next()).getDeclaredCapabilities(BundleRevision.PACKAGE_NAMESPACE);
CompositeData jmxRevCapabilities = (CompositeData)
jmxCapabilitiesTable.values().iterator().next();
CompositeData[] jmxCapabilities = (CompositeData[])
jmxRevCapabilities.get(BundleWiringStateMBean.CAPABILITIES);
@@ -154,7 +154,7 @@ public class BundleWiringStateMBeanTest
Assert.assertEquals(BundleWiringStateMBean.BUNDLE_WIRING_TYPE,
jmxWiring.getCompositeType());
Assert.assertEquals(bundleA.getBundleId(),
jmxWiring.get(BundleWiringStateMBean.BUNDLE_ID));
- BundleWiring bw = bundleA.adapt(BundleWiring.class);
+ BundleWiring bw = (BundleWiring) bundleA.adapt(BundleWiring.class);
assertBundleWiring(bw, jmxWiring);
}
@@ -167,7 +167,7 @@ public class BundleWiringStateMBeanTest
Assert.assertEquals(BundleWiringStateMBean.BUNDLE_WIRING_TYPE,
jmxWiring.getCompositeType());
Assert.assertEquals(bundleA.getBundleId(),
jmxWiring.get(BundleWiringStateMBean.BUNDLE_ID));
- BundleWiring bw = bundleA.adapt(BundleWiring.class);
+ BundleWiring bw = (BundleWiring) bundleA.adapt(BundleWiring.class);
assertBundleWiring(bw, jmxWiring);
}
@@ -254,22 +254,22 @@ public class BundleWiringStateMBeanTest
TabularData jmxWiringClosure =
brsMBean.getCurrentWiringClosure(bundleA.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
CompositeData jmxWiringA = jmxWiringClosure.get(new Object []
{bundleA.getBundleId(), 0});
- assertBundleWiring(bundleA.adapt(BundleWiring.class), jmxWiringA);
+ assertBundleWiring((BundleWiring) bundleA.adapt(BundleWiring.class),
jmxWiringA);
Bundle b =
context().getBundleByName("org.apache.aries.jmx.test.bundleb");
int bRevID = findRevisionID(jmxWiringA, b);
CompositeData jmxWiringB = jmxWiringClosure.get(new Object []
{b.getBundleId(), bRevID});
- assertBundleWiring(b.adapt(BundleWiring.class), jmxWiringB);
+ assertBundleWiring((BundleWiring) b.adapt(BundleWiring.class),
jmxWiringB);
Bundle cm = context().getBundleByName("org.apache.felix.configadmin");
int cmRevID = findRevisionID(jmxWiringA, cm);
CompositeData jmxWiringCM = jmxWiringClosure.get(new Object []
{cm.getBundleId(), cmRevID});
- assertBundleWiring(cm.adapt(BundleWiring.class), jmxWiringCM);
+ assertBundleWiring((BundleWiring) cm.adapt(BundleWiring.class),
jmxWiringCM);
Bundle sb = context().getBundle(0);
int sbRevID = findRevisionID(jmxWiringA, sb);
CompositeData jmxWiringSB = jmxWiringClosure.get(new Object []
{sb.getBundleId(), sbRevID});
- assertBundleWiring(sb.adapt(BundleWiring.class), jmxWiringSB);
+ assertBundleWiring((BundleWiring) sb.adapt(BundleWiring.class),
jmxWiringSB);
}
@Test
@@ -277,22 +277,22 @@ public class BundleWiringStateMBeanTest
TabularData jmxWiringClosure =
brsMBean.getRevisionsWiringClosure(bundleA.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
CompositeData jmxWiringA = jmxWiringClosure.get(new Object []
{bundleA.getBundleId(), 0});
- assertBundleWiring(bundleA.adapt(BundleWiring.class), jmxWiringA);
+ assertBundleWiring((BundleWiring) bundleA.adapt(BundleWiring.class),
jmxWiringA);
Bundle b =
context().getBundleByName("org.apache.aries.jmx.test.bundleb");
int bRevID = findRevisionID(jmxWiringA, b);
CompositeData jmxWiringB = jmxWiringClosure.get(new Object []
{b.getBundleId(), bRevID});
- assertBundleWiring(b.adapt(BundleWiring.class), jmxWiringB);
+ assertBundleWiring((BundleWiring) b.adapt(BundleWiring.class),
jmxWiringB);
Bundle cm = context().getBundleByName("org.apache.felix.configadmin");
int cmRevID = findRevisionID(jmxWiringA, cm);
CompositeData jmxWiringCM = jmxWiringClosure.get(new Object []
{cm.getBundleId(), cmRevID});
- assertBundleWiring(cm.adapt(BundleWiring.class), jmxWiringCM);
+ assertBundleWiring((BundleWiring) cm.adapt(BundleWiring.class),
jmxWiringCM);
Bundle sb = context().getBundle(0);
int sbRevID = findRevisionID(jmxWiringA, sb);
CompositeData jmxWiringSB = jmxWiringClosure.get(new Object []
{sb.getBundleId(), sbRevID});
- assertBundleWiring(sb.adapt(BundleWiring.class), jmxWiringSB);
+ assertBundleWiring((BundleWiring) sb.adapt(BundleWiring.class),
jmxWiringSB);
}
private int findRevisionID(CompositeData jmxWiring, Bundle bundle) {
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=1600882&r1=1600881&r2=1600882&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
Fri Jun 6 13:29:58 2014
@@ -115,7 +115,7 @@ public class BlueprintMBeanTest extends
//find the Blueprint Sample bundle's container service id
String filter = "(&(osgi.blueprint.container.symbolicname=" // no
similar one in interfaces
+ sample.getSymbolicName() +
")(osgi.blueprint.container.version=" + sample.getVersion() + "))";
- ServiceReference<?>[] serviceReferences = null;
+ ServiceReference[] serviceReferences = null;
try {
serviceReferences =
bundleContext.getServiceReferences(BlueprintContainer.class.getName(), filter);
} catch (InvalidSyntaxException e) {
