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

Timestamp:

08/20/13 15:32:37 (11 years ago)

Author:

George.Georgovassilis@mpi.nl

Message:

#360 Refactoring of transaction handling, tests and application context

File:

• ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ConcurrentRestServiceTest.java (modified) (6 diffs)

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

@@ -17 +17 @@
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static clarin.cmdi.componentregistry.rest.ComponentRegistryRestService.USERSPACE_PARAM;
 import static org.junit.Assert.*;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"/applicationContext.xml"})
-public class ConcurrentRestServiceTest extends ComponentRegistryRestServiceTestCase {
-
-    private final static Logger LOG = LoggerFactory.getLogger(ConcurrentRestServiceTest.class);
+/**
+ * 
+ * @author george.georgovassilis@mpi.nl
+ *
+ */
+public class ConcurrentRestServiceTest extends
+        ComponentRegistryRestServiceTestCase {
+
+    private final static Logger LOG = LoggerFactory
+            .getLogger(ConcurrentRestServiceTest.class);
     private int NR_OF_PROFILES = 20;
     private int NR_OF_COMPONENTS = 20;
@@ -44 +46 @@
     }
 
-    @Override
-    protected String getApplicationContextFile() {
-        return "classpath:applicationContext.xml";
-    }
-
     @Test
     public void testConcurrentRegisterProfile() throws Exception {
-        List<String> errors = new ArrayList();
+        List<String> errors = new ArrayList<String>();
         List<Thread> ts = new ArrayList<Thread>();
 
@@ -73 +70 @@
     private void assertProfiles(int nrOfProfiles, String userSpace) {
         List<ProfileDescription> response = getAuthenticatedResource(
-                getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, userSpace)).
-                accept(MediaType.APPLICATION_XML).get(
-                PROFILE_LIST_GENERICTYPE);
+                getResource().path("/registry/profiles").queryParam(
+                        USERSPACE_PARAM, userSpace)).accept(
+                MediaType.APPLICATION_XML).get(PROFILE_LIST_GENERICTYPE);
         Collections.sort(response, descriptionComparator);
-        assertEquals("half should be deleted", nrOfProfiles / 2, response.size());
+        assertEquals("half should be deleted", nrOfProfiles / 2,
+                response.size());
         for (int i = 0; i < nrOfProfiles / 2; i++) {
             ProfileDescription desc = response.get(i);
             assertEquals("Test Profile" + (i * 2 + 1000), desc.getName());
-            assertEquals("Test Profile" + (i * 2 + 1000) + " Description", desc.getDescription());
-        }
-    }
+            assertEquals("Test Profile" + (i * 2 + 1000) + " Description",
+                    desc.getDescription());
+        }
+    }
+
     private Comparator<AbstractDescription> descriptionComparator = new Comparator<AbstractDescription>() {
 
@@ -94 +94 @@
     private void assertComponents(int nrOfComponents, String userSpace) {
         List<ComponentDescription> cResponse = getAuthenticatedResource(
-                getResource().path("/registry/components").queryParam(USERSPACE_PARAM, userSpace)).
-                accept(MediaType.APPLICATION_XML).get(
-                COMPONENT_LIST_GENERICTYPE);
+                getResource().path("/registry/components").queryParam(
+                        USERSPACE_PARAM, userSpace)).accept(
+                MediaType.APPLICATION_XML).get(COMPONENT_LIST_GENERICTYPE);
         Collections.sort(cResponse, descriptionComparator);
-        assertEquals("half should be deleted", nrOfComponents / 2, cResponse.size());
+        assertEquals("half should be deleted", nrOfComponents / 2,
+                cResponse.size());
         for (int i = 0; i < nrOfComponents / 2; i++) {
             ComponentDescription desc = cResponse.get(i);
             assertEquals("Test Component" + (i * 2 + 1000), desc.getName());
-            assertEquals("Test Component" + (i * 2 + 1000) + " Description", desc.getDescription());
+            assertEquals("Test Component" + (i * 2 + 1000) + " Description",
+                    desc.getDescription());
         }
     }
@@ -112 +114 @@
         }
         for (Thread thread : ts) {
-            thread.join(); //Wait till all are finished
-        }
-    }
-
-    private void registerProfiles(List<Thread> ts, int size, final List<String> errors, String userSpace) throws InterruptedException {
+            thread.join(); // Wait till all are finished
+        }
+    }
+
+    private void registerProfiles(List<Thread> ts, int size,
+            final List<String> errors, String userSpace)
+            throws InterruptedException {
         for (int i = 0; i < size; i++) {
             final boolean shouldDelete = (i % 2) == 1;
-            LOG.debug("Profile {} should be registered in {} and {}", new Object[]{i + 1000, Boolean.parseBoolean(userSpace) ? "user space" : "public space", shouldDelete ? "ALSO DELETED" : "not deleted"});
-            Thread thread = createThread("/registry/profiles/", userSpace, "Test Profile" + (i + 1000), shouldDelete, RegistryTestHelper.getTestProfileContent(), errors);
+            LOG.debug("Profile {} should be registered in {} and {}",
+                    new Object[] {
+                            i + 1000,
+                            Boolean.parseBoolean(userSpace) ? "user space"
+                                    : "public space",
+                            shouldDelete ? "ALSO DELETED" : "not deleted" });
+            Thread thread = createThread("/registry/profiles/", userSpace,
+                    "Test Profile" + (i + 1000), shouldDelete,
+                    RegistryTestHelper.getTestProfileContent(), errors);
             ts.add(thread);
         }
     }
 
