fix merge conflicts

DANS-KNAW-jp · Jun 29, 2023 · b49fb74 · b49fb74
1 parent 0a5ba23
commit b49fb74
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/test/java/nl/knaw/dans/ingest/core/service/mapper/DansDataVaultMetadataTest.java b/src/test/java/nl/knaw/dans/ingest/core/service/mapper/DansDataVaultMetadataTest.java
@@ -40,17 +40,17 @@ public class DansDataVaultMetadataTest {
 
     @Test
     public void VLT008_userId_should_map_to_dataSupplier_from_config_yml() throws Exception {
-        var vaultMetadata = new VaultMetadata("", "", "", "", "", "", "USER001");
+        var vaultMetadata = new VaultMetadata("", "", "", "", "", "USER001");
 
-        var result = mapper.toDataverseDataset(ddmWithCustomProfileContent(""), null, null, null, vaultMetadata, false, null);
+        var result = mapper.toDataverseDataset(ddmWithCustomProfileContent(""), null, null, null, vaultMetadata, false, null, null);
         assertThat(getPrimitiveSingleValueField("dansDataVaultMetadata", "dansDataSupplier", result))
             .isEqualTo("The Organization Name");
     }
 
     @Test
     public void VLT008_dataSupplier_should_ignore_not_configured_userId() throws Exception {
-        var vaultMetadata = new VaultMetadata("", "", "", "", "", "", "xxx");
-        var result = mapper.toDataverseDataset(ddmWithCustomProfileContent(""), null, null, null, vaultMetadata, false, null);
+        var vaultMetadata = new VaultMetadata("", "", "", "", "", "xxx");
+        var result = mapper.toDataverseDataset(ddmWithCustomProfileContent(""), null, null, null, vaultMetadata, false, null, null);
         assertThat(getFieldNamesOfMetadataBlocks(result).get("dansArchaeologyMetadata"))
             .doesNotContain("dansDataSupplier");
     }

diff --git a/...st/java/nl/knaw/dans/ingest/core/service/mapper/DepositToDvDatasetMetadataMapperTest.java b/...st/java/nl/knaw/dans/ingest/core/service/mapper/DepositToDvDatasetMetadataMapperTest.java
@@ -95,20 +95,20 @@ void to_dataverse_dataset() throws Exception {
     }
 
     @Test
-    void toDataverseDataset_should_include_otherId_from_ddm() throws Exception {
+    void toDataverseDataset_should_not_have_doi() throws Exception {
         var mapper = getMigrationMapper();
         var doc = readDocument("dataset-simple-with-doi.xml");
 
-        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", "doi:a/b", "otherIdVersion", "swordToken", "USER001");
+        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", "doi:a/b", "swordToken", "USER001");
 
-        var result = mapper.toDataverseDataset(doc, null, null, null, vaultMetadata, false, null);
+        var result = mapper.toDataverseDataset(doc, null, null, null, vaultMetadata, false, null, null);
         var str = new ObjectMapper()
             .writer()
             .withDefaultPrettyPrinter()
             .writeValueAsString(result);
 
         assertThat(str).doesNotContain("doi:a/b");
-        assertThat(str).contains("10.17026/easy-dans-doi");
+        assertThat(str).doesNotContain("10.17026/easy-dans-doi");
     }
 
     @Test