Switch unit tests to junit4.

10 files changed, 64 insertions, 27 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
index a021bda..99d4242 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ConsumerTest.java
@@ -19,11 +19,14 @@ import org.fedoraproject.candlepin.model.Consumer;
 import org.fedoraproject.candlepin.model.Owner;
 import org.fedoraproject.candlepin.model.Product;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 
-public class ConsumerTest extends TestCase {
 
+public class ConsumerTest {
+
+    @Test
     public void testConsumedProduct() throws Exception {
         Owner o = TestUtil.createOwner();
         
@@ -37,6 +40,7 @@ public class ConsumerTest extends TestCase {
         
     }
     
+    @Test
     public void testProperties() {
         Owner o = TestUtil.createOwner();
         Consumer c = TestUtil.createConsumer(o);
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 52235e9..8bd66f1 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/ObjectFactoryTest.java
@@ -18,16 +18,18 @@ import org.fedoraproject.candlepin.model.BaseModel;
 import org.fedoraproject.candlepin.model.ObjectFactory;
 import org.fedoraproject.candlepin.model.Owner;
 
-import java.util.List;
 
-import junit.framework.TestCase;
+import java.util.List;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * ObjectFactoryTest
  */
-public class ObjectFactoryTest extends TestCase {
+public class ObjectFactoryTest {
 
+    @Test
     public void testGet() {
         ObjectFactory o1 = ObjectFactory.get();
         ObjectFactory o2 = ObjectFactory.get();
@@ -37,6 +39,7 @@ public class ObjectFactoryTest extends TestCase {
         assertEquals(o1, o2);
     }
     
+    @Test
     public void testListObjectsByClass() {
         List<Object> l = ObjectFactory.get().listObjectsByClass(Object.class);
         assertNotNull(l);
@@ -50,6 +53,7 @@ public class ObjectFactoryTest extends TestCase {
         assertEquals(o.getClass(), Owner.class);
     }
     
+    @Test
     public void testStore() {
         // make sure we don't have one stored already
         List<Object> list = ObjectFactory.get().listObjectsByClass(Long.class);
@@ -67,6 +71,7 @@ public class ObjectFactoryTest extends TestCase {
         assertEquals(l, l2);
     }
     
+    @Test
     public void testLookupByUUID() {
         String uuid = BaseModel.generateUUID();
         assertNull(ObjectFactory.get().lookupByUUID(Owner.class, uuid));
@@ -80,6 +85,7 @@ public class ObjectFactoryTest extends TestCase {
         assertEquals(((Owner)o).getUuid(), owner.getUuid());
     }
     
+    @Test
     public void testLookupByFieldName() {
         String uuid = BaseModel.generateUUID();
         assertNull(ObjectFactory.get().lookupByUUID(Owner.class, uuid));
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
index 1e5d72b..abfce82 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/test/OwnerTest.java
@@ -24,20 +24,22 @@ import org.fedoraproject.candlepin.model.User;
 
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * 
  *
  */
-public class OwnerTest extends TestCase {
+public class OwnerTest {
 
-    
+    @Test
     public void testOwner() throws Exception {
         Owner o = new Owner(BaseModel.generateUUID());
         assertNotNull(o);
     }
     
+    @Test
     public void testLookup() throws Exception {
         
         Owner o = TestUtil.createOwner();
@@ -47,6 +49,7 @@ public class OwnerTest extends TestCase {
         assertNotNull(o);
     }
     
+    @Test
     public void testList() throws Exception {
         for (int i = 0; i < 10; i++) {
             TestUtil.createOwner();
@@ -57,6 +60,7 @@ public class OwnerTest extends TestCase {
         assertTrue(orgs.size() >= 10);
     }
     
+    @Test
     public void testObjectRelationships() throws Exception {
         Owner owner = new Owner(BaseModel.generateUUID());
         owner.setName("test-owner");
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 f8992bb..9aff520 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
@@ -38,19 +38,21 @@ import java.security.spec.RSAPrivateCrtKeySpec;
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Date;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * CertTest
  * @version $Rev$
  */
-public class CertTest extends TestCase {
+public class CertTest {
 
+    @Test
     public void testCertGenerator() {
         String cert = CertGenerator.getCertString();
         System.out.println("Cert: " + cert);
     }
     
+    @Test
     public void testCertExample() throws Exception {
 
         Security.addProvider(new BouncyCastleProvider());
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
index e4bd5fa..5b5b4e9 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ApiTest.java
@@ -21,14 +21,16 @@ import org.fedoraproject.candlepin.model.User;
 import org.fedoraproject.candlepin.resource.ApiHandler;
 import org.fedoraproject.candlepin.resource.OwnerResource;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * @author mmccune
  *
  */
-public class ApiTest extends TestCase {
+public class ApiTest {
 
+    @Test
     public void testAuthentication() throws Exception {
         User u = new User();
         u.setLogin("admin");
@@ -43,6 +45,7 @@ public class ApiTest extends TestCase {
         assertNotNull(token);
     }
     
+    @Test
     public void testLookupOwner() throws Exception {
         Owner o = new Owner(BaseModel.generateUUID());
         ObjectFactory.get().store(o);
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 9fb7743..3c78078 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/ConsumerResourceTest.java
@@ -26,15 +26,16 @@ import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 
-import junit.framework.TestCase;
-
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * ConsumerResourceTest
  * @version $Rev$
  */
-public class ConsumerResourceTest extends TestCase {
+public class ConsumerResourceTest {
 
+    @Test
     public void testCreateConsumer() throws Exception {
         String newname = "test-consumer-" + System.currentTimeMillis();
         
@@ -47,6 +48,7 @@ public class ConsumerResourceTest extends TestCase {
                 "name", newname));
     }
     
+    @Test
     public void testDelete() {
         Consumer c = TestUtil.createConsumer();
         String uuid = c.getUuid();
@@ -56,6 +58,7 @@ public class ConsumerResourceTest extends TestCase {
         assertNull(ObjectFactory.get().lookupByUUID(c.getClass(), uuid));
     }
 
+    @Test
     public void testJSON() { 
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
diff --git a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
index a8b99bc..910eee0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementMatcherTest.java
@@ -24,14 +24,16 @@ import org.fedoraproject.candlepin.resource.EntitlementMatcher;
 
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * EntitlementMatcherTest
  * @version $Rev$
  */
-public class EntitlementMatcherTest extends TestCase {
+public class EntitlementMatcherTest {
 
+    @Test
     public void testIsCompatable() throws Exception {
         Consumer consumer = TestUtil.createConsumer();
         ConsumerType typeSystem = ProductFactory.get().lookupConsumerTypeByLabel("system");
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 4d66bd1..5358d74 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/EntitlementResourceTest.java
@@ -32,14 +32,16 @@ import java.sql.Date;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 
 /**
  * ConsumerResourceTest
  * @version $Rev$
  */
-public class EntitlementResourceTest extends TestCase {
+public class EntitlementResourceTest {
     
     private Consumer consumer;
     private Product product;
@@ -48,10 +50,8 @@ public class EntitlementResourceTest extends TestCase {
     /**
      * {@inheritDoc}
      */
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         consumer = TestUtil.createConsumer();
         product = TestUtil.createProduct();
         ep = new EntitlementPool();
@@ -66,6 +66,7 @@ public class EntitlementResourceTest extends TestCase {
 
     }
     
+    @Test
     public void testEntitle() throws Exception {
         
         
@@ -111,6 +112,7 @@ public class EntitlementResourceTest extends TestCase {
         
     }
     
+    @Test
     public void testHasEntitlement() {
         System.out.println("Foo");
         
@@ -120,6 +122,7 @@ public class EntitlementResourceTest extends TestCase {
         assertTrue(eapi.hasEntitlement(consumer.getUuid(), product.getUuid()));
     }
 
+    @Test
     public void testListAvailableEntitlements() {
         EntitlementResource eapi = new EntitlementResource();
         consumer.setType(new ConsumerType("standard-system"));
@@ -131,6 +134,7 @@ public class EntitlementResourceTest extends TestCase {
         assertTrue(avail.size() > 0);
     }
     
+    @Test
     public void testJson() {
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
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 0bb7e97..7fc3648 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/TestResourceTest.java
@@ -26,14 +26,15 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 
 /**
  * TestResourceTest
  * @version $Rev$
  */
-public class TestResourceTest extends TestCase {
+public class TestResourceTest {
     
     private JsonTestObject createTestObject() {
         JsonTestObject jto = new JsonTestObject();
@@ -46,6 +47,7 @@ public class TestResourceTest extends TestCase {
         return jto;
     }
     
+    @Test
     public void testJson() {
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
@@ -67,6 +69,7 @@ public class TestResourceTest extends TestCase {
         System.out.println(jto.getStringList());
     }
     
+    @Test
     public void testGet() {
         TestResource tr = new TestResource();
         assertNull(tr.get());
@@ -76,6 +79,7 @@ public class TestResourceTest extends TestCase {
         assertEquals(jto, tr.get());
     }
     
+    @Test
     public void testConsumerType() {
         ClientConfig cc = new DefaultClientConfig();
         Client c = Client.create(cc);
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 249e1cc..7ada16c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/resource/test/UserResourceTest.java
@@ -19,16 +19,19 @@ import org.fedoraproject.candlepin.resource.UserResource;
 
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 
 /**
  * UserResourceTest
  * @version $Rev$
  */
-public class UserResourceTest extends TestCase {
+public class UserResourceTest {
+    
     private UserResource api = new UserResource();
    
+    @Test
     public void testNewUser() {
         User user = api.create("candlepin", "cp_p@$sw0rd");
         assertNotNull(user);
@@ -46,6 +49,7 @@ public class UserResourceTest extends TestCase {
         assertEquals("", user.getPassword());
     }
     
+    @Test
     public void testList() {
         List<User> users = api.list();
         int origSize = users.size();
@@ -63,6 +67,7 @@ public class UserResourceTest extends TestCase {
         assertEquals(User.class, users.get(0).getClass());
     }
     
+    @Test
     public void testGet() {
         User user = api.get("test-login");
         assertNotNull(user);