Code Review
/
dmaap
/
buscontroller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DMAAP-BC] Avoid Creating duplicate DR Publisher, Subscriber"
[dmaap/buscontroller.git]
/
dmaap-bc
/
src
/
test
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
resources
/
DmaapResourceTest.java
diff --git
a/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/DmaapResourceTest.java
b/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/DmaapResourceTest.java
index
29ccb40
..
70acac3
100644
(file)
--- a/
dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/DmaapResourceTest.java
+++ b/
dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/DmaapResourceTest.java
@@
-27,6
+27,7
@@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import javax.ws.rs.core.Response;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.dmaap.dbcapi.model.Dmaap;
import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
import org.junit.Test;
import org.onap.dmaap.dbcapi.model.Dmaap;
import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
@@
-36,28
+37,16
@@
public class DmaapResourceTest extends JerseyTest {
static DmaapObjectFactory factory = new DmaapObjectFactory();
static DmaapObjectFactory factory = new DmaapObjectFactory();
+ @BeforeClass
+ public static void setUpClass(){
+ System.setProperty("ConfigFile", "src/test/resources/dmaapbc.properties");
+ }
+
@Override
protected Application configure() {
return new ResourceConfig( DmaapResource.class );
@Override
protected Application configure() {
return new ResourceConfig( DmaapResource.class );
- //return new ResourceConfig( HelloResource.class );
}
}
- private static final String fmt = "%24s: %s%n";
-
-
-
-/* may conflict with test framework!
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-*/
-
-
-
@Test
public void GetTest() {
Response resp = target( "dmaap").request().get( Response.class );
@Test
public void GetTest() {
Response resp = target( "dmaap").request().get( Response.class );