X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FDcaeLocationResourceTest.java;fp=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresource%2FDcaeLocationResourceTest.java;h=31faa38a4dd33792de1b41d5dcac0070d3df6838;hp=dd2525f5e46361e955464cdd4378f4e46ee73279;hb=d5d37c0477744cbaa6a9d9fc690c0dafbb2d1868;hpb=bc9afa1b8ff000d7178dfa2f582775fc2a6613a3

diff --git a/src/test/java/org/onap/dmaap/dbcapi/resource/DcaeLocationResourceTest.java b/src/test/java/org/onap/dmaap/dbcapi/resources/DcaeLocationResourceTest.java
similarity index 59%
rename from src/test/java/org/onap/dmaap/dbcapi/resource/DcaeLocationResourceTest.java
rename to src/test/java/org/onap/dmaap/dbcapi/resources/DcaeLocationResourceTest.java
index dd2525f..31faa38 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/resource/DcaeLocationResourceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/resources/DcaeLocationResourceTest.java
@@ -18,8 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 package org.onap.dmaap.dbcapi.resources;
+
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.service.*;
+import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
+
 import static org.junit.Assert.*;
 
 import org.junit.After;
@@ -76,13 +79,52 @@ public class DcaeLocationResourceTest extends JerseyTest {
 		Entity<DcaeLocation> reqEntity = Entity.entity( loc, MediaType.APPLICATION_JSON );
 		Response resp = target( "dcaeLocations").request().post( reqEntity, Response.class );
 		System.out.println( "POST dcaeLocation resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
-		assertTrue( resp.getStatus() == 201 );
+		if ( resp.getStatus() != 409 ) {
+			assertTrue( resp.getStatus() == 201 );
+		}
+		
+		resp = target( "dcaeLocations").
+				path( loc.getDcaeLocationName()).request().get( Response.class );
+		System.out.println( "GET feed resp=" + resp.getStatus() );
+
+		assertTrue( resp.getStatus() == 200 );
 	}
 
 	@Test
 	public void PutTest() {
+		DcaeLocation loc = factory.genDcaeLocation( "edge" );
+		Entity<DcaeLocation> reqEntity = Entity.entity( loc, MediaType.APPLICATION_JSON );
+		Response resp = target( "dcaeLocations").request().post( reqEntity, Response.class );
+		System.out.println( "POST dcaeLocation resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		if ( resp.getStatus() != 409 ) {
+			assertTrue( resp.getStatus() == 201 );
+		}
+
+		
+		loc.setClli("ATLCTYNJ9999");
+		reqEntity = Entity.entity( loc, MediaType.APPLICATION_JSON );
+		resp = target( "dcaeLocations").
+				path( loc.getDcaeLocationName()).request().put( reqEntity, Response.class );
+		System.out.println( "PUT dcaeLocation resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		assertTrue( resp.getStatus() == 201 );
+		
 	}
 
+	@Test
+	public void DelTest() {
+		DcaeLocation loc = factory.genDcaeLocation( "edge" );
+		Entity<DcaeLocation> reqEntity = Entity.entity( loc, MediaType.APPLICATION_JSON );
+		Response resp = target( "dcaeLocations").request().post( reqEntity, Response.class );
+		System.out.println( "POST dcaeLocation resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		if ( resp.getStatus() != 409 ) {
+			assertTrue( resp.getStatus() == 201 );
+		}
+		
+		resp = target( "dcaeLocations").
+				path( loc.getDcaeLocationName()).request().delete( Response.class );
+		System.out.println( "DELETE dcaeLocation resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		assertTrue( resp.getStatus() == 204 );
+	}