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

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.rest;
 
+import clarin.cmdi.componentregistry.RegistrySpace;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
 import clarin.cmdi.componentregistry.model.BaseDescription;
@@ -20 +21 @@
 
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -27 +27 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import static clarin.cmdi.componentregistry.rest.ComponentRegistryRestService.USERSPACE_PARAM;
+import static clarin.cmdi.componentregistry.rest.ComponentRegistryRestService.REGISTRY_SPACE_PARAM;
 import static org.junit.Assert.*;
 
@@ -58 +58 @@
         List<Thread> ts = new ArrayList<Thread>();
 
-        registerProfiles(ts, NR_OF_PROFILES, errors, false);
-        registerProfiles(ts, NR_OF_PROFILES, errors, true);
-
-        registerComponents(ts, NR_OF_COMPONENTS, errors, false);
-        registerComponents(ts, NR_OF_COMPONENTS, errors, true);
+        registerProfiles(ts, NR_OF_PROFILES, errors, RegistrySpace.PRIVATE);
+        //a profile can be first registered (created) only in private space, and then moved.
+        //registerProfiles(ts, NR_OF_PROFILES, errors, RegistrySpace.PUBLISHED);
+
+        registerComponents(ts, NR_OF_COMPONENTS, errors, RegistrySpace.PRIVATE);
+        //a profile can be first registered (created) only in private space, and then moved.
+        //registerComponents(ts, NR_OF_COMPONENTS, errors, RegistrySpace.PUBLISHED);
         runAllThreads(ts);
         if (errors.size() > 0) {
@@ -70 +72 @@
             fail();
         }
-        assertProfiles(NR_OF_PROFILES, false);
-        assertProfiles(NR_OF_PROFILES, true);
-
-        assertComponents(NR_OF_COMPONENTS, false);
-        assertComponents(NR_OF_COMPONENTS, true);
-    }
-
-    private void assertProfiles(int nrOfProfiles, boolean userSpace) {
+        assertProfiles(NR_OF_PROFILES, RegistrySpace.PRIVATE);
+        //assertProfiles(NR_OF_PROFILES, RegistrySpace.PUBLISHED);
+
+        assertComponents(NR_OF_COMPONENTS, RegistrySpace.PRIVATE);
+        //assertComponents(NR_OF_COMPONENTS, RegistrySpace.PUBLISHED);
+    }
+
+    private void assertProfiles(int nrOfProfiles, RegistrySpace registrySpace) {
         List<ProfileDescription> response = getAuthenticatedResource(
                 getResource().path("/registry/profiles").queryParam(
-                        USERSPACE_PARAM, "" + userSpace)).accept(
+                        REGISTRY_SPACE_PARAM, registrySpace.name())).accept(
                 MediaType.APPLICATION_XML).get(PROFILE_LIST_GENERICTYPE);
         Collections.sort(response, descriptionComparator);
@@ -101 +103 @@
     };
 
-    private void assertComponents(int nrOfComponents, boolean userSpace) {
+    private void assertComponents(int nrOfComponents, RegistrySpace registrySpace) {
         List<ComponentDescription> cResponse = getAuthenticatedResource(
                 getResource().path("/registry/components").queryParam(
-                        USERSPACE_PARAM, "" + userSpace)).accept(
+                        REGISTRY_SPACE_PARAM, registrySpace.name())).accept(
                 MediaType.APPLICATION_XML).get(COMPONENT_LIST_GENERICTYPE);
         Collections.sort(cResponse, descriptionComparator);
@@ -128 +130 @@
 
     private void registerProfiles(List<Thread> ts, int size,
-            final List<String> errors, boolean userSpace)
+            final List<String> errors, RegistrySpace registrySpace)
             throws InterruptedException {
         for (int i = 0; i < size; i++) {
@@ -134 +136 @@
             LOG.debug("Profile {} should be registered in {} and {}",
                     new Object[] { i + 1000,
-                            userSpace ? "user space" : "public space",
+                            registrySpace.name(),
                             shouldDelete ? "ALSO DELETED" : "not deleted" });
-            Thread thread = createThread("/registry/profiles/", userSpace,
+            Thread thread = createThread("/registry/profiles/", registrySpace,
                     "Test Profile" + (i + 1000), shouldDelete,
                     RegistryTestHelper.getTestProfileContent(), errors);
@@ -144 +146 @@
 
     private void registerComponents(List<Thread> ts, int size,
-            final List<String> errors, boolean userSpace)
+            final List<String> errors, RegistrySpace registrySpace)
             throws InterruptedException {
         for (int i = 0; i < size; i++) {
@@ -150 +152 @@
             LOG.debug("Component {} should be registered in {} and {}",
                     new Object[] { i + 1000,
-                            userSpace ? "user space" : "public space",
+                            registrySpace.name(),
                             shouldDelete ? "ALSO DELETED" : "not deleted" });
-            Thread thread = createThread("/registry/components/", userSpace,
+            Thread thread = createThread("/registry/components/", registrySpace,
                     "Test Component" + (i + 1000), shouldDelete,
                     RegistryTestHelper.getComponentTestContent(), errors);
@@ -159 +161 @@
     }
 
-    private Thread createThread(final String path, final boolean userSpace,
+    private Thread createThread(final String path, final RegistrySpace registrySpace,
             final String name, final boolean alsoDelete, InputStream content,
             final List<String> errors) throws InterruptedException {
@@ -176 +178 @@
                     // System.out.println("THREAD STARTED"+Thread.currentThread().getName());
                     RegisterResponse registerResponse = getAuthenticatedResource(
-                            getResource().path(path).queryParam(
-                                    USERSPACE_PARAM, "" + userSpace)).type(
+                            getResource().path(path)).type(
                             MediaType.MULTIPART_FORM_DATA).post(
                             RegisterResponse.class, form);
@@ -188 +189 @@
                             + "] REGISTERING DESCRIPTION " + name + " "
                             + registerResponse.getDescription().getId()
-                            + (Boolean.valueOf(userSpace) ? " userspace" : "")
+                            + registrySpace.name()
                             + (alsoDelete ? " alsoDelete" : ""));
                     if (alsoDelete) {
@@ -197 +198 @@
                                 + " "
                                 + registerResponse.getDescription().getId()
-                                + (Boolean.valueOf(userSpace) ? " userspace "
-                                        : "")
+                                + registrySpace.name()
                                 + (alsoDelete ? " alsoDelete" : ""));
                         ClientResponse response = getAuthenticatedResource(
@@ -205 +205 @@
                                                 + registerResponse
                                                         .getDescription()
-                                                        .getId()).queryParam(
-                                        USERSPACE_PARAM, "" + userSpace))
+                                                        .getId()))
                                 .delete(ClientResponse.class);
                         if (response.getStatus() != 200) {