From 54011d7230a77c505ba902488c1661a04799f9d2 Mon Sep 17 00:00:00 2001 From: Stephen Kraffmiller Date: Thu, 16 Jul 2020 14:49:47 -0400 Subject: [PATCH] #4813 fix failing test --- .../iq/dataverse/datasetutility/AddReplaceFileHelper.java | 2 +- src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java | 7 +++++-- 2 files changed, 6 insertions(+), 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 index 39c0e9c366a..4928100dfff 100644 --- 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 index cfae7f8fc9f..4d8c6e2a8d9 100644 --- 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));