Changeset 671

Timestamp:

09/06/10 11:27:45 (14 years ago)

Author:

patdui

Message:

• added forceUpdate test

Location:

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry

Files:

• AdminRegistryTest.java (added)
• CMDComponentSpecExpanderTest.java (modified) (5 diffs)
• ComponentRegistryFactoryTest.java (modified) (2 diffs)
• ComponentRegistryImplTest.java (modified) (5 diffs)
• ComponentRegistryTestCase.java (added)
• frontend/FileInfoTest.java (modified) (2 diffs)
• rest/ComponentRegistryRestServiceTestCase.java (modified) (3 diffs)
• rest/MDValidatorTest.java (modified) (3 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/CMDComponentSpecExpanderTest.java

@@ -24 +24 @@
     @Test
     public void testExpandProfileWithNestedComponents() throws Exception {
-        ComponentRegistryImpl registry = ComponentRegistryImplTest.getTestRegistry(getRegistryDir());
+        ComponentRegistryImpl registry = ComponentRegistryTestCase.getTestRegistry(getRegistryDir());
 
         String content = "";
@@ -86 +86 @@
     @Test
     public void testExpandProfileWithNestedComponentsFromUserRegistry() throws Exception {
-        ComponentRegistryImpl registry = ComponentRegistryImplTest.getTestRegistry(getRegistryDir());
+        ComponentRegistryImpl registry = ComponentRegistryTestCase.getTestRegistry(getRegistryDir());
         ComponentRegistryImpl userRegistry = (ComponentRegistryImpl) ComponentRegistryFactory.getInstance().getComponentRegistry(true,
                 DummyPrincipal.DUMMY_CREDENTIALS);
@@ -146 +146 @@
     @Test
     public void testExpandEmbeddedWithNested() throws Exception {
-        ComponentRegistryImpl registry = ComponentRegistryImplTest.getTestRegistry(getRegistryDir());
+        ComponentRegistryImpl registry = ComponentRegistryTestCase.getTestRegistry(getRegistryDir());
 
         String content = "";
@@ -204 +204 @@
     private File getRegistryDir() {
         if (tmpRegistryDir == null)
-            tmpRegistryDir = ComponentRegistryImplTest.createTempRegistryDir();
+            tmpRegistryDir = ComponentRegistryTestCase.createTempRegistryDir();
         return tmpRegistryDir;
     }
@@ -210 +210 @@
     @After
     public void cleanupRegistryDir() {
-        ComponentRegistryImplTest.cleanUpRegistryDir(tmpRegistryDir);
+        ComponentRegistryTestCase.cleanUpRegistryDir(tmpRegistryDir);
         tmpRegistryDir = null;
     }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/ComponentRegistryFactoryTest.java

@@ -101 +101 @@
     @Before
     public void startClean() {
-        registryDir = ComponentRegistryImplTest.createTempRegistryDir();
+        registryDir = ComponentRegistryTestCase.createTempRegistryDir();
         Configuration.getInstance().setRegistryRoot(registryDir);
         Configuration.getInstance().init();
@@ -109 +109 @@
     @After
     public void cleanup() {
-        ComponentRegistryImplTest.cleanUpRegistryDir(registryDir);
+        ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     }
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/ComponentRegistryImplTest.java

@@ -11 +11 @@
 import java.io.File;
 import java.io.OutputStream;
-import java.security.Principal;
 import java.util.Calendar;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -21 +18 @@
 import javax.xml.bind.JAXBException;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
-import org.junit.After;
 import org.junit.Test;
 
@@ -33 +28 @@
 import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
 
-public class ComponentRegistryImplTest {
-
-    private File tmpRegistryDir;
-    private final static UserCredentials USER_CREDS = DummyPrincipal.DUMMY_CREDENTIALS;
-    private static final Principal PRINCIPAL_ADMIN = new DummyPrincipal("admin");
+public class ComponentRegistryImplTest extends ComponentRegistryTestCase {
 
     @Test
@@ -420 +411 @@
         assertEquals(0, registry.getComponentDescriptions().size());
     }
-    
-    //TODO PD make test for still in use component
 
     @Test
@@ -536 +525 @@
     }
 
-    private File getRegistryDir() {
-        if (tmpRegistryDir == null)
-            tmpRegistryDir = createTempRegistryDir();
-        return tmpRegistryDir;
-    }
-
-    @After
-    public void cleanupRegistryDir() {
-        ComponentRegistryFactory.getInstance().reset();
-        cleanUpRegistryDir(tmpRegistryDir);
-        tmpRegistryDir = null;
-    }
-
-    public static ComponentRegistryImpl getTestRegistry(File registryRoot) {
-        Configuration config = Configuration.getInstance();
-        config.setRegistryRoot(registryRoot);
-        Set<String> adminUsers = new HashSet<String>();
-        adminUsers.add(PRINCIPAL_ADMIN.getName());
-        config.setAdminUsers(adminUsers);
-        config.init();
-        ComponentRegistryFactory.getInstance().reset();
-        ComponentRegistryImpl register = (ComponentRegistryImpl) ComponentRegistryFactory.getInstance().getPublicRegistry();
-        register.setResourceConfig(config.getPublicResourceConfig()); //LOADS cache again but is necessary for tests normally we wouldn't have this
-        return register;
-    }
-
-    public static File createTempRegistryDir() {
-        final String baseTempPath = System.getProperty("java.io.tmpdir");
-        File tempDir = new File(baseTempPath + File.separator + "testRegistry_" + System.currentTimeMillis());
-        tempDir.mkdir();
-        tempDir.deleteOnExit();
-        return tempDir;
-    }
-
-    public static void cleanUpRegistryDir(File registryDir) {
-        if (registryDir != null && registryDir.exists()) {
-            assertTrue(FileUtils.deleteQuietly(registryDir));
-        }
-    }
-
     /**
      * Testing a big xsd string is a bit hard, so doing a best effort by checking the xs:element which represent the nested components used

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

@@ -12 +12 @@
 
 import clarin.cmdi.componentregistry.ComponentRegistryImplTest;
+import clarin.cmdi.componentregistry.ComponentRegistryTestCase;
 import clarin.cmdi.componentregistry.Configuration;
 
@@ -20 +21 @@
     @Test
     public void testGetUserDir() throws Exception {
-        rootDir = ComponentRegistryImplTest.createTempRegistryDir();
+        rootDir = ComponentRegistryTestCase.createTempRegistryDir();
         Configuration.getInstance().setRegistryRoot(rootDir);
         FileInfo info = new FileInfo();

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

@@ -10 +10 @@
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
-import clarin.cmdi.componentregistry.ComponentRegistryImplTest;
+import clarin.cmdi.componentregistry.ComponentRegistryTestCase;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
@@ -60 +60 @@
     @Before
     public void setUpTestRegistry() throws Exception {
-        registryDir = ComponentRegistryImplTest.createTempRegistryDir();
-        testRegistry = ComponentRegistryImplTest.getTestRegistry(registryDir);
+        registryDir = ComponentRegistryTestCase.createTempRegistryDir();
+        testRegistry = ComponentRegistryTestCase.getTestRegistry(registryDir);
     }
 
@@ -73 +73 @@
     @After
     public void deleteAndRecreateEmptyRegistry() {
-        ComponentRegistryImplTest.cleanUpRegistryDir(registryDir);
+        ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     }
 

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

@@ -18 +18 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
-import clarin.cmdi.componentregistry.ComponentRegistryImplTest;
+import clarin.cmdi.componentregistry.ComponentRegistryTestCase;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
@@ -29 +29 @@
     @Before
     public void setUpTestRegistry() throws ParseException, JAXBException {
-        registryDir = ComponentRegistryImplTest.createTempRegistryDir();
-        testRegistry = ComponentRegistryImplTest.getTestRegistry(registryDir);
+        registryDir = ComponentRegistryTestCase.createTempRegistryDir();
+        testRegistry = ComponentRegistryTestCase.getTestRegistry(registryDir);
     }
 
     @After
     public void deleteRegistry() {
-        ComponentRegistryImplTest.cleanUpRegistryDir(registryDir);
+        ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     }
 
@@ -114 +114 @@
         String id1 = "component1";
         String id2 = "component2";
-        ComponentRegistry userRegistry = ComponentRegistryFactory.getInstance().getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
+        ComponentRegistry userRegistry = ComponentRegistryFactory.getInstance()
+                .getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
 
         String profileContent = "";