Changeset 666

Timestamp:

09/06/10 07:25:50 (14 years ago)

Author:

patdui

Message:

• fixed tests

File:

• ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/ComponentRegistryImplTest.java (modified) (7 diffs)

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

@@ -157 +157 @@
         assertEquals(0, publicReg.getProfileDescriptions().size());
 
-        userReg.deleteMDComponent(cDesc.getId(), USER_CREDS.getPrincipal());
+        userReg.deleteMDComponent(cDesc.getId(), USER_CREDS.getPrincipal(), false);
         userReg.initCache();
         publicReg.initCache();
@@ -165 +165 @@
         assertEquals(0, publicReg.getProfileDescriptions().size());
 
-        publicReg.deleteMDComponent(cDesc.getId(), USER_CREDS.getPrincipal());
+        publicReg.deleteMDComponent(cDesc.getId(), USER_CREDS.getPrincipal(), false);
         userReg.deleteMDProfile(pDesc.getId(), USER_CREDS.getPrincipal());
         userReg.initCache();
@@ -353 +353 @@
         } catch (UserUnauthorizedException e) {
         }
-        register.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"));
+        register.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"), false);
 
         assertEquals(1, register.getProfileDescriptions().size());
@@ -376 +376 @@
         registry.registerMDComponent(description, testComp);
         try {
-            registry.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"));
+            registry.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"), false);
             fail("Should have thrown exception");
         } catch (UserUnauthorizedException e) {
@@ -384 +384 @@
         assertNotNull(registry.getMDComponent(description.getId()));
 
-        registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal());
+        registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal(), false);
 
         assertEquals(0, registry.getComponentDescriptions().size());
@@ -406 +406 @@
         registry.registerMDComponent(description, testComp);
         try {
-            registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal());
+            registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal(), false);
             fail("Should have thrown exception");
         } catch (DeleteFailedException e) {
         }
         assertEquals(1, registry.getComponentDescriptions().size());
-        registry.deleteMDComponent(description.getId(), PRINCIPAL_ADMIN);
+        registry.deleteMDComponent(description.getId(), PRINCIPAL_ADMIN, false);
         assertEquals(0, registry.getComponentDescriptions().size());
 
@@ -417 +417 @@
         registry.registerMDComponent(description, testComp);
         assertEquals(1, registry.getComponentDescriptions().size());
-        registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal()); //user workspace can always delete
+        registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal(), false); //user workspace can always delete
         assertEquals(0, registry.getComponentDescriptions().size());
     }
+    
+    //TODO PD make test for still in use component
 
     @Test