diff --git a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/AbstractIT.java b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/AbstractIT.java index 18ccad74f3497dcd7c3d14e0eb2d58c2fc52b64b..537e2756f5fb6566a5c4a86a982b1ed41c93a30e 100644 --- a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/AbstractIT.java +++ b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/AbstractIT.java @@ -39,6 +39,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.env.Environment; import org.springframework.test.context.ActiveProfiles; @@ -55,6 +57,7 @@ import ch.unige.solidify.util.SudoRestClientTool; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @ExtendWith(SpringExtension.class) @SpringBootTest(properties = { "spring.cloud.bootstrap.enabled=true" }) +@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class) public abstract class AbstractIT { protected static final String DEFAULT_DESCRIPTION = "Default description"; diff --git a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/DLCMTestConstants.java b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/DLCMTestConstants.java index 274d4132b0c9a4efda845ef14c9c71c0a0070b3a..265ef4ce36c5e4dd8f58bdd67525c806e88491d2 100644 --- a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/DLCMTestConstants.java +++ b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/DLCMTestConstants.java @@ -31,16 +31,16 @@ import ch.unige.solidify.util.SolidifyTime; public class DLCMTestConstants { public static final int TRIES = 180; - public static final String PRESERVATION_POLICY_TEST = "PreservationPolicy with years retention for testing"; - public static final String PRESERVATION_POLICY_FOREVER_TEST = "PreservationPolicy with forever retention for testing"; - public static final String PRESERVATION_POLICY_MIN_RETENTION_TEST = "PreservationPolicy wiht minimun retetion for testing"; - public static final String SUBMISSION_POLICY_WITHOUT_APPROVAL_TEST = "SubmissionPolicy without approval for testing"; - public static final String SUBMISSION_POLICY_WITH_APPROVAL_TEST = "SubmissionPolicy with approval for testing"; - public static final String SUBMISSION_POLICY_WITH_AGREEMENT_FOR_FIRST_DEPOSIT_TEST = "SubmissionPolicy with approval for first deposit for testing"; - public static final String SUBMISSION_POLICY_WITH_AGREEMENT_FOR_ALL_DEPOSIT_TEST = "SubmissionPolicy with approval for all deposits for testing"; - public static final String SUBMISSION_POLICY_WITHOUT_APPROVAL_WITH_AGREEMENT_FOR_FIRST_DEPOSIT_TEST = "SubmissionPolicy without approval for first deposit for testing"; - public static final String SUBMISSION_POLICY_WITHOUT_APPROVAL_WITH_AGREEMENT_FOR_ALL_DEPOSIT_TEST = "SubmissionPolicy without approval for all deposits for testing"; - public static final String SUBMISSION_AGREEMENT_TEST_NAME = "SubmissionAgreement for testing"; + public static final String PRESERVATION_POLICY_TEST = "PreservationPolicy with years retention"; + public static final String PRESERVATION_POLICY_FOREVER_TEST = "PreservationPolicy with forever retention"; + public static final String PRESERVATION_POLICY_MIN_RETENTION_TEST = "PreservationPolicy with minimum retention"; + public static final String SUBMISSION_POLICY_WITHOUT_APPROVAL_TEST = "SubmissionPolicy without approval"; + public static final String SUBMISSION_POLICY_WITH_APPROVAL_TEST = "SubmissionPolicy with approval"; + public static final String SUBMISSION_POLICY_WITH_AGREEMENT_FOR_FIRST_DEPOSIT_TEST = "SubmissionPolicy with approval for first deposit"; + public static final String SUBMISSION_POLICY_WITH_AGREEMENT_FOR_ALL_DEPOSIT_TEST = "SubmissionPolicy with approval for all deposits"; + public static final String SUBMISSION_POLICY_WITHOUT_APPROVAL_WITH_AGREEMENT_FOR_FIRST_DEPOSIT_TEST = "SubmissionPolicy without approval for first deposit"; + public static final String SUBMISSION_POLICY_WITHOUT_APPROVAL_WITH_AGREEMENT_FOR_ALL_DEPOSIT_TEST = "SubmissionPolicy without approval for all deposits"; + public static final String SUBMISSION_AGREEMENT_TEST_NAME = "SubmissionAgreement"; public static final String PERMANENT_TEST_DATA_LABEL = "[Permanent Test Data] "; public static final String TEMPORARY_TEST_DATA_LABEL = "[Temporary Test Data] "; public static final String ARCHIVAL_UNIT_LABEL = "Archival Unit"; diff --git a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/admin/ArchiveTypeAsAdminIT.java b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/admin/ArchiveTypeAsAdminIT.java index 490ecd7847900aa21b0bdf7ec7747af2425ba4dc..509a3c5ea62aafdd86b6368325c95380d7533a18 100644 --- a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/admin/ArchiveTypeAsAdminIT.java +++ b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/admin/ArchiveTypeAsAdminIT.java @@ -57,7 +57,7 @@ class ArchiveTypeAsAdminIT extends AbstractIT { void creationTest() { final ArchiveType archiveType1 = new ArchiveType(); archiveType1.setMasterType(this.archiveTypeService.findOne(ArchiveType.DATASET_ID)); - archiveType1.setTypeName(DLCMTestConstants.getRandomNameWithTemporaryLabel("Archive Type for Testing")); + archiveType1.setTypeName(DLCMTestConstants.getRandomNameWithTemporaryLabel("Archive Type")); final ArchiveType archiveType2 = this.archiveTypeService.create(archiveType1); // Test the creation diff --git a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/init/InitDataIT.java b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/init/InitDataIT.java index 900fafdaf8c1f25ea97afea9e40148ad89564fc5..761c57b693212d0b2c82ed251181c3ebd54b493a 100644 --- a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/init/InitDataIT.java +++ b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/init/InitDataIT.java @@ -197,7 +197,7 @@ class InitDataIT extends AbstractIT { @Order(15) @Test void verifySubmissionAgreements() { - List<SubmissionAgreement> list = this.submissionAgreementClientService.searchByProperties(Map.of("name", DLCMTestConstants.PERMANENT_TEST_DATA_LABEL)); + List<SubmissionAgreement> list = this.submissionAgreementClientService.searchByProperties(Map.of("title", DLCMTestConstants.PERMANENT_TEST_DATA_LABEL)); assertEquals(1, list.size()); } diff --git a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/preingest/DepositSubmissionAgreementIT.java b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/preingest/DepositSubmissionAgreementIT.java index e464d29a1fa16106764b60ce651031677f358330..5135236047c5c1efd9c1cfa349a63280a50cfb98 100644 --- a/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/preingest/DepositSubmissionAgreementIT.java +++ b/DLCM-IntegrationTests/src/test/java/ch/dlcm/test/preingest/DepositSubmissionAgreementIT.java @@ -125,14 +125,14 @@ class DepositSubmissionAgreementIT extends AbstractPreingestIT { void submitDepositWithSubmissionAgreementForFirstDepositTest() { // Create first deposit final Deposit firstDepositCreated = this.archiveFirstDeposit( - "Temporary deposit for testing without approval & with submission agreement type for first deposit", + "Temporary deposit without approval and with submission agreement type for first deposit", false, SUBMISSION_POLICY_WITHOUT_APPROVAL_WITH_AGREEMENT_FOR_FIRST_DEPOSIT_TEST); assertNotNull(firstDepositCreated, "First deposit creation failed"); // Create a new deposit and see how there is not need to approveSubmissionAgreement final Deposit secondDeposit = this.depositITService.createLocalDeposit(DLCMTestConstants.PersistenceMode.TEMPORARY, - "Temporary deposit 2 for testing without approval & with submission agreement type for first deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); + "Temporary deposit 2 without approval & with submission agreement type for first deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); secondDeposit.setSubmissionPolicyId(firstDepositCreated.getSubmissionPolicyId()); secondDeposit.addItem(this.depositITService.createLocalDepositDataFile(secondDeposit)); final Deposit secondDepositCreated = this.depositITService.createRemoteDepositWithData(secondDeposit); @@ -148,14 +148,14 @@ class DepositSubmissionAgreementIT extends AbstractPreingestIT { void submitDepositWithSubmissionAgreementForAllDepositTest() { // Create first deposit final Deposit firstDepositCreated = this.archiveFirstDeposit( - "Temporary deposit for testing without approval & with submission agreement type for all deposit", + "Temporary deposit without approval and with submission agreement type for all deposit", false, SUBMISSION_POLICY_WITHOUT_APPROVAL_WITH_AGREEMENT_FOR_ALL_DEPOSIT_TEST); assertNotNull(firstDepositCreated, "First deposit creation failed"); // Create a new deposit and see how there is not need to approveSubmissionAgreement final Deposit secondDeposit = this.depositITService.createLocalDeposit(DLCMTestConstants.PersistenceMode.TEMPORARY, - "Temporary deposit 2 for testing without approval & with submission agreement type for all deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); + "Temporary deposit 2 without approval & with submission agreement type for all deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); secondDeposit.setSubmissionPolicyId(firstDepositCreated.getSubmissionPolicyId()); secondDeposit.addItem(this.depositITService.createLocalDepositDataFile(secondDeposit)); final Deposit secondDepositCreated = this.depositITService.createRemoteDepositWithData(secondDeposit); @@ -175,14 +175,14 @@ class DepositSubmissionAgreementIT extends AbstractPreingestIT { void approveDepositWithSubmissionAgreementForFirstDepositTest() { // Create first deposit final Deposit firstDepositCreated = this.archiveFirstDeposit( - "Temporary deposit for testing with submission agreement type for first deposit", + "Temporary deposit with submission agreement type for first deposit", true, SUBMISSION_POLICY_WITH_AGREEMENT_FOR_FIRST_DEPOSIT_TEST); assertNotNull(firstDepositCreated, "First deposit creation failed"); // Create a new deposit and see how there is not need to approveSubmissionAgreement final Deposit secondDeposit = this.depositITService.createLocalDepositWithSubmissionApprove(DLCMTestConstants.PersistenceMode.TEMPORARY, - "Temporary deposit 2 for testing with submission agreement type for first deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); + "Temporary deposit 2 with submission agreement type for first deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); secondDeposit.setSubmissionPolicyId(firstDepositCreated.getSubmissionPolicyId()); secondDeposit.addItem(this.depositITService.createLocalDepositDataFile(secondDeposit)); final Deposit secondDepositCreated = this.depositITService.createRemoteDepositWithData(secondDeposit); @@ -198,14 +198,14 @@ class DepositSubmissionAgreementIT extends AbstractPreingestIT { void approveDepositWithSubmissionAgreementForAllDepositTest() { // Create first deposit final Deposit firstDepositCreated = this.archiveFirstDeposit( - "Temporary deposit for testing with submission agreement type for all deposit", + "Temporary deposit with submission agreement type for all deposit", true, SUBMISSION_POLICY_WITH_AGREEMENT_FOR_ALL_DEPOSIT_TEST); assertNotNull(firstDepositCreated, "First deposit creation failed"); // Create a new deposit and see how there is not need to approveSubmissionAgreement final Deposit secondDeposit = this.depositITService.createLocalDepositWithSubmissionApprove(DLCMTestConstants.PersistenceMode.TEMPORARY, - "Temporary deposit 2 for testing with submission agreement type for all deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); + "Temporary deposit 2 with submission agreement type for all deposit", DEFAULT_DESCRIPTION, Role.MANAGER_ID, false); secondDeposit.setSubmissionPolicyId(firstDepositCreated.getSubmissionPolicyId()); secondDeposit.addItem(this.depositITService.createLocalDepositDataFile(secondDeposit)); final Deposit secondDepositCreated = this.depositITService.createRemoteDepositWithData(secondDeposit);