fix merge conflicts

DANS-KNAW-jp · Jun 29, 2023 · 88ef33d · 88ef33d
1 parent d5ba50f
commit 88ef33d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
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
@@ -85,7 +85,7 @@ void to_dataverse_dataset() throws Exception {
         var mapper = getMigrationMapper();
         var doc = readDocument("dataset.xml");
 
-        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", "otherId:something",  "otherIdVersion", "swordToken");
+        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", "otherId:something", "swordToken");
 
         var result = mapper.toDataverseDataset(doc, null, null, null, vaultMetadata, false, null, null);
         var str = new ObjectMapper()
@@ -99,7 +99,7 @@ void toDataverseDataset_should_include_has_organizational_identifier_from_argume
         var mapper = getNonMigrationMapper();
         var doc = readDocument("dataset-simple-with-doi.xml");
 
-        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", "doi:a/b", "otherIdVersion", "swordToken");
+        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", "doi:a/b", "swordToken");
 
         var result = mapper.toDataverseDataset(doc, null, null, null, vaultMetadata, false, "org-id", null);
         var str = new ObjectMapper()
@@ -116,7 +116,7 @@ void toDataverseDataset_should_not_include_otherId_if_null_is_passed() throws Ex
         var mapper = getMigrationMapper();
         var doc = readDocument("dataset-simple.xml");
 
-        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", null, null, "swordToken");
+        var vaultMetadata = new VaultMetadata("pid", "bagId", "nbn", null, "swordToken");
 
         var result = mapper.toDataverseDataset(doc, null, null, null, vaultMetadata, false, null, null);
         var str = new ObjectMapper()

diff --git a/src/test/java/nl/knaw/dans/ingest/core/service/mapper/SwordExamplesTest.java b/src/test/java/nl/knaw/dans/ingest/core/service/mapper/SwordExamplesTest.java
@@ -96,8 +96,6 @@ public void all_mappings_produces_most_documented_sub_fields() throws Exception
             // VLT001-2 dansDataversePid(version) generated by dataverse
             "dansBagId", // VLT003A
             "dansNbn", // VLT004A
-            "dansOtherId", // VLT005
-            "dansOtherIdVersion", // VLT006
             "dansSwordToken"); // VLT007A
         // TODO terms / restricted files // TRMnnn
         assertThat(dastaset.getDatasetVersion().getTermsOfAccess())