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
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 e05cbe3..fc28624 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 @@
* 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 @@
/**
* 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);
}