From ed0b1663ab85f23f0ac785cf429c1803eb83a02c Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Thu, 5 Feb 2015 09:34:29 -0800 Subject: [PATCH] Fix tests that were hiding the setUp() mthod in the JerseyTest framework REST API tests were defining a set up method called setUp(), which had the unwanted side effect of hinding the parent class' implementation. Made the set up and tear down methods for the tests have unique names so both will be executed. Also fixed some javadocs while editing the files. Change-Id: Ifaa75fe650d5909b066769e5e12cb5c834267a20 --- .../rest/ApplicationsResourceTest.java | 16 ++++++++++------ .../onosproject/rest/DevicesResourceTest.java | 13 ++++++++----- .../org/onosproject/rest/FlowsResourceTest.java | 7 ++----- .../org/onosproject/rest/HostResourceTest.java | 11 ++++++++--- .../onosproject/rest/IntentsResourceTest.java | 11 ++++++++--- .../org/onosproject/rest/LinksResourceTest.java | 12 ++++++++---- .../org/onosproject/rest/PathsResourceTest.java | 11 ++++++++--- .../onosproject/rest/TopologyResourceTest.java | 2 +- 8 files changed, 53 insertions(+), 30 deletions(-) diff --git a/web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java index d7ace4d723..81db631973 100644 --- a/web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/ApplicationsResourceTest.java @@ -99,7 +99,7 @@ public class ApplicationsResourceTest extends ResourceTest { ImmutableList.of("My Feature")); /** - * Hamcrest matcher to check that an device representation in JSON matches + * Hamcrest matcher to check that an application representation in JSON matches * the actual device. */ private static class AppJsonMatcher extends TypeSafeMatcher { @@ -143,7 +143,7 @@ public class ApplicationsResourceTest extends ResourceTest { } /** - * Factory to allocate an device matcher. + * Factory to allocate an application matcher. * * @param app application object we are looking for * @return matcher @@ -152,10 +152,11 @@ public class ApplicationsResourceTest extends ResourceTest { return new AppJsonMatcher(app); } - - @Override + /** + * Initializes test mocks and environment. + */ @Before - public void setUp() { + public void setUpMocks() { service = createMock(ApplicationAdminService.class); expect(service.getId("one")) @@ -190,8 +191,11 @@ public class ApplicationsResourceTest extends ResourceTest { BaseResource.setServiceDirectory(testDirectory); } + /** + * Verifies test mocks. + */ @After - public void shutDown() { + public void tearDownMocks() { verify(service); } diff --git a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java b/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java index 722665e43f..93dc04c151 100644 --- a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java @@ -206,8 +206,11 @@ public class DevicesResourceTest extends ResourceTest { return new DeviceJsonArrayMatcher(device); } + /** + * Initializes test mocks and environment. + */ @Before - public void setUp() { + public void setUpMocks() { mockDeviceService = createMock(DeviceService.class); expect(mockDeviceService.isAvailable(isA(DeviceId.class))) @@ -226,13 +229,13 @@ public class DevicesResourceTest extends ResourceTest { .add(CodecService.class, codecService); BaseResource.setServiceDirectory(testDirectory); - - } + /** + * Verifies test mocks. + */ @After - public void tearDown() throws Exception { - super.tearDown(); + public void tearDownMocks() { verify(mockDeviceService); } diff --git a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java index e05cbe3d2d..fc28624d8e 100644 --- a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java @@ -232,7 +232,7 @@ public class FlowsResourceTest extends ResourceTest { * Sets up the global values for all the tests. */ @Before - public void setUp() { + public void setUpTest() { // Mock device service expect(mockDeviceService.getDevice(deviceId1)) .andReturn(device1); @@ -255,12 +255,9 @@ public class FlowsResourceTest extends ResourceTest { /** * Cleans up and verifies the mocks. - * - * @throws Exception if the super teardown fails. */ @After - public void tearDown() throws Exception { - super.tearDown(); + public void tearDownTest() { verify(mockFlowService); } diff --git a/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java b/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java index 2d9cdeb6db..a5c4b77acf 100644 --- a/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/HostResourceTest.java @@ -67,8 +67,11 @@ public class HostResourceTest extends ResourceTest { final HostService mockHostService = createMock(HostService.class); final HashSet hosts = new HashSet<>(); + /** + * Initializes test mocks and environment. + */ @Before - public void setUp() { + public void setUpTest() { expect(mockHostService.getHosts()).andReturn(hosts).anyTimes(); // Register the services needed for the test @@ -82,9 +85,11 @@ public class HostResourceTest extends ResourceTest { BaseResource.setServiceDirectory(testDirectory); } + /** + * Verifies mocks. + */ @After - public void tearDown() throws Exception { - super.tearDown(); + public void tearDownTest() { verify(mockHostService); } diff --git a/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java index b2eee81e66..3289c87301 100644 --- a/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java @@ -252,8 +252,11 @@ public class IntentsResourceTest extends ResourceTest { return new IntentJsonArrayMatcher(intent); } + /** + * Initializes test mocks and environment. + */ @Before - public void setUp() { + public void setUpTest() { expect(mockIntentService.getIntents()).andReturn(intents).anyTimes(); // Register the services needed for the test @@ -270,9 +273,11 @@ public class IntentsResourceTest extends ResourceTest { Intent.bindIdGenerator(mockGenerator); } + /** + * Tears down and verifies test mocks and environment. + */ @After - public void tearDown() throws Exception { - super.tearDown(); + public void tearDownTest() { verify(mockIntentService); Intent.unbindIdGenerator(mockGenerator); } diff --git a/web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java b/web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java index 274a8f2247..c62199cd9c 100644 --- a/web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/LinksResourceTest.java @@ -151,9 +151,11 @@ public class LinksResourceTest extends ResourceTest { return new LinkJsonArrayMatcher(link); } - + /** + * Initializes test mocks and environment. + */ @Before - public void setUp() { + public void setUpTest() { mockLinkService = createMock(LinkService.class); // Register the services needed for the test @@ -167,9 +169,11 @@ public class LinksResourceTest extends ResourceTest { BaseResource.setServiceDirectory(testDirectory); } + /** + * Tears down and verifies test mocks and environment. + */ @After - public void tearDown() throws Exception { - super.tearDown(); + public void tearDownTest() { verify(mockLinkService); } diff --git a/web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java index 2cdd23e88b..19b5f2ada8 100644 --- a/web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/PathsResourceTest.java @@ -129,8 +129,11 @@ public class PathsResourceTest extends ResourceTest { return new PathJsonMatcher(path); } + /** + * Initializes test mocks and environment. + */ @Before - public void setUp() { + public void setUpTest() { // Register the services needed for the test CodecManager codecService = new CodecManager(); @@ -143,9 +146,11 @@ public class PathsResourceTest extends ResourceTest { BaseResource.setServiceDirectory(testDirectory); } + /** + * Tears down test mocks and environment. + */ @After - public void tearDown() throws Exception { - super.tearDown(); + public void tearDownTest() { verify(mockPathService); } diff --git a/web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java b/web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java index d25fd59b13..b7bd0d56d1 100644 --- a/web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java +++ b/web/api/src/test/java/org/onosproject/rest/TopologyResourceTest.java @@ -175,7 +175,7 @@ public class TopologyResourceTest extends ResourceTest { * Initializes the test harness. */ @Before - public void setUp() { + public void setUpTest() { TopologyService topologyService = new MockTopologyService(); CodecManager codecService = new CodecManager(); codecService.activate();