Changeset 5556

Timestamp:

08/18/14 09:50:16 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Unit test for getting profiles and components from groups. A little bug is fixed

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/ComponentRegistry.java (modified) (4 diffs)
• main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java (modified) (5 diffs)
• main/java/clarin/cmdi/componentregistry/frontend/StatisticsPage.java (modified) (3 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (7 diffs)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (4 diffs)
• test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/rest/RestGroupServiceTest.java (modified) (3 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistry.java

@@ -41 +41 @@
      * @throws ComponentRegistryException
      */
-    List<ComponentDescription> getComponentDescriptions() throws ComponentRegistryException, UserUnauthorizedException;
+    List<ComponentDescription> getComponentDescriptions() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException;
 
    
@@ -52 +52 @@
      * @throws ComponentRegistryException
      */
-    List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException;
+    List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException;
 
 
@@ -60 +60 @@
      * @throws ComponentRegistryException
      */
-    List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException;
+    List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException;
 
     /**
@@ -67 +67 @@
     * @throws ComponentRegistryException
     */
-   List<ProfileDescription> getProfileDescriptionsForMetadaEditor(Number groupId) throws ComponentRegistryException, UserUnauthorizedException;
+   List<ProfileDescription> getProfileDescriptionsForMetadaEditor(Number groupId) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException;
 
    ProfileDescription getProfileDescriptionAccessControlled(String id) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException;

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java

@@ -29 +29 @@
 import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ItemNotFoundException;
 import clarin.cmdi.componentregistry.MDMarshaller;
 import clarin.cmdi.componentregistry.RegistrySpace;
@@ -53 +54 @@
     private MDMarshaller marshaller;
 
-    public AdminHomePage(final PageParameters parameters) throws ComponentRegistryException {
+    public AdminHomePage(final PageParameters parameters) throws ComponentRegistryException, ItemNotFoundException {
         super(parameters);
         adminRegistry.setComponentRegistryFactory(componentRegistryFactory);
@@ -181 +182 @@
     }
 
-    private void reloadTreeModel(CMDItemInfo info) throws UserUnauthorizedException {
+    private void reloadTreeModel(CMDItemInfo info) throws UserUnauthorizedException, ItemNotFoundException {
         try {
             tree.setModelObject(createDBTreeModel());
@@ -254 +255 @@
     }
 
-    private TreeModel createDBTreeModel() throws ComponentRegistryException, UserUnauthorizedException {
+    private TreeModel createDBTreeModel() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(new DisplayDataNode("ComponentRegistry", false));
         DefaultMutableTreeNode publicNode = new DefaultMutableTreeNode(new DisplayDataNode("Public", false));
@@ -270 +271 @@
     }
 
-    private void add(DefaultMutableTreeNode parent, ComponentRegistry registry) throws ComponentRegistryException, UserUnauthorizedException {
+    private void add(DefaultMutableTreeNode parent, ComponentRegistry registry) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         DefaultMutableTreeNode componentsNode = new DefaultMutableTreeNode(new DisplayDataNode("Components", false));
         parent.add(componentsNode);

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/StatisticsPage.java

@@ -14 +14 @@
 import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ItemNotFoundException;
 import clarin.cmdi.componentregistry.RegistrySpace;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
@@ -42 +43 @@
     }
 
-    public StatisticsPage(final PageParameters pageParameters) throws IOException, ComponentRegistryException, UserUnauthorizedException {
+    public StatisticsPage(final PageParameters pageParameters) throws IOException, ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         super(pageParameters);
         ComponentRegistry registry = componentRegistryFactory.getComponentRegistry(RegistrySpace.PUBLISHED, null, null, null);
@@ -49 +50 @@
     }
 
-    private void displayStatistics(ComponentRegistry registry) throws ComponentRegistryException, UserUnauthorizedException {
+    private void displayStatistics(ComponentRegistry registry) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         List<ProfileDescription> profileList = registry.getProfileDescriptions();
         RepeatingView repeating = new RepeatingView("repeating");

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -155 +155 @@
         }
     }
-    
-    @Override
-    public Number makeGroupMember(String principalName, String groupName) throws  UserUnauthorizedException, ItemNotFoundException{
+
+    @Override
+    public Number makeGroupMember(String principalName, String groupName) throws UserUnauthorizedException, ItemNotFoundException {
         RegistryUser regOwner = userDao.getPrincipalNameById(registryOwner.getId());
-        if  (groupService.isUserOwnerOfGroup(groupName, regOwner.getPrincipalName()) || 
-                configuration.isAdminUser(regOwner.getPrincipalName())) {
-        return groupService.makeMember(principalName, groupName);
+        if (groupService.isUserOwnerOfGroup(groupName, regOwner.getPrincipalName())
+                || configuration.isAdminUser(regOwner.getPrincipalName())) {
+            return groupService.makeMember(principalName, groupName);
         } else {
             throw new UserUnauthorizedException("The registry owner is not the admin or not the owner of the group and cannot add users to the group");
         }
     }
-    
+
 //    @Override
 //    public long removeGroupMember(String principalName, String groupName) throws  UserUnauthorizedException, ItemNotFoundException{
@@ -177 +177 @@
 //        }
 //    }
-    
-   
-    @Override
-    public List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException {
+    @Override
+    public List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         try {
             switch (registrySpace) {
@@ -234 +232 @@
 
     @Override
-    public List<ComponentDescription> getComponentDescriptions() throws ComponentRegistryException, UserUnauthorizedException {
+    public List<ComponentDescription> getComponentDescriptions() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         try {
             switch (registrySpace) {
@@ -861 +859 @@
 
     private List<ComponentDescription> getComponentDescriptionsInGroup(Number groupId)
-            throws ComponentRegistryException, UserUnauthorizedException {
+            throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
 
         String principalName = userDao.getPrincipalNameById(registryOwner.getId()).getPrincipalName();
-
-        if (!groupService.userGroupMember(principalName, groupId.toString())) {
+        String groupName = groupService.getGroupNameById(groupId.longValue());
+        if (!groupService.userGroupMember(principalName, groupId.toString())
+                && !groupService.isUserOwnerOfGroup(groupName, principalName)) {
             throw new UserUnauthorizedException("The user \'" + principalName + "\' does not have access to components of the group " + groupId);
         }
@@ -880 +879 @@
     }
 
-    private List<ProfileDescription> getProfileDescriptionsInGroup(Number groupId) throws ComponentRegistryException, UserUnauthorizedException {
+    private List<ProfileDescription> getProfileDescriptionsInGroup(Number groupId) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
 
         String principalName = userDao.getPrincipalNameById(registryOwner.getId()).getPrincipalName();
-
-        if (!groupService.userGroupMember(principalName, groupId.toString())) {
+        String groupName = groupService.getGroupNameById(groupId.longValue());
+        if (!groupService.userGroupMember(principalName, groupId.toString())
+                && !groupService.isUserOwnerOfGroup(groupName, principalName)) {
             throw new UserUnauthorizedException("The user \'" + principalName + "\' does not have access to profiles of the group " + groupId);
         }
@@ -900 +900 @@
 
     @Override
-    public List<ProfileDescription> getProfileDescriptionsForMetadaEditor(Number groupId) throws UserUnauthorizedException,
-            ComponentRegistryException {
+    public List<ProfileDescription> getProfileDescriptionsForMetadaEditor(Number groupId) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         return this.getProfileDescriptionsInGroup(groupId.longValue());
     }
@@ -984 +983 @@
         }
     }
-    
-    
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -200 +200 @@
             return new ArrayList<ComponentDescription>();
 
+        
+        
+        } catch (ItemNotFoundException e) {
+            response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
+            return new ArrayList<ComponentDescription>();
         }
 
@@ -235 +240 @@
         } catch (UserUnauthorizedException e) {
             response.sendError(Status.FORBIDDEN.getStatusCode(), e.toString());
+            return new ArrayList<ProfileDescription>();
+        
+        
+        } catch (ItemNotFoundException e) {
+            response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
             return new ArrayList<ProfileDescription>();
         }
@@ -1558 +1568 @@
             return new Rss();
         }
+        catch (ItemNotFoundException e) {
+            response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
+            return new Rss();
+        }
         // obsolete, add group Id
         final RssCreatorDescriptions instance = new RssCreatorDescriptions(!registrySpace.equalsIgnoreCase("published"), getApplicationBaseURI(), "components",
@@ -1596 +1610 @@
         } catch (UserUnauthorizedException e) {
             response.sendError(Status.FORBIDDEN.getStatusCode(), e.toString());
+            return new Rss();
+        
+        } catch (ItemNotFoundException e) {
+            response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
             return new Rss();
         }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java

@@ -49 +49 @@
         return addComponent(testRegistry, id, getComponentTestContent(), isPublic);
     }
-
+    
+    
     public static ComponentDescription addComponent(ComponentRegistry testRegistry, String id, String content, boolean isPublic) throws ParseException,
             JAXBException, UnsupportedEncodingException {
@@ -60 +61 @@
         desc.setCreatorName(DummyPrincipal.DUMMY_CREDENTIALS.getDisplayName());
         desc.setUserId(DummyPrincipal.DUMMY_PRINCIPAL.getName());
+        desc.setName(id);
+        desc.setDescription("Test Description");
+        desc.setId(ComponentDescription.COMPONENT_PREFIX + id);
+        desc.setHref("link:" + desc.getId());
+        desc.setPublic(isPublic);
+        CMDComponentSpec spec = marshaller.unmarshal(CMDComponentSpec.class, content, marshaller.getCMDComponentSchema());
+        testRegistry.register(desc, spec);
+        return desc;
+    }
+    
+    public static ComponentDescription addComponentAnotherPrincipal(ComponentRegistry testRegistry, String id, boolean isPublic) throws ParseException, JAXBException {
+        return addComponentAnotherPrincipal(testRegistry, id, getComponentTestContent(), isPublic);
+    }
+
+     private static ComponentDescription addComponentAnotherPrincipal(ComponentRegistry testRegistry, String id, InputStream content, boolean isPublic) throws ParseException,
+            JAXBException {
+        ComponentDescription desc = ComponentDescription.createNewDescription();
+        desc.setCreatorName("AnotherPrincipal");
+        desc.setUserId("AnotherPrincipal");
+        desc.setDbUserId(2);
         desc.setName(id);
         desc.setDescription("Test Description");
@@ -121 +142 @@
         desc.setCreatorName(DummyPrincipal.DUMMY_CREDENTIALS.getDisplayName());
         desc.setUserId(DummyPrincipal.DUMMY_CREDENTIALS.getPrincipalName());
+        desc.setName(id);
+        desc.setDescription("Test Description");
+        desc.setId(ProfileDescription.PROFILE_PREFIX + id);
+        desc.setHref("link:" + ProfileDescription.PROFILE_PREFIX + id);
+        desc.setPublic(isPublic);
+        CMDComponentSpec spec = marshaller.unmarshal(CMDComponentSpec.class, content, marshaller.getCMDComponentSchema());
+        testRegistry.register(desc, spec);
+        return desc;
+    }
+    
+    public static ProfileDescription addProfileAnotherPrincipal(ComponentRegistry testRegistry, String id, boolean isPublic) throws ParseException, JAXBException, ItemNotFoundException {
+        return addProfileAnotherPrincipal(testRegistry, id, RegistryTestHelper.getTestProfileContent(), isPublic);
+    }
+    
+    private static ProfileDescription addProfileAnotherPrincipal(ComponentRegistry testRegistry, String id, InputStream content, boolean isPublic) throws ParseException,
+            JAXBException, ItemNotFoundException {
+        ProfileDescription desc = ProfileDescription.createNewDescription();
+        desc.setCreatorName("AnotherPrincipal");
+        desc.setUserId("AnotherPrincipal");
+        desc.setDbUserId(2);
         desc.setName(id);
         desc.setDescription("Test Description");

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/RestGroupServiceTest.java

@@ -8 +8 @@
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
 import clarin.cmdi.componentregistry.ItemNotFoundException;
+import clarin.cmdi.componentregistry.components.CMDComponentSpec;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
 import clarin.cmdi.componentregistry.impl.database.GroupService;
@@ -184 +185 @@
         MakeGroupC();
         
-        RegistryTestHelper.addProfile(baseRegistry, "Cprofile-1", false);
-        RegistryTestHelper.addComponent(baseRegistry, "Ccomponent-1", false);
-        RegistryTestHelper.addComponent(baseRegistry, "Ccomponent-2", false);
+        RegistryTestHelper.addProfileAnotherPrincipal(baseRegistry, "Cprofile-1", false);
+        RegistryTestHelper.addComponentAnotherPrincipal(baseRegistry, "Ccomponent-1", false);
+        RegistryTestHelper.addComponentAnotherPrincipal(baseRegistry, "Ccomponent-2", false);
         
         Ownership ownership = new Ownership();
@@ -497 +498 @@
     }
     
+    @Test
+    public void testGetGroupProfilesAndComponents() throws Exception {
+
+        System.out.println("test getGroupProfiles");
+
+        fillUpGroupA();
+        fillUpGroupB();        
+        fillUpGroupC();
+
+        
+        List<ProfileDescription> response = this.getAuthenticatedResource(getResource()
+                .path("/registry/profiles").queryParam("registrySpace", "group").queryParam("groupid", "1")).accept(MediaType.APPLICATION_XML)
+                .get(PROFILE_LIST_GENERICTYPE);
+        assertEquals(1, response.size());
+        
+        List<ComponentDescription> responseC = this.getAuthenticatedResource(getResource()
+                .path("/registry/components").queryParam("registrySpace", "group").queryParam("groupid", "1")).accept(MediaType.APPLICATION_XML)
+                .get(COMPONENT_LIST_GENERICTYPE);
+        assertEquals(2, responseC.size());
+        
+        response = this.getAuthenticatedResource(getResource()
+                .path("/registry/profiles").queryParam("registrySpace", "group").queryParam("groupid", "2")).accept(MediaType.APPLICATION_XML)
+                .get(PROFILE_LIST_GENERICTYPE);
+        assertEquals(1, response.size());
+        
+        responseC = this.getAuthenticatedResource(getResource()
+                .path("/registry/components").queryParam("registrySpace", "group").queryParam("groupid", "2")).accept(MediaType.APPLICATION_XML)
+                .get(COMPONENT_LIST_GENERICTYPE);
+        assertEquals(2, responseC.size());
+        
+        ClientResponse clientResponse = this.getAuthenticatedResource(getResource()
+                .path("/registry/components").queryParam("registrySpace", "group").queryParam("groupid", "3")).accept(MediaType.APPLICATION_XML)
+                .get(ClientResponse.class);
+        
+        assertEquals(403, clientResponse.getStatus());
+        
+        
+        CMDComponentSpec component = this.getAuthenticatedResource(getResource()
+                .path("/registry/profiles/" + ProfileDescription.PROFILE_PREFIX+"profile-1"))
+                .accept(MediaType.APPLICATION_JSON).get(CMDComponentSpec.class);
+        assertNotNull(component);
+        assertEquals("Actor", component.getCMDComponent().getName());
+    
+        component = this.getAuthenticatedResource(getResource()
+                .path("/registry/components/" + ComponentDescription.COMPONENT_PREFIX+"component-1"))
+                .accept(MediaType.APPLICATION_JSON).get(CMDComponentSpec.class);
+        assertNotNull(component);
+        assertEquals("Access", component.getCMDComponent().getName());
+    
+        component = this.getAuthenticatedResource(getResource()
+                .path("/registry/profiles/" + ProfileDescription.PROFILE_PREFIX+"Bprofile-1"))
+                .accept(MediaType.APPLICATION_JSON).get(CMDComponentSpec.class);
+        assertNotNull(component);
+        assertEquals("Actor", component.getCMDComponent().getName());
+    
+        component = this.getAuthenticatedResource(getResource()
+                .path("/registry/components/" + ComponentDescription.COMPONENT_PREFIX+"Bcomponent-1"))
+                .accept(MediaType.APPLICATION_JSON).get(CMDComponentSpec.class);
+        assertNotNull(component);
+        assertEquals("Access", component.getCMDComponent().getName());
+    
+        clientResponse = this.getAuthenticatedResource(getResource()
+                .path("/registry/profiles/" + ProfileDescription.PROFILE_PREFIX+"Cprofile-1"))
+                .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+        assertEquals(403, clientResponse.getStatus());
+        
+         clientResponse = this.getAuthenticatedResource(getResource()
+                .path("/registry/components/" + ComponentDescription.COMPONENT_PREFIX+"Ccomponent-1"))
+                .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+        assertEquals(403, clientResponse.getStatus());
+        
+    }
 
 }