1 files changed, 11 insertions, 53 deletions

diff --git a/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/FeedResourceTest.java b/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/FeedResourceTest.java
index 89dca8a..c15d8ae 100644
--- a/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/FeedResourceTest.java
+++ b/dmaap-bc/src/test/java/org/onap/dmaap/dbcapi/resources/FeedResourceTest.java
@@ -18,49 +18,30 @@
  * ============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 static org.junit.Assert.assertTrue;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import java.util.*;
-import java.sql.*;
-
-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.BeforeClass;
+import org.junit.Test;
+import org.onap.dmaap.dbcapi.model.Feed;
 
 
 public class FeedResourceTest extends JerseyTest {
 
+	@BeforeClass
+	public static void setUpClass(){
+		System.setProperty("ConfigFile", "src/test/resources/dmaapbc.properties");
+	}
 	@Override
 	protected Application configure() {
 		return new ResourceConfig( FeedResource.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( "feeds").request().get( Response.class );
@@ -77,28 +58,5 @@ public class FeedResourceTest extends JerseyTest {
 		assertTrue( resp.getStatus() == 200 );
 	}
 
-/*
-	@Test
-	public void PutTest() {
-		
-		Feed feed = new Feed( "aPutTest", "1.0", "a unit test", "dgl", "unrestricted" );
-		Entity<Feed> reqEntity = Entity.entity( feed, MediaType.APPLICATION_JSON );
-		Response resp = target( "feeds").request().post( reqEntity, Response.class );
-		System.out.println( "POST feed resp=" + resp.getStatus() );
-		String postResp = resp.readEntity( String.class );
-		System.out.println( "postResp=" + postResp );
-		Feed rFeed = new Feed( postResp );  getting a null pointer here
-		rFeed.setSuspended( true );
-		String target = new String ("feeds/" + rFeed.getFeedId() );
-		System.out.println( "PUT feed target=" + target );
-		reqEntity = Entity.entity( rFeed, MediaType.APPLICATION_JSON );
-		resp = target( target ).request().put( reqEntity, Response.class );
-		System.out.println( "PUT feed resp=" + resp.getStatus() );
-		assertTrue( resp.getStatus() == 200 );
-	}
-*/
-
-
-
 }