-    private void registerComponents(List<Thread> ts, int size, final List<String> errors, String userSpace) throws InterruptedException {
+    private void registerComponents(List<Thread> ts, int size,
+            final List<String> errors, String userSpace)
+            throws InterruptedException {
         for (int i = 0; i < size; i++) {
             final boolean shouldDelete = (i % 2) == 1;
-            LOG.debug("Component {} should be registered in {} and {}", new Object[]{i + 1000, Boolean.parseBoolean(userSpace) ? "user space" : "public space", shouldDelete ? "ALSO DELETED" : "not deleted"});
-            Thread thread = createThread("/registry/components/", userSpace, "Test Component" + (i + 1000), shouldDelete,
+            LOG.debug("Component {} should be registered in {} and {}",
+                    new Object[] {
+                            i + 1000,
+                            Boolean.parseBoolean(userSpace) ? "user space"
+                                    : "public space",
+                            shouldDelete ? "ALSO DELETED" : "not deleted" });
+            Thread thread = createThread("/registry/components/", userSpace,
+                    "Test Component" + (i + 1000), shouldDelete,
                     RegistryTestHelper.getComponentTestContent(), errors);
             ts.add(thread);
@@ -135 +154 @@
     }
 
-    private Thread createThread(final String path, final String userSpace, final String name, final boolean alsoDelete,
-            InputStream content, final List<String> errors) throws InterruptedException {
+    private Thread createThread(final String path, final String userSpace,
+            final String name, final boolean alsoDelete, InputStream content,
+            final List<String> errors) throws InterruptedException {
         final FormDataMultiPart form = new FormDataMultiPart();
-        form.field(ComponentRegistryRestService.DATA_FORM_FIELD, content, MediaType.APPLICATION_OCTET_STREAM_TYPE);
-        form.field(ComponentRegistryRestService.NAME_FORM_FIELD, name);
-        form.field(ComponentRegistryRestService.DESCRIPTION_FORM_FIELD, name + " Description");
+        form.field(IComponentRegistryRestService.DATA_FORM_FIELD, content,
+                MediaType.APPLICATION_OCTET_STREAM_TYPE);
+        form.field(IComponentRegistryRestService.NAME_FORM_FIELD, name);
+        form.field(IComponentRegistryRestService.DESCRIPTION_FORM_FIELD, name
+                + " Description");
         Thread t = new Thread(new Runnable() {
 
             @Override
             public void run() {
-                //                System.out.println("THREAD STARTED"+Thread.currentThread().getName());
+                // System.out.println("THREAD STARTED"+Thread.currentThread().getName());
                 RegisterResponse registerResponse = getAuthenticatedResource(
-                        getResource().path(path).queryParam(USERSPACE_PARAM, userSpace)).
-                        type(MediaType.MULTIPART_FORM_DATA).post(
-                        RegisterResponse.class, form);
+                        getResource().path(path).queryParam(USERSPACE_PARAM,
+                                userSpace)).type(MediaType.MULTIPART_FORM_DATA)
+                        .post(RegisterResponse.class, form);
                 if (!registerResponse.isRegistered()) {
-                    errors.add("Failed to register " + Arrays.toString(registerResponse.getErrors().toArray()));
+                    errors.add("Failed to register "
+                            + Arrays.toString(registerResponse.getErrors()
+                                    .toArray()));
                 }
-                LOG.debug(">>>>>>>>>>>>>>>> [Thread " + hashCode() + "] REGISTERING DESCRIPTION " + name + " " + registerResponse.getDescription().getId() + (Boolean.valueOf(userSpace) ? " userspace" : "") + (alsoDelete ? " alsoDelete" : ""));
+                LOG.debug(">>>>>>>>>>>>>>>> [Thread " + hashCode()
+                        + "] REGISTERING DESCRIPTION " + name + " "
+                        + registerResponse.getDescription().getId()
+                        + (Boolean.valueOf(userSpace) ? " userspace" : "")
+                        + (alsoDelete ? " alsoDelete" : ""));
                 if (alsoDelete) {
-                    LOG.debug(">>>>>>>>>>>>>>>> [Thread " + hashCode() + "] DELETING DESCRIPTION " + name + " " + registerResponse.getDescription().getId() + (Boolean.valueOf(userSpace) ? " userspace " : "") + (alsoDelete ? " alsoDelete" : ""));
+                    LOG.debug(">>>>>>>>>>>>>>>> [Thread " + hashCode()
+                            + "] DELETING DESCRIPTION " + name + " "
+                            + registerResponse.getDescription().getId()
+                            + (Boolean.valueOf(userSpace) ? " userspace " : "")
+                            + (alsoDelete ? " alsoDelete" : ""));
                     ClientResponse response = getAuthenticatedResource(
-                            getResource().path(path + registerResponse.getDescription().getId()).queryParam(USERSPACE_PARAM, userSpace)).
-                            delete(ClientResponse.class);
+                            getResource().path(
+                                    path
+                                            + registerResponse.getDescription()
+                                                    .getId()).queryParam(
+                                    USERSPACE_PARAM, userSpace)).delete(
+                            ClientResponse.class);
                     if (response.getStatus() != 200) {
-                        errors.add("Failed to delete " + registerResponse.getDescription());
+                        errors.add("Failed to delete "
+                                + registerResponse.getDescription());
                     }
                 }
-                //                System.out.println("THREAD FINISHED"+Thread.currentThread().getName());
+                // System.out.println("THREAD FINISHED"+Thread.currentThread().getName());
             }
         });