Repository: aries-rsa Updated Branches: refs/heads/master 0eb4af938 -> 54df28a3c
Improve test Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/54df28a3 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/54df28a3 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/54df28a3 Branch: refs/heads/master Commit: 54df28a3c4ccb56258c396df41c9745e5d37ad83 Parents: 0eb4af9 Author: Christian Schneider <[email protected]> Authored: Tue Mar 15 13:41:03 2016 +0100 Committer: Christian Schneider <[email protected]> Committed: Tue Mar 15 13:41:03 2016 +0100 ---------------------------------------------------------------------- .../rsa/topologymanager/ActivatorTest.java | 24 ++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/54df28a3/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/ActivatorTest.java ---------------------------------------------------------------------- diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/ActivatorTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/ActivatorTest.java index e4b1bbd..7d4eb45 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/ActivatorTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/ActivatorTest.java @@ -18,6 +18,12 @@ */ package org.apache.aries.rsa.topologymanager; +import static org.easymock.EasyMock.createNiceControl; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.isA; +import static org.easymock.EasyMock.newCapture; + import org.apache.aries.rsa.topologymanager.exporter.DefaultExportPolicy; import org.apache.aries.rsa.topologymanager.exporter.TopologyManagerExport; import org.easymock.Capture; @@ -35,14 +41,14 @@ import org.osgi.framework.ServiceReference; public class ActivatorTest { @Test - public void testStart() throws Exception { - IMocksControl c = EasyMock.createNiceControl(); + public void testDoStart() throws Exception { + IMocksControl c = createNiceControl(); BundleContext context = c.createMock(BundleContext.class); - EasyMock.expect(context.getProperty(Constants.FRAMEWORK_UUID)).andReturn("myid"); - context.addServiceListener(EasyMock.isA(TopologyManagerExport.class)); - EasyMock.expectLastCall(); - final Capture<String> filter = EasyMock.newCapture(); - EasyMock.expect(context.createFilter(EasyMock.capture(filter))) + expect(context.getProperty(Constants.FRAMEWORK_UUID)).andReturn("myid"); + context.addServiceListener(isA(TopologyManagerExport.class)); + expectLastCall(); + final Capture<String> filter = newCapture(); + expect(context.createFilter(EasyMock.capture(filter))) .andAnswer(new IAnswer<Filter>() { public Filter answer() throws Throwable { return FrameworkUtil.createFilter(filter.getValue()); @@ -50,8 +56,8 @@ public class ActivatorTest { }).times(2); ServiceReference<?> sref = c.createMock(ServiceReference.class); Bundle bundle = c.createMock(Bundle.class); - EasyMock.expect(sref.getBundle()).andReturn(bundle).anyTimes(); - EasyMock.expect(context.getServiceReferences((String)null, Activator.DOSGI_SERVICES)) + expect(sref.getBundle()).andReturn(bundle).anyTimes(); + expect(context.getServiceReferences((String)null, Activator.DOSGI_SERVICES)) .andReturn(new ServiceReference[]{sref}); c.replay();
