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/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/IntentsResourceTest.java
index b2eee81..3289c87 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 @@
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 @@
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);
}