Changeset 1311

Timestamp:

05/16/11 11:04:10 (13 years ago)

Author:

twagoo

Message:

DB impl: register profiles

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java (modified) (3 diffs)

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

@@ -111 +111 @@
             MDMarshaller.marshal(spec, os);
             String xml = os.toString();
-            if (!description.isProfile()) {
+            if (description.isProfile()) {
+                profileDescriptionDao.insertComponent(description, xml);
+            } else {
                 componentDescriptionDao.insertComponent(description, xml);
             }

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

@@ -6 +6 @@
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.*;
+import clarin.cmdi.componentregistry.model.ProfileDescription;
 
 import org.junit.Test;
@@ -65 +66 @@
         assertNull(register.getMDProfile(desc.getId()));
 
-        ComponentDescription componentDescription = register.getComponentDescription(description.getId());
+        ComponentDescription componentDescription = register.
+                getComponentDescription(description.getId());
         assertNotNull(componentDescription);
 
@@ -75 +77 @@
     }
 
+    @Test
+    public void testRegisterProfile() throws Exception {
+        ComponentRegistry register = getComponentRegistryForUser(null);
+        ProfileDescription description = ProfileDescription.createNewDescription();
+        description.setName("Aap");
+        description.setDescription("MyDescription");
+
+        assertEquals(0, register.getComponentDescriptions().size());
+        assertEquals(0, register.getProfileDescriptions().size());
+
+        CMDComponentSpec testProfile = RegistryTestHelper.getTestProfile();
+        assertNull(testProfile.getHeader().getID());
+        assertNull(testProfile.getHeader().getName());
+        assertNull(testProfile.getHeader().getDescription());
+
+        register.register(description, testProfile);
+
+        assertEquals(0, register.getComponentDescriptions().size());
+        assertEquals(1, register.getProfileDescriptions().size());
+        ProfileDescription desc = register.getProfileDescriptions().get(0);
+        assertNull(register.getMDComponent(desc.getId()));
+
+        CMDComponentSpec profile = register.getMDProfile(desc.getId());
+
+        ProfileDescription profileDescription = register.getProfileDescription(description.getId());
+        assertNotNull(profileDescription);
+
+        assertNotNull(profile);
+        assertEquals("Header id should be set from description id", description.
+                getId(), profile.getHeader().getID());
+        assertEquals("Aap", profile.getHeader().getName());
+        assertEquals("MyDescription", profile.getHeader().getDescription());
+    }
+
     private ComponentRegistry getComponentRegistryForUser(Number userId) {
         ComponentRegistryDbImpl componentRegistry = componentRegistryBeanFactory.