Changeset 5549 for ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java

Timestamp:

08/11/14 16:07:55 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Added group service. Tested via the tomcat on loclahots (test URI and postman), old unit tests are adjusted and work well. Todo: retest on localhost tomcat, look at run-time exceptions, add new unit tests, adjust front-end

File:

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

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

@@ -9 +9 @@
 import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.OwnerUser;
+import clarin.cmdi.componentregistry.RegistrySpace;
 import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
@@ -50 +51 @@
                 .getPublicRegistry();
         assertNotNull(registry);
+        
+    }
+    
+    @Test
+    public void testGetBaseRegistry() {
+        ComponentRegistryDbImpl registry = componentRegistryFactory.getBaseRegistry(DummyPrincipal.DUMMY_CREDENTIALS);
+        assertNotNull(registry);
+        assertNotNull(registry.getRegistryOwner());
+        
     }
 
@@ -56 +66 @@
         // Get public
         assertNotNull(componentRegistryFactory.getComponentRegistry(
-                ComponentStatus.PUBLISHED, null, null));
+                RegistrySpace.PUBLISHED, null, null, null));
 
         // Get for non-existing user
@@ -64 +74 @@
 
         ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory
-                .getComponentRegistry(ComponentStatus.PRIVATE, null,
-                        credentials);
+                .getComponentRegistry(RegistrySpace.PRIVATE, null,
+                        credentials,null);
         assertNotNull(cr1);
         // Get for existing user
         ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory
-                .getComponentRegistry(ComponentStatus.PRIVATE, null,
-                        credentials);
+                .getComponentRegistry(RegistrySpace.PRIVATE, null,
+                        credentials, null);
         ;
         assertNotNull(cr2);
-        assertEquals(cr1.getOwner(), cr2.getOwner());
+        assertEquals(cr1.getRegistryOwner(), cr2.getRegistryOwner());
 
         // Get for another new user
@@ -79 +89 @@
                 testUser.getPrincipalName() + "2").getCredentials();
         ComponentRegistryDbImpl cr3 = (ComponentRegistryDbImpl) componentRegistryFactory
-                .getComponentRegistry(ComponentStatus.PRIVATE, null,
-                        credentials2);
+                .getComponentRegistry(RegistrySpace.PRIVATE, null,
+                        credentials2, null);
         assertNotNull(cr3);
-        assertNotSame(cr1.getOwner(), cr3.getOwner());
+        assertNotSame(cr1.getRegistryOwner(), cr3.getRegistryOwner());
     }
 
@@ -93 +103 @@
         // Create registry for new user
         ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory
-                .getComponentRegistry(ComponentStatus.PRIVATE, null,
-                        userCredentials);
+                .getComponentRegistry(RegistrySpace.PRIVATE, null,
+                        userCredentials, null);
 
-        Number id = cr1.getOwner().getId();
+        Number id = cr1.getRegistryOwner().getId();
 
         // Get it as admin
         ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory
                 .getOtherUserComponentRegistry(
-                        DummyPrincipal.DUMMY_ADMIN_PRINCIPAL,
-                        ComponentStatus.PRIVATE, new OwnerUser(id));
+                        DummyPrincipal.DUMMY_ADMIN_PRINCIPAL, new OwnerUser(id));
         assertNotNull(cr2);
         // Should be this user's registry
-        assertEquals(cr1.getOwner(), cr2.getOwner());
+        assertEquals(cr1.getRegistryOwner(), cr2.getRegistryOwner());
 
         // Try get it as non-admin
         try {
             componentRegistryFactory.getOtherUserComponentRegistry(
-                    DummyPrincipal.DUMMY_PRINCIPAL, ComponentStatus.PRIVATE,
-                    new OwnerUser(id));
+                    DummyPrincipal.DUMMY_PRINCIPAL, new OwnerUser(id));
             fail("Non-admin can get other user's component registry");
         } catch (Exception ex) {