From 01e4d41effd9d049e033d4e0c0b657c50169ae65 Mon Sep 17 00:00:00 2001 From: Johannes Utzig Date: Tue, 30 May 2017 11:17:21 +0200 Subject: [PATCH] fixed topology manager expor test --- .../exporter/TopologyManagerExportTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java index f0de808fc..2d3b68f60 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExportTest.java @@ -186,10 +186,16 @@ private ServiceReference createUserService(IMocksControl c) { } private ServiceReference createUserService(IMocksControl c, Object exportedInterfaces) { - final ServiceReference sref = c.createMock(ServiceReference.class); + final ServiceReference sref = c.createMock(ServiceReference.class); EasyMock.expect(sref.getProperty(EasyMock.same(RemoteConstants.SERVICE_EXPORTED_INTERFACES))) .andReturn(exportedInterfaces).anyTimes(); Bundle srefBundle = c.createMock(Bundle.class); + BundleContext srefContext = c.createMock(BundleContext.class); + EasyMock.expect(srefBundle.getState()).andReturn(Bundle.ACTIVE).anyTimes(); + EasyMock.expect(srefBundle.getBundleContext()).andReturn(srefContext).anyTimes(); + Object serviceInstance = new Object(); + EasyMock.expect(srefContext.getService(sref)).andReturn(serviceInstance).anyTimes(); + EasyMock.expect(srefContext.ungetService(sref)).andReturn(true).anyTimes(); if(!"".equals(exportedInterfaces)) { EasyMock.expect(sref.getBundle()).andReturn(srefBundle).atLeastOnce(); EasyMock.expect(srefBundle.getSymbolicName()).andReturn("serviceBundleName").atLeastOnce();