From b03943cbcd3ede4d65f6bd559739fe38b039adbf Mon Sep 17 00:00:00 2001 From: Shengmin Date: Wed, 17 Oct 2018 17:19:45 +0800 Subject: [PATCH 1/2] change file path of wishbook --- src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json | 2 +- src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json | 2 +- .../java/seedu/address/storage/JsonUserPrefsStorageTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json index 571a303aaa70..011d88066f7b 100644 --- a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json +++ b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json @@ -9,5 +9,5 @@ "z" : 99 } }, - "wishBookFilePath" : "wishbook.xml" + "wishBookFilePath" : "data\\wishbook.xml" } diff --git a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json index 79c7fba01054..52baa93082e9 100644 --- a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json +++ b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json @@ -8,5 +8,5 @@ } }, "wishTransactionFilePath" : "data\\wishtransaction.xml", - "wishBookFilePath" : "wishbook.xml" + "wishBookFilePath" : "data\\wishbook.xml" } diff --git a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java b/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java index 0b9dadbe7e33..11f9dd30d5bc 100644 --- a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java +++ b/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java @@ -82,7 +82,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataConv private UserPrefs getTypicalUserPrefs() { UserPrefs userPrefs = new UserPrefs(); userPrefs.setGuiSettings(1000, 500, 300, 100); - userPrefs.setWishBookFilePath(Paths.get("wishbook.xml")); + userPrefs.setWishBookFilePath(Paths.get("data", "wishbook.xml")); return userPrefs; } From 85e3b5c8008a836b869e9f9f48490d228d04d940 Mon Sep 17 00:00:00 2001 From: Shengmin Date: Thu, 18 Oct 2018 09:36:52 +0800 Subject: [PATCH 2/2] bug fix jsonUserPrefsTest, change file path in UserPrefs --- src/main/java/seedu/address/model/UserPrefs.java | 2 +- src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json | 2 +- src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json | 2 +- .../java/seedu/address/storage/JsonUserPrefsStorageTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/seedu/address/model/UserPrefs.java index fc67d6ed6227..1ba8d2b488ce 100644 --- a/src/main/java/seedu/address/model/UserPrefs.java +++ b/src/main/java/seedu/address/model/UserPrefs.java @@ -13,7 +13,7 @@ public class UserPrefs { private GuiSettings guiSettings; private Path wishTransactionFilePath = Paths.get("data", "wishtransaction.xml"); - private Path wishBookFilePath = Paths.get("wishbook.xml"); + private Path wishBookFilePath = Paths.get("data", "wishbook.xml"); public UserPrefs() { setGuiSettings(500, 500, 0, 0); diff --git a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json index 011d88066f7b..571a303aaa70 100644 --- a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json +++ b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json @@ -9,5 +9,5 @@ "z" : 99 } }, - "wishBookFilePath" : "data\\wishbook.xml" + "wishBookFilePath" : "wishbook.xml" } diff --git a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json index 52baa93082e9..79c7fba01054 100644 --- a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json +++ b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json @@ -8,5 +8,5 @@ } }, "wishTransactionFilePath" : "data\\wishtransaction.xml", - "wishBookFilePath" : "data\\wishbook.xml" + "wishBookFilePath" : "wishbook.xml" } diff --git a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java b/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java index 11f9dd30d5bc..0b9dadbe7e33 100644 --- a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java +++ b/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java @@ -82,7 +82,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataConv private UserPrefs getTypicalUserPrefs() { UserPrefs userPrefs = new UserPrefs(); userPrefs.setGuiSettings(1000, 500, 300, 100); - userPrefs.setWishBookFilePath(Paths.get("data", "wishbook.xml")); + userPrefs.setWishBookFilePath(Paths.get("wishbook.xml")); return userPrefs; }