Changeset 1993 for ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/AdminRegistryTest.java

Timestamp:

06/18/12 15:24:30 (12 years ago)

Author:

twagoo

Message:

ComponentRegistryFactory? now using ComponentStatus? and Owner instead of userId and userspace parameter.

Refs #142 and #143

File:

• ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/AdminRegistryTest.java (modified) (4 diffs)

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

@@ -17 +17 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
 import clarin.cmdi.componentregistry.frontend.CMDItemInfo;
@@ -28 +29 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/applicationContext.xml"})
-public class AdminRegistryTest  {
-    
+public class AdminRegistryTest {
+
     @Autowired
     private ComponentDescriptionDao componentDescriptionDao;
@@ -37 +38 @@
     private ComponentRegistryFactory componentRegistryFactory;
     private static final Principal PRINCIPAL_ADMIN = DummyPrincipal.DUMMY_ADMIN_PRINCIPAL;
-    
     @Autowired
     private JdbcTemplate jdbcTemplate;
-    
+
     @Before
     public void init() {
@@ -48 +48 @@
     @Test
     public void testForceUpdate() throws Exception {
-        ComponentRegistry testRegistry = componentRegistryFactory.getPublicRegistry();
-        String content1 = "";
-        content1 += "<CMD_ComponentSpec isProfile=\"false\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
-        content1 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
-        content1 += "    <Header/>\n";
-        content1 += "    <CMD_Component name=\"XXX\" CardinalityMin=\"1\" CardinalityMax=\"10\">\n";
-        content1 += "        <CMD_Element name=\"Availability\" ValueScheme=\"string\" />\n";
-        content1 += "    </CMD_Component>\n";
-        content1 += "</CMD_ComponentSpec>\n";
-        ComponentDescription compDesc1 = RegistryTestHelper.addComponent(testRegistry, "XXX1", content1);
+        ComponentRegistry testRegistry = componentRegistryFactory.getPublicRegistry();
+        String content1 = "";
+        content1 += "<CMD_ComponentSpec isProfile=\"false\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+        content1 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
+        content1 += "    <Header/>\n";
+        content1 += "    <CMD_Component name=\"XXX\" CardinalityMin=\"1\" CardinalityMax=\"10\">\n";
+        content1 += "        <CMD_Element name=\"Availability\" ValueScheme=\"string\" />\n";
+        content1 += "    </CMD_Component>\n";
+        content1 += "</CMD_ComponentSpec>\n";
+        ComponentDescription compDesc1 = RegistryTestHelper.addComponent(testRegistry, "XXX1", content1);
 
-        String content2 = "";
-        content2 += "<CMD_ComponentSpec isProfile=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
-        content2 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
-        content2 += "    <Header/>\n";
-        content2 += "    <CMD_Component name=\"YYY\" CardinalityMin=\"1\" CardinalityMax=\"unbounded\">\n";
-        content2 += "        <CMD_Component ComponentId=\"" + compDesc1.getId() + "\" CardinalityMin=\"0\" CardinalityMax=\"99\">\n";
-        content2 += "        </CMD_Component>\n";
-        content2 += "    </CMD_Component>\n";
-        content2 += "</CMD_ComponentSpec>\n";
-        ProfileDescription profileDesc = RegistryTestHelper.addProfile(testRegistry, "YYY1", content2);
+        String content2 = "";
+        content2 += "<CMD_ComponentSpec isProfile=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+        content2 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
+        content2 += "    <Header/>\n";
+        content2 += "    <CMD_Component name=\"YYY\" CardinalityMin=\"1\" CardinalityMax=\"unbounded\">\n";
+        content2 += "        <CMD_Component ComponentId=\"" + compDesc1.getId() + "\" CardinalityMin=\"0\" CardinalityMax=\"99\">\n";
+        content2 += "        </CMD_Component>\n";
+        content2 += "    </CMD_Component>\n";
+        content2 += "</CMD_ComponentSpec>\n";
+        ProfileDescription profileDesc = RegistryTestHelper.addProfile(testRegistry, "YYY1", content2);
 
-        AdminRegistry adminReg = new AdminRegistry();
-        adminReg.setComponentRegistryFactory(componentRegistryFactory);
-        adminReg.setComponentDescriptionDao(componentDescriptionDao);
-        adminReg.setProfileDescriptionDao(profileDescriptionDao);
-        CMDItemInfo fileInfo = new CMDItemInfo();
-        fileInfo.setForceUpdate(false);
-        fileInfo.setDataNode(new DisplayDataNode(compDesc1.getName(), false, compDesc1, true));
-        fileInfo.setContent(content1);
-        try {
-            adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN);
-            fail();
-        } catch (SubmitFailedException e) {}
-        fileInfo.setForceUpdate(true);
-        adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN); //Component needs to be forced because they can be used by other profiles/components
+        AdminRegistry adminReg = new AdminRegistry();
+        adminReg.setComponentRegistryFactory(componentRegistryFactory);
+        adminReg.setComponentDescriptionDao(componentDescriptionDao);
+        adminReg.setProfileDescriptionDao(profileDescriptionDao);
+        CMDItemInfo fileInfo = new CMDItemInfo();
+        fileInfo.setForceUpdate(false);
+        fileInfo.setDataNode(new DisplayDataNode(compDesc1.getName(), false, compDesc1, ComponentStatus.PUBLIC));
+        fileInfo.setContent(content1);
+        try {
+            adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN);
+            fail();
+        } catch (SubmitFailedException e) {
+        }
+        fileInfo.setForceUpdate(true);
+        adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN); //Component needs to be forced because they can be used by other profiles/components
 
-        assertEquals(1, testRegistry.getComponentDescriptions().size());
-        try {
-            fileInfo.setForceUpdate(false);
-            adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
-            fail();
-        } catch (SubmitFailedException e) {
-            assertTrue(e.getCause() instanceof DeleteFailedException);
-        }
-        assertEquals(1, testRegistry.getComponentDescriptions().size());
-        fileInfo.setForceUpdate(true);
-        adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
-        assertEquals(0, testRegistry.getComponentDescriptions().size());
+        assertEquals(1, testRegistry.getComponentDescriptions().size());
+        try {
+            fileInfo.setForceUpdate(false);
+            adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
+            fail();
+        } catch (SubmitFailedException e) {
+            assertTrue(e.getCause() instanceof DeleteFailedException);
+        }
+        assertEquals(1, testRegistry.getComponentDescriptions().size());
+        fileInfo.setForceUpdate(true);
+        adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
+        assertEquals(0, testRegistry.getComponentDescriptions().size());
 
-        assertEquals(1, testRegistry.getProfileDescriptions().size());
-        fileInfo.setForceUpdate(false);
-        fileInfo.setDataNode(new DisplayDataNode(profileDesc.getName(), false, profileDesc, true));
-        adminReg.delete(fileInfo, PRINCIPAL_ADMIN); //Profile do not need to be forced they cannot be used by other profiles
-        assertEquals(0, testRegistry.getProfileDescriptions().size());
+        assertEquals(1, testRegistry.getProfileDescriptions().size());
+        fileInfo.setForceUpdate(false);
+        fileInfo.setDataNode(new DisplayDataNode(profileDesc.getName(), false, profileDesc, ComponentStatus.PUBLIC));
+        adminReg.delete(fileInfo, PRINCIPAL_ADMIN); //Profile do not need to be forced they cannot be used by other profiles
+        assertEquals(0, testRegistry.getProfileDescriptions().size());
     }
 }