fix user api tests

2 files changed, 3 insertions, 52 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java b/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
index d2ecc43..b059dc6 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
@@ -14,17 +14,13 @@
  */
 package org.fedoraproject.candlepin.api;
 
-import org.fedoraproject.candlepin.model.BaseModel;
-import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.User;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
-import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -36,12 +32,7 @@ import javax.ws.rs.core.MediaType;
  */
 @Path("/user")
 public class UserApi extends BaseApi {
-    private static JsonTestObject jto = null;
-    
-    public UserApi() {
-        System.out.println("hello from ctor");
-    }
-    
+
     @GET @Path("/{login}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public User get(@PathParam("login") String login) {
@@ -65,23 +56,5 @@ public class UserApi extends BaseApi {
             users.add((User) o);
         }
         return users;
-    }
-    
-    @GET @Path("/testobject")
-    @Produces(MediaType.APPLICATION_JSON)
-    public JsonTestObject returnJsonObject() {
-        return jto;
-    }
-    
-    @POST @Path("/createtestobject")
-    @Consumes(MediaType.APPLICATION_JSON)
-    public void createJsonTestObject(JsonTestObject obj) {
-        jto = obj;
-        if (obj == null) {
-            throw new RuntimeException("obj is null");
-        }
-        System.out.println("object.name:" + obj.getName());
-        System.out.println("jto.name:" + jto.getName());
-    }
-    
+    }   
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
index 3ef7986..6d4395f 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/test/UserApiTest.java
@@ -15,13 +15,8 @@
 package org.fedoraproject.candlepin.api.test;
 
 import org.fedoraproject.candlepin.api.UserApi;
-import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.model.User;
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.representation.Form;
 
 import junit.framework.TestCase;
@@ -33,24 +28,7 @@ import junit.framework.TestCase;
  */
 public class UserApiTest extends TestCase {
     private UserApi api = new UserApi();
-    
-    public void testJson() {
-        ClientConfig cc = new DefaultClientConfig();
-        Client c = Client.create(cc);
-        
-        WebResource r1 = c.resource("http://localhost:8080/candlepin/user/testobject");
-        JsonTestObject jto = new JsonTestObject();
-        jto.setName("rhim");
-        jto.setUuid("joprsucks");
-        WebResource r = c.resource("http://localhost:8080/candlepin/user/createtestobject");
-        r.accept("application/json").type("application/json").post(jto);
-        
-        System.out.println(jto.getName());
-        jto = r1.accept("application/json").get(JsonTestObject.class);
-        assertEquals("rhim", jto.getName());
-        assertEquals("joprsucks", jto.getUuid());
-    }
-    
+   
     public void testNewUser() {
         Form f = new Form();
         f.add("login", "candlepin");