Fix unit tests

16 files changed, 109 insertions, 129 deletions

diff --git a/proxy/code/scripts/test-consumerapi.py b/proxy/code/scripts/test-consumerapi.py
index 123f962..5249b77 100755
--- a/proxy/code/scripts/test-consumerapi.py
+++ b/proxy/code/scripts/test-consumerapi.py
@@ -34,5 +34,10 @@ response = urllib.urlopen('http://localhost:8080/candlepin/consumer/info')
 rsp = response.read()
 print("get info: %s" % rsp)
 
-{
-}
+#print("delete consumer")
+#conn = httplib.HTTPConnection("localhost", 8080)
+#conn.request("DELETE", '/candlepin/consumer/')
+#response = conn.getresponse()
+#
+#print("Status: %d Response: %s" % (response.status, response.reason))
+#conn.close()
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
index 1da0e91..38a0192 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/Consumer.java
@@ -162,7 +162,7 @@ public class Consumer extends BaseModel {
      */
     public void setMetadataField(String name, String value) {
         if (this.getInfo().getMetadata() == null) {
-            this.getInfo().setMetadata(new HashMap());
+            this.getInfo().setMetadata(new HashMap<String,String>());
         }
         this.getInfo().getMetadata().put(name, value);
     }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
index ff6fc6b..f69755b 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ConsumerType.java
@@ -23,7 +23,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class ConsumerType extends BaseModel {
 
     private String label;
-    
+
+    /**
+     * default noarg ctor
+     */
+    public ConsumerType() {
+        label = null;
+    }
+
     /**
      * ConsumerType constructor with label
      * @param labelIn to set
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
index 0bf6569..e9fee23 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
@@ -14,9 +14,10 @@
  */
 package org.fedoraproject.candlepin.model;
 
-import org.apache.log4j.Logger;
 import org.fedoraproject.candlepin.util.MethodUtil;
 
+import org.apache.log4j.Logger;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -153,6 +154,4 @@ public class ObjectFactory {
         List typelist = (List) objects.get(key);
         typelist.remove(removeMe);
     }
-    
-
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
index 129908a..1dda9d8 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
@@ -39,7 +39,8 @@ public class ObjectFactoryTest extends TestCase {
     
     public void testListObjectsByClass() {
         List<Object> l = ObjectFactory.get().listObjectsByClass(Object.class);
-        assertNull(l);
+        assertNotNull(l);
+        assertTrue(l.isEmpty());
         
         l = ObjectFactory.get().listObjectsByClass(Owner.class);
         assertNotNull(l);
@@ -52,7 +53,8 @@ public class ObjectFactoryTest extends TestCase {
     public void testStore() {
         // make sure we don't have one stored already
         List<Object> list = ObjectFactory.get().listObjectsByClass(Long.class);
-        assertNull(list);
+        assertNotNull(list);
+        assertTrue(list.isEmpty());
         
         Long l = new Long(10);
         ObjectFactory.get().store(l);
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java
index aa9fb14..4c240f3 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ApiHandler.java
@@ -1,11 +1,12 @@
 package org.fedoraproject.candlepin.resource;
 
-import org.apache.log4j.Logger;
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.User;
 
+import org.apache.log4j.Logger;
+
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
index e671dec..e2eef54 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/BaseResource.java
@@ -14,19 +14,13 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import com.sun.jersey.api.representation.Form;
-
-import org.apache.log4j.Logger;
 import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
-import org.fedoraproject.candlepin.util.MethodUtil;
 
-import java.util.Iterator;
+import org.apache.log4j.Logger;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 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;
@@ -59,33 +53,32 @@ public abstract class BaseResource {
 //    @POST
 //    @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_FORM_URLENCODED})
 //    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Object create(Form form) {
-        String newuuid = BaseModel.generateUUID();
-        Object args[] = new Object[1];
-        args[0] = newuuid;
-        BaseModel newobject = (BaseModel) 
-            MethodUtil.callNewMethod(getApiClass().getName(), args);
-        Iterator i = form.keySet().iterator();
-        while (i.hasNext()) {
-            String key = (String) i.next();
-            String value = form.getFirst(key); 
-            log.debug("value : " + value);
-            MethodUtil.callSetter(newobject, key, value);
-        }
-        if (log.isDebugEnabled()) {
-            log.debug("before store name: " + newobject.getName());
-            log.debug("before store uuid: " + newobject.getUuid());
-        }
-        return ObjectFactory.get().store(newobject);
-    }
+//    public Object create(Form form) {
+//        String newuuid = BaseModel.generateUUID();
+//        Object args[] = new Object[1];
+//        args[0] = newuuid;
+//        BaseModel newobject = (BaseModel) 
+//            MethodUtil.callNewMethod(getApiClass().getName(), args);
+//        Iterator i = form.keySet().iterator();
+//        while (i.hasNext()) {
+//            String key = (String) i.next();
+//            String value = form.getFirst(key); 
+//            log.debug("value : " + value);
+//            MethodUtil.callSetter(newobject, key, value);
+//        }
+//        if (log.isDebugEnabled()) {
+//            log.debug("before store name: " + newobject.getName());
+//            log.debug("before store uuid: " + newobject.getUuid());
+//        }
+//        return ObjectFactory.get().store(newobject);
+//    }
 
     
-    @DELETE
-    @Consumes({MediaType.APPLICATION_JSON})
-    public void delete(BaseModel object) {
-        log.debug("Delete called: " + object);
-        ObjectFactory.get().delete(getApiClass(), object);
-        log.debug("Deleted.");
+    @DELETE @Path("/{uuid}")
+    public void delete(String uuid) {
+        System.out.println("Delete called: " + uuid);
+        BaseModel obj = ObjectFactory.get().lookupByUUID(getApiClass(), uuid);
+        ObjectFactory.get().delete(getApiClass(), obj);
     }
     
     protected Class getApiClass() {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
index 54f5577..ea93071 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/ConsumerResource.java
@@ -21,9 +21,7 @@ import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -61,8 +59,10 @@ public class ConsumerResource extends BaseResource {
         System.out.println("ci: " + ci);
         //Owner owner = (Owner) ObjectFactory.get().lookupByUUID(Owner.class, owneruuid);
         Consumer c = new Consumer(BaseModel.generateUUID());
+        c.setName(ci.getMetadataField("name"));
         //c.setOwner(owner);
         c.setInfo(ci);
+        ObjectFactory.get().store(c);
         return c;
     }
 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
index 3f21216..aa6e217 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/EntitlementMatcher.java
@@ -14,14 +14,14 @@
  */
 package org.fedoraproject.candlepin.resource;
 
-import org.apache.log4j.Logger;
-
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.ProductFactory;
 
+import org.apache.log4j.Logger;
+
 import java.util.List;
 
 /** 
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
index c2ca74c..d29a438 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/TestResource.java
@@ -14,6 +14,7 @@
  */
 package org.fedoraproject.candlepin.resource;
 
+import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.JsonTestObject;
 
 import javax.ws.rs.Consumes;
@@ -55,4 +56,10 @@ public class TestResource {
         System.out.println("jto.parent.name:" + jto.getParent() == null ? jto.getParent().getName() : "");
         System.out.println("jto.parent.list:" + jto.getParent() == null ? jto.getParent().getStringList() : "" );
     }
+    
+    @GET @Path("/consumertype")
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    public ConsumerType getConsumerType() {
+        return new ConsumerType("testtype");
+    }
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
index f88cb3f..083bc3e 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/UserResource.java
@@ -74,6 +74,8 @@ public class UserResource extends BaseResource {
     public User create(String login, String password) {
         String newuuid = BaseModel.generateUUID();
         User u = new User(newuuid);
+        u.setLogin(login);
+        u.setPassword(password);
         ObjectFactory.get().store(u);
         return u;
     }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
index 58b834b..b9f9634 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/cert/test/CertTest.java
@@ -14,6 +14,8 @@
  */
 package org.fedoraproject.candlepin.resource.cert.test;
 
+import org.fedoraproject.candlepin.resource.cert.CertGenerator;
+
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.x509.GeneralName;
@@ -25,8 +27,6 @@ import org.bouncycastle.x509.X509V2AttributeCertificate;
 import org.bouncycastle.x509.X509V2AttributeCertificateGenerator;
 import org.bouncycastle.x509.examples.AttrCertExample;
 
-import org.fedoraproject.candlepin.resource.cert.CertGenerator;
-
 import java.math.BigInteger;
 import java.security.KeyFactory;
 import java.security.KeyStore;
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
index f76501e..5bad995 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -16,6 +16,7 @@ package org.fedoraproject.candlepin.resource.test;
 
 import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.ConsumerInfo;
+import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.test.TestUtil;
 import org.fedoraproject.candlepin.resource.ConsumerResource;
@@ -24,7 +25,6 @@ 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;
 
@@ -39,14 +39,12 @@ public class ConsumerResourceTest extends TestCase {
         String newname = "test-consumer-" + System.currentTimeMillis();
         
         ConsumerResource capi = new ConsumerResource();
-        Form f = new Form();
-        f.add("name", newname);
-        f.add("type", "standard-system");
-        capi.create(f);
+        ConsumerInfo ci = new ConsumerInfo();
+        ci.setMetadataField("name", newname);
+        ci.setType(new ConsumerType("standard-system"));
+        capi.create(ci);
         assertNotNull(ObjectFactory.get().lookupByFieldName(Consumer.class, 
                 "name", newname));
-        
-        
     }
     
     public void testDelete() {
@@ -54,7 +52,7 @@ public class ConsumerResourceTest extends TestCase {
         String uuid = c.getUuid();
         ConsumerResource capi = new ConsumerResource();
         assertNotNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
-        capi.delete(c);
+        capi.delete(uuid);
         assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
     }
 
@@ -62,48 +60,19 @@ public class ConsumerResourceTest extends TestCase {
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
 
-        Consumer consumer = TestUtil.createConsumer();
-        String uuid = consumer.getUuid();
+        ConsumerInfo ci = new ConsumerInfo();
+        ci.setMetadataField("name", "jsontestname");
+        ci.setType(new ConsumerType("standard-system"));
         
-        WebResource deleteResource = c.resource("http://localhost:8080/candlepin/consumer/");
-        deleteResource.accept("application/json").type("application/json").delete(consumer);
+        WebResource createResource = c.resource("http://localhost:8080/candlepin/consumer/");
+        Consumer rc = createResource.type("application/json").post(Consumer.class, ci);
+        assertNotNull(rc);
+        assertNotNull(rc.getUuid());
+        System.out.println(rc.getUuid());
         
-        assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
-    }
-
-/*
-    public void testJson() {
-        ClientConfig cc = new DefaultClientConfig();
-        Client c = Client.create(cc);
-        ConsumerInfo ci = new ConsumerInfo();
-        ci.setParent(null);
-        ci.setType("system");
-        ci.setMetadataField("mata1", "value1");
-        WebResource postresource = c.resource("http://localhost:8080/candlepin/consumer");
-        ConsumerInfo pci = postresource.accept("application/json").type("application/json").post(ConsumerInfo.class, ci);
-        assertNotNull(pci);
-        assertEquals("system", pci.getType());
-        assertNotNull(pci.getMetadata());
-        assertEquals("value1", pci.getMetadataField("mata1"));
-
-//        WebResource getresource = c.resource("http://localhost:8080/candlepin/consumer/info");
-//        ConsumerInfo nci = getresource.accept("application/json").get(ConsumerInfo.class);
-//        assertNotNull(nci);
-//        assertEquals("system", nci.getType());
-//        assertNotNull(nci.getMetadata());
-//        assertEquals("value1", nci.getMetadataField("mata1"));
-//        System.out.println(nci.getType());
-//        System.out.println(nci.getMetadata());
-
-
-
-//        WebResource postresource = c.resource("http://localhost:8080/candlepin/test/");
-//        postresource.accept("application/json").type("application/json").post(jto);
-//
-//        System.out.println(jto.getName());
-//        jto = getresource.accept("application/json").get(JsonTestObject.class);
-//        assertEquals("testname", jto.getName());
-//        assertEquals("AEF", jto.getUuid());
+//        WebResource deleteResource = c.resource("http://localhost:8080/candlepin/consumer/");
+//        deleteResource.accept("application/json").delete(rc.getUuid());
+//        
+//        assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), rc.getUuid()));
     }
-    */
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
index 6b3df4a..38b27d5 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -14,19 +14,20 @@
  */
 package org.fedoraproject.candlepin.resource.test;
 
-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 org.fedoraproject.candlepin.model.Consumer;
+import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.EntitlementPool;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Product;
 import org.fedoraproject.candlepin.model.test.TestUtil;
 import org.fedoraproject.candlepin.resource.EntitlementResource;
 
+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 java.sql.Date;
 import java.util.ArrayList;
 import java.util.List;
@@ -120,13 +121,13 @@ public class EntitlementResourceTest extends TestCase {
 
     public void testListAvailableEntitlements() {
         EntitlementResource eapi = new EntitlementResource();
+        consumer.setType(new ConsumerType("standard-system"));
         Form f = new Form();
         f.add("consumer_uuid", consumer.getUuid());
         
-        List avail = eapi.listAvailableEntitlements(consumer.getUuid());
+        List<EntitlementPool> avail = eapi.listAvailableEntitlements(consumer.getUuid());
         assertNotNull(avail);
         assertTrue(avail.size() > 0);
-        
     }
     
     public void testJson() {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
index 5b9c383..29c79dd 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -14,6 +14,7 @@
  */
 package org.fedoraproject.candlepin.resource.test;
 
+import org.fedoraproject.candlepin.model.ConsumerType;
 import org.fedoraproject.candlepin.model.JsonTestObject;
 import org.fedoraproject.candlepin.resource.TestResource;
 
@@ -74,4 +75,14 @@ public class TestResourceTest extends TestCase {
         tr.create(jto);
         assertEquals(jto, tr.get());
     }
+    
+    public void testConsumerType() {
+        ClientConfig cc = new DefaultClientConfig();
+        Client c = Client.create(cc);
+
+        WebResource getresource = c.resource("http://localhost:8080/candlepin/test/consumertype");
+        ConsumerType ct = getresource.accept("application/json").get(ConsumerType.class);
+        assertNotNull(ct);
+        assertEquals("testtype", ct.getLabel());
+    }
 }
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
index 545bcf9..6109478 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
@@ -17,8 +17,6 @@ package org.fedoraproject.candlepin.resource.test;
 import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.resource.UserResource;
 
-import com.sun.jersey.api.representation.Form;
-
 import java.util.List;
 
 import junit.framework.TestCase;
@@ -32,26 +30,17 @@ public class UserResourceTest extends TestCase {
     private UserResource api = new UserResource();
    
     public void testNewUser() {
-        Form f = new Form();
-        f.add("login", "candlepin");
-        f.add("password", "cp_p@$sw0rd");
-        User user = (User) api.create(f);
+        User user = api.create("candlepin", "cp_p@$sw0rd");
         assertNotNull(user);
         assertEquals("candlepin", user.getLogin());
         assertEquals("cp_p@$sw0rd", user.getPassword());
         
-        f.clear();
-        f.add("login", null);
-        f.add("password", null);
-        user = (User) api.create(f);
+        user = api.create(null, null);
         assertNotNull(user);
-        assertEquals("", user.getLogin());
-        assertEquals("", user.getPassword());
+        assertEquals(null, user.getLogin());
+        assertEquals(null, user.getPassword());
         
-        f.clear();
-        f.add("login", "");
-        f.add("password", "");
-        user = (User) api.create(f);
+        user = api.create("", "");
         assertNotNull(user);
         assertEquals("", user.getLogin());
         assertEquals("", user.getPassword());
@@ -61,16 +50,10 @@ public class UserResourceTest extends TestCase {
         List<User> users = api.list();
         int origSize = users.size();
         // create 1
-        Form f = new Form();
-        f.add("login", "candlepin");
-        f.add("password", "cp_p@$sw0rd");
-        api.create(f);
+        api.create("candlepin", "cp_p@$sw0rd");
         
         // create 2
-        f.clear();
-        f.add("login", "jesusr");
-        f.add("password", "n0P@$sw0rD");
-        api.create(f);
+        api.create("jesusr", "n0P@$sw0rD");
         
         // get the list back
         users = api.list();