Use userRegistrationBuilder to delete userRegistration rather than us…

…erMetadataBuilder
dataquest-dev · Nov 27, 2024 · c5163a1 · c5163a1
1 parent 72963b6
commit c5163a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/dspace-api/src/test/java/org/dspace/builder/ClarinUserRegistrationBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ClarinUserRegistrationBuilder.java
@@ -58,6 +58,7 @@ public static void deleteClarinUserRegistration(Integer id) throws Exception {
             if (clarinUserRegistration != null) {
                 clarinUserRegistrationService.delete(c, clarinUserRegistration);
             }
+            c.restoreAuthSystemState();
             c.complete();
         }
     }

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinLicenseRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinLicenseRestRepositoryIT.java
@@ -36,7 +36,6 @@
 import org.dspace.builder.BitstreamBuilder;
 import org.dspace.builder.ClarinLicenseBuilder;
 import org.dspace.builder.ClarinLicenseLabelBuilder;
-import org.dspace.builder.ClarinUserMetadataBuilder;
 import org.dspace.builder.ClarinUserRegistrationBuilder;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
@@ -317,7 +316,7 @@ public void create() throws Exception {
                 ClarinLicenseBuilder.deleteClarinLicense(idRef.get());
             }
         }
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     // Edit

diff --git a/...server-webapp/src/test/java/org/dspace/app/rest/ClarinUserMetadataImportControllerIT.java b/...server-webapp/src/test/java/org/dspace/app/rest/ClarinUserMetadataImportControllerIT.java
@@ -35,7 +35,6 @@
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.builder.ClarinLicenseBuilder;
 import org.dspace.builder.ClarinLicenseLabelBuilder;
-import org.dspace.builder.ClarinUserMetadataBuilder;
 import org.dspace.builder.ClarinUserRegistrationBuilder;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
@@ -161,7 +160,7 @@ public void importUserMetadataWithEpersonTest() throws Exception {
         assertEquals(clarinUserMetadata.getTransaction().getToken(), "111");
 
         //clean all
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     @Test
@@ -208,7 +207,7 @@ public void importUserMetadataWithoutEpersonTest() throws Exception {
         assertEquals(clarinUserMetadata.getTransaction().getToken(), "111");
 
         //clean all
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     // The user metadata shouldn't be updated, but it should be added
@@ -268,8 +267,7 @@ public void importTwoTimesUserMetadataWithEpersonTest() throws Exception {
         assertEquals(clarinUserMetadata.getTransaction().getToken(), "111");
 
         //clean all
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
-
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     /**

diff --git a/...e-server-webapp/src/test/java/org/dspace/app/rest/ClarinUserMetadataRestControllerIT.java b/...e-server-webapp/src/test/java/org/dspace/app/rest/ClarinUserMetadataRestControllerIT.java
@@ -239,7 +239,7 @@ public void authorizedUserWithoutMetadata_shouldReturnToken() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.page.totalElements", is(1)));
 
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     @Test
@@ -293,7 +293,7 @@ public void authorizedUserWithoutMetadata_shouldSendEmail() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.page.totalElements", is(1)));
 
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     @Test
@@ -342,7 +342,8 @@ public void authorizedUserWithMetadata_shouldSendToken() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.page.totalElements", is(1)));
 
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     @Test
@@ -400,7 +401,7 @@ public void authorizedUserWithMetadata_shouldSendEmail() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.page.totalElements", is(1)));
 
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     // Confirmation = 1
@@ -563,7 +564,7 @@ public void shouldNotCreateDuplicateUserMetadataBasedOnHistory() throws Exceptio
                 .andExpect(jsonPath("$.page.totalElements", is(2)));
 
         // Delete all created user metadata - clean test environment
-        ClarinUserMetadataBuilder.deleteClarinUserMetadata(clarinUserRegistration);
+        ClarinUserRegistrationBuilder.deleteClarinUserRegistration(clarinUserRegistration.getID());
     }
 
     private WorkspaceItem createWorkspaceItemWithFile(boolean secondBitstream) {