Fix buck tests
Change-Id: I3d681e6e5c1d3e98c87ccb3d20a619b216ae6133
diff --git a/web/api/BUCK b/web/api/BUCK
index bf2d6c3..2b1d0fb 100644
--- a/web/api/BUCK
+++ b/web/api/BUCK
@@ -13,7 +13,7 @@
]
TEST_DEPS = [
- '//lib:TEST',
+ '//lib:TEST_REST',
]
osgi_jar(
@@ -27,11 +27,15 @@
web_context = '/onos/v1'
)
+SOURCE_JAR = CURRENT_TARGET + '-jar'
java_test(
- name = 'tests',
+ name = 'onos-rest-tests',
srcs = glob([TEST + '/*.java']),
deps = COMPILE_DEPS +
TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
+ [SOURCE_JAR],
+ source_under_test = [SOURCE_JAR],
+ visibility = ['PUBLIC'],
+ resources_root = 'src/test/resources',
+ resources = glob(['src/test/resources/**']),
)
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
index 16abe70..a52d72e 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
@@ -15,10 +15,17 @@
*/
package org.onosproject.rest.resources;
-import com.eclipsesource.json.Json;
-import com.eclipsesource.json.JsonArray;
-import com.eclipsesource.json.JsonObject;
-import com.eclipsesource.json.JsonValue;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.util.Collections;
+import java.util.HashSet;
+
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
import org.hamcrest.Description;
import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeMatcher;
@@ -40,17 +47,11 @@
import org.onosproject.net.intent.IntentService;
import org.onosproject.net.intent.IntentState;
import org.onosproject.net.intent.Key;
-import org.onosproject.net.intent.MockIdGenerator;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.util.Collections;
-import java.util.HashSet;
+import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonArray;
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonValue;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
@@ -65,6 +66,7 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.onosproject.net.intent.IntentTestsMocks.MockIntent;
+import static org.onosproject.net.intent.MockIdGenerator.bindNewGenerator;
/**
* Unit tests for Intents REST APIs.
@@ -255,8 +257,7 @@
BaseResource.setServiceDirectory(testDirectory);
- mockGenerator = new MockIdGenerator();
- Intent.bindIdGenerator(mockGenerator);
+ bindNewGenerator();
}
/**
@@ -265,7 +266,6 @@
@After
public void tearDownTest() {
verify(mockIntentService);
- Intent.unbindIdGenerator(mockGenerator);
}
/**
@@ -456,7 +456,7 @@
WebTarget wt = target();
Response response = wt.path("intents/app/0x2")
- .request(MediaType.APPLICATION_JSON_TYPE)
+ .request(MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN)
.delete();
assertThat(response.getStatus(), is(HttpURLConnection.HTTP_NO_CONTENT));
}
@@ -484,7 +484,7 @@
WebTarget wt = target();
Response response = wt.path("intents/app/0x2")
- .request(MediaType.APPLICATION_JSON_TYPE)
+ .request(MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN)
.delete();
assertThat(response.getStatus(), is(HttpURLConnection.HTTP_NO_CONTENT));
}
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
index 465f25c..7a93eac 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/ResourceTest.java
@@ -36,6 +36,14 @@
}
/**
+ * Creates a new web-resource test.
+ */
+ public ResourceTest(ResourceConfig config) {
+ super(config);
+ this.set("jersey.config.test.container.port", getRandomPort(DEFAULT_PORT));
+ }
+
+ /**
* Returns an unused port number to make sure that each unit test runs in
* different port number.
*