Changeset 5549 for ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.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/rest/RegistryTestHelper.java (modified) (7 diffs)

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

@@ -16 +16 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.DatesHelper;
+import clarin.cmdi.componentregistry.ItemNotFoundException;
 import clarin.cmdi.componentregistry.MDMarshaller;
+import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
 import clarin.cmdi.componentregistry.model.Comment;
@@ -27 +29 @@
 import java.io.InputStreamReader;
 
-import javax.xml.transform.TransformerException;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -46 +44 @@
     }
 
-    public static ComponentDescription addComponent(ComponentRegistry testRegistry, String id) throws ParseException, JAXBException {
-        return addComponent(testRegistry, id, getComponentTestContent());
-    }
-
-    public static ComponentDescription addComponent(ComponentRegistry testRegistry, String id, String content) throws ParseException,
+    public static ComponentDescription addComponent(ComponentRegistry testRegistry, String id, boolean isPublic) throws ParseException, JAXBException {
+        return addComponent(testRegistry, id, getComponentTestContent(), isPublic);
+    }
+
+    public static ComponentDescription addComponent(ComponentRegistry testRegistry, String id, String content, boolean isPublic) throws ParseException,
             JAXBException, UnsupportedEncodingException {
-        return addComponent(testRegistry, id, new ByteArrayInputStream(content.getBytes("UTF-8")));
-    }
-
-    private static ComponentDescription addComponent(ComponentRegistry testRegistry, String id, InputStream content) throws ParseException,
+        return addComponent(testRegistry, id, new ByteArrayInputStream(content.getBytes("UTF-8")), isPublic);
+    }
+
+    private static ComponentDescription addComponent(ComponentRegistry testRegistry, String id, InputStream content, boolean isPublic) throws ParseException,
             JAXBException {
         ComponentDescription desc = ComponentDescription.createNewDescription();
         desc.setCreatorName(DummyPrincipal.DUMMY_CREDENTIALS.getDisplayName());
-        desc.setUserId(DummyPrincipal.DUMMY_CREDENTIALS.getPrincipalName());
+        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);
@@ -104 +103 @@
     }
 
-    public static ProfileDescription addProfile(ComponentRegistry testRegistry, String id) throws ParseException, JAXBException {
-        return addProfile(testRegistry, id, RegistryTestHelper.getTestProfileContent());
-    }
-
-    public static ProfileDescription addProfile(ComponentRegistry testRegistry, String id, String content) throws ParseException,
-            JAXBException {
-        return addProfile(testRegistry, id, new ByteArrayInputStream(content.getBytes()));
-    }
-
-    private static ProfileDescription addProfile(ComponentRegistry testRegistry, String id, InputStream content) throws ParseException,
-            JAXBException {
+    public static ProfileDescription addProfile(ComponentRegistry testRegistry, String id, boolean isPublic) throws ParseException, JAXBException, ItemNotFoundException {
+        return addProfile(testRegistry, id, RegistryTestHelper.getTestProfileContent(), isPublic);
+    }
+
+    public static ProfileDescription addProfile(ComponentRegistry testRegistry, String id, String content, boolean isPublic) throws ParseException,
+            JAXBException, ItemNotFoundException {
+        return addProfile(testRegistry, id, new ByteArrayInputStream(content.getBytes()), isPublic);
+    }
+
+    private static ProfileDescription addProfile(ComponentRegistry testRegistry, String id, InputStream content, boolean isPublic) throws ParseException,
+            JAXBException, ItemNotFoundException {
         ProfileDescription desc = ProfileDescription.createNewDescription();
         desc.setCreatorName(DummyPrincipal.DUMMY_CREDENTIALS.getDisplayName());
@@ -122 +121 @@
         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);
@@ -216 +216 @@
     }
 
-    public static Comment addComment(ComponentRegistry testRegistry, String id, String descriptionId, String principal) throws ParseException, JAXBException, ComponentRegistryException {
+    public static Comment addComment(ComponentRegistry testRegistry, String id, String descriptionId, String principal) throws ParseException, JAXBException, ComponentRegistryException, ItemNotFoundException,UserUnauthorizedException {
         return addComment(testRegistry, RegistryTestHelper.getTestCommentContent(id, descriptionId), principal);
     }
@@ -222 +222 @@
     private static Comment addComment(ComponentRegistry testRegistry, InputStream content, String principal) throws ParseException,
             JAXBException,
-            ComponentRegistryException {
+            ComponentRegistryException, ItemNotFoundException,UserUnauthorizedException {
         Comment spec = marshaller.unmarshal(Comment.class, content, null);
         testRegistry.registerComment(spec, principal);