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

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/frontend/CMDItemInfoTest.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.BaseUnitTest;
 import clarin.cmdi.componentregistry.ComponentStatus;
-import clarin.cmdi.componentregistry.MDMarshaller;
-import static org.junit.Assert.assertEquals;
+import clarin.cmdi.componentregistry.RegistrySpace;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -15 +14 @@
 public class CMDItemInfoTest extends BaseUnitTest{
 
+    // this is component status "private/public" from the database v.s. registry space public/private
     @Test
     public void testGetUserDir() throws Exception {
         CMDItemInfo info = new CMDItemInfo(marshaller);
         //info.setDataNode(new FileNode(createFile("users/user1/components/c_123/description.xml"), false));
-        info.setDataNode(new DisplayDataNode("test", false, createDescription(), ComponentStatus.PRIVATE));
+        info.setDataNode(new DisplayDataNode("test", false, createDescription(), RegistrySpace.PRIVATE));
         assertTrue(info.isDeletable());
         assertFalse(info.isUndeletable());
         assertTrue(info.isEditable());
         assertFalse(info.getDataNode().isDeleted());
-        assertEquals(ComponentStatus.PRIVATE, info.getStatus());
+        assertEquals(RegistrySpace.PRIVATE, info.getSpace());
         //info.setDataNode(new FileNode(createFile("users/user1/components/deleted/c_123/description.xml"), true));
-        info.setDataNode(new DisplayDataNode("test", true, createDescription(), ComponentStatus.PRIVATE));
+        info.setDataNode(new DisplayDataNode("test", true, createDescription(), RegistrySpace.PRIVATE));
         assertFalse(info.isDeletable());
         assertTrue(info.isUndeletable());
         assertTrue(info.isEditable());
         assertTrue(info.getDataNode().isDeleted());
-        assertEquals(ComponentStatus.PRIVATE, info.getStatus());
+        assertEquals(RegistrySpace.PRIVATE, info.getSpace());
         //info.setDataNode(new FileNode(createFile("components/c_123/description.xml"), false));
-        info.setDataNode(new DisplayDataNode("test", false, createDescription(), ComponentStatus.PUBLISHED));
+        info.setDataNode(new DisplayDataNode("test", false, createDescription(), RegistrySpace.PUBLISHED));
         assertTrue(info.isDeletable());
         assertFalse(info.isUndeletable());
         assertTrue(info.isEditable());
-        assertEquals(ComponentStatus.PUBLISHED, info.getStatus());
+        assertEquals(RegistrySpace.PUBLISHED, info.getSpace());
         //info.setDataNode(new FileNode(createFile("components/c_123/"), false));
         info.setDataNode(new DisplayDataNode("test", false));
@@ -44 +44 @@
         assertFalse(info.isEditable());
         //info.setDataNode(new FileNode(createFile("components/deleted/c_123/description.xml"), true));
-        info.setDataNode(new DisplayDataNode("test", true, createDescription(), ComponentStatus.PUBLISHED));
+        info.setDataNode(new DisplayDataNode("test", true, createDescription(), RegistrySpace.PUBLISHED));
         assertFalse(info.isDeletable());
         assertTrue(info.isUndeletable());
         assertTrue(info.isEditable());
-        assertEquals(ComponentStatus.PUBLISHED, info.getStatus());
+        assertEquals(RegistrySpace.PUBLISHED, info.getSpace());
         assertTrue(info.getDescription().startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<profileDescription"));
         //info.setDataNode(new FileNode(createFile("components/deleted/c_123/"), true));