X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FMR_ClusterResourceTest.java;fp=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresource%2FMR_ClusterResourceTest.java;h=7a57794fd2ff272cccbb20f3ab21a188674f3fea;hb=refs%2Fchanges%2F01%2F35301%2F2;hp=1f78c3fd3568f69c3448c8b2ac53f2f033a3928f;hpb=bc9afa1b8ff000d7178dfa2f582775fc2a6613a3;p=dmaap%2Fdbcapi.git

diff --git a/src/test/java/org/onap/dmaap/dbcapi/resource/MR_ClusterResourceTest.java b/src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
similarity index 61%
rename from src/test/java/org/onap/dmaap/dbcapi/resource/MR_ClusterResourceTest.java
rename to src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
index 1f78c3f..7a57794 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/resource/MR_ClusterResourceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResourceTest.java
@@ -18,24 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 package org.onap.dmaap.dbcapi.resources;
-import org.onap.dmaap.dbcapi.model.*;
-import org.onap.dmaap.dbcapi.service.*;
-import static org.junit.Assert.*;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import java.util.*;
-import java.sql.*;
+import static org.junit.Assert.assertTrue;
 
-import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.server.ResourceConfig;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.Path;
-import javax.ws.rs.GET;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Test;
+import org.onap.dmaap.dbcapi.model.DcaeLocation;
+import org.onap.dmaap.dbcapi.model.MR_Cluster;
+import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
 
 
 public class MR_ClusterResourceTest extends JerseyTest {
@@ -44,7 +40,10 @@ public class MR_ClusterResourceTest extends JerseyTest {
 
 	@Override
 	protected Application configure() {
-		return new ResourceConfig( MR_ClusterResource.class );
+
+		return new ResourceConfig()
+				.register( MR_ClusterResource.class )
+				.register( DcaeLocationResource.class );
 	}
 
 	private static final String  fmt = "%24s: %s%n";
@@ -75,29 +74,41 @@ public class MR_ClusterResourceTest extends JerseyTest {
 		Entity<MR_Cluster> reqEntity = Entity.entity( cluster, MediaType.APPLICATION_JSON );
 		Response resp = target( "mr_clusters").request().post( reqEntity, Response.class );
 		System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
-		assertTrue( resp.getStatus() == 201 );
+		if (resp.getStatus() != 409 ) {
+			assertTrue( resp.getStatus() == 201);
+		}
+		resp = target( "mr_clusters").
+				path( cluster.getDcaeLocationName()).request().get( Response.class );
+		System.out.println( "GET MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+	
+		assertTrue( resp.getStatus() >= 200 && resp.getStatus() < 300 );
+		
 	}
 
 	@Test
 	public void PutTest() {
-/*
+
 		try {
 			DcaeLocation loc = factory.genDcaeLocation( "central" );
 			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 );
+			}
 		} catch (Exception e ) {
 		}
-*/
+		
 		String h[] = {"host4", "host5", "host6" };
-		MR_Cluster cluster = factory.genMR_Cluster( "edge" );
+		MR_Cluster cluster = factory.genMR_Cluster( "central" );
 		Entity<MR_Cluster> reqEntity = Entity.entity( cluster, MediaType.APPLICATION_JSON );
 		Response resp = target( "mr_clusters").request().post( reqEntity, Response.class );
 
 		// first, add it 
 		System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
-		assertTrue( resp.getStatus() == 201 );
+		if( resp.getStatus() != 409 ) {
+			assertTrue( resp.getStatus() == 200 );
+		}
 
 		// now change a field
 		cluster.setHosts( h );
@@ -105,11 +116,11 @@ public class MR_ClusterResourceTest extends JerseyTest {
 
 		// update with incorrect key
 		resp = target( "mr_clusters")
-					.path( cluster.getFqdn())
+					.path( cluster.getDcaeLocationName())
 					.request()
 					.put( reqEntity, Response.class );
 		System.out.println( "PUT MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity(String.class));
-		assertTrue( resp.getStatus() == 404 );
+		assertTrue( resp.getStatus() == 200 );
 
 		// update with correct key
 		resp = target( "mr_clusters")
@@ -120,6 +131,49 @@ public class MR_ClusterResourceTest extends JerseyTest {
 		assertTrue( resp.getStatus() == 200 );
 	}
 
+	@Test
+	public void DelTest() {
+
+		try {
+			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 );
+			}
+		} catch (Exception e ) {
+		}
+		
+
+		MR_Cluster cluster = factory.genMR_Cluster( "edge" );
+
+		Response resp = target( "mr_clusters").
+				path( cluster.getDcaeLocationName()).
+				request().
+				delete( Response.class );
+
+		// confirm cluster is not there 
+		System.out.println( "DELETE MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		assertTrue( resp.getStatus() == 404 );
+		
+		// now, add it
+		Entity<MR_Cluster> reqEntity = Entity.entity( cluster, MediaType.APPLICATION_JSON );
+		 resp = target( "mr_clusters").request().post( reqEntity, Response.class );
+
+		
+		System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		assertTrue( resp.getStatus() == 201 );
+	
+		// now really delete it 
+		 resp = target( "mr_clusters").
+				path( cluster.getDcaeLocationName()).
+				request().
+				delete( Response.class );
+		System.out.println( "DELETE MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
+		assertTrue( resp.getStatus() == 204 );
+
+	}