#4813 fix failing test

IQSS · Jul 16, 2020 · 54011d7 · 54011d7
1 parent 9350502
commit 54011d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
@@ -1255,7 +1255,7 @@ private boolean step_040_auto_checkForDuplicates(){
                 this.duplicateFileWarningFound = true;
                 this.duplicateFileWarningString = BundleUtil.getStringFromBundle("file.addreplace.warning.duplicate_file", 
                                 Arrays.asList(dupeName));
-                this.addErrorWarning(getBundleErr("warning.duplicate_file") + " " + dupeName + " " + getBundleErr("duplicate_file.continue")); 
+                this.addErrorWarning(this.duplicateFileWarningString); 
 
             }             
             finalFileList.add(df);

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
@@ -141,8 +141,11 @@ public void test_001_AddFileGood() {
 
         msgt("2nd requests: " + addTwiceResponse.prettyPrint());    //addResponse.prettyPrint();
 
-        String errMsg = BundleUtil.getStringFromBundle("file.addreplace.error.warning.duplicate_file");
-        String errMsgFromResponse = JsonPath.from(addTwiceResponse.body().asString()).getString("message");        
+        String dupeName = "dataverseproject.png";
+
+        String errMsg = BundleUtil.getStringFromBundle("file.addreplace.warning.duplicate_file",
+                Arrays.asList(dupeName));
+        String errMsgFromResponse = JsonPath.from(addTwiceResponse.body().asString()).getString("message");
         addTwiceResponse.then().assertThat()
                 .statusCode(OK.getStatusCode());
         assertTrue(errMsgFromResponse.contains(errMsg));