Changeset 1992 for ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java

Timestamp:

06/18/12 14:03:46 (12 years ago)

Author:

twagoo

Message:

Created 'ComponentStatus?' enum and 'Owner' classes, and replaced userId in ComponentRegistry by Status and Owner properties.

Refs #142 and #143

File:

• ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
+import clarin.cmdi.componentregistry.OwnerGroup;
+import clarin.cmdi.componentregistry.OwnerUser;
 import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
@@ -374 +377 @@
     private ComponentRegistry getComponentRegistryForUser(Number userId) {
         ComponentRegistryDbImpl componentRegistry = componentRegistryBeanFactory.getNewComponentRegistry();
-        componentRegistry.setUserId(userId);
+        if (userId != null) {
+            componentRegistry.setStatus(ComponentStatus.DEVELOPMENT, new OwnerUser(userId));
+        }
         return componentRegistry;
     }
@@ -669 +674 @@
         assertEquals("0", comment.getUserId());
         assertEquals(USER_CREDS.getDisplayName(), comment.getUserName());
-        
+
         // Should not be allowed to delete, not authenticated
         assertFalse(comment.isCanDelete());
@@ -774 +779 @@
         assertEquals("Registry of J.Unit", register.getName());
     }
+
+    @Test
+    public void testGetStatus() {
+        ComponentRegistry register = new ComponentRegistryDbImpl();
+        assertEquals(ComponentStatus.PUBLIC, register.getStatus());
+        register = new ComponentRegistryDbImpl(ComponentStatus.DEVELOPMENT, null);
+        assertEquals(ComponentStatus.DEVELOPMENT, register.getStatus());
+    }
+
+    @Test
+    public void testGetOwner() {
+        ComponentRegistry register = new ComponentRegistryDbImpl();
+        assertNull(register.getOwner());
+        register = new ComponentRegistryDbImpl(ComponentStatus.DEVELOPMENT, new OwnerUser(101));
+        assertEquals(new OwnerUser(101), register.getOwner());
+
+        register = new ComponentRegistryDbImpl(ComponentStatus.DEVELOPMENT, new OwnerGroup(101));
+        assertEquals(new OwnerGroup(101), register.getOwner());
+    }
+
+    @Test
+    public void testSetStatus() throws Exception {
+        // Construct with an owner
+        ComponentRegistryDbImpl register = new ComponentRegistryDbImpl(ComponentStatus.PUBLIC, new OwnerUser(101));
+        register.setStatus(ComponentStatus.DEVELOPMENT);
+        assertEquals(ComponentStatus.DEVELOPMENT, register.getStatus());
+        // Owner should remain unchanged
+        assertEquals(new OwnerUser(101), register.getOwner());
+
+        // Construct with no owner
+        register = new ComponentRegistryDbImpl(ComponentStatus.PUBLIC, null);
+        register.setStatus(ComponentStatus.DEVELOPMENT);
+        assertEquals(ComponentStatus.DEVELOPMENT, register.getStatus());
+        // Owner should remain unchanged
+        assertNull(register.getOwner());
+    }
+
+    @Test
+    public void testSetStatusAndOwner() throws Exception {
+        ComponentRegistryDbImpl register = new ComponentRegistryDbImpl(ComponentStatus.PUBLIC, new OwnerUser(101));
+
+        register.setStatus(ComponentStatus.DEVELOPMENT, new OwnerGroup(102));
+        assertEquals(ComponentStatus.DEVELOPMENT, register.getStatus());
+        assertEquals(new OwnerGroup(102), register.getOwner());
+    }
 }