Merge pull request #185 from AY2122S2-CS2103T-W15-3/revert-151-change…

…-storage-file-name Revert "Refactor addressbook json files to TACH"
AY2122S2-CS2103T-W15-3 · Apr 11, 2022 · 27458af · 27458af
2 parents a1987ba + cea3766
commit 27458af
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/seedu/address/commons/core/LogsCenter.java b/src/main/java/seedu/address/commons/core/LogsCenter.java
@@ -18,7 +18,7 @@
 public class LogsCenter {
     private static final int MAX_FILE_COUNT = 5;
     private static final int MAX_FILE_SIZE_IN_BYTES = (int) (Math.pow(2, 20) * 5); // 5MB
-    private static final String LOG_FILE = "TACH.log";
+    private static final String LOG_FILE = "addressbook.log";
     private static Level currentLogLevel = Level.INFO;
     private static final Logger logger = LogsCenter.getLogger(LogsCenter.class);
     private static FileHandler fileHandler;

diff --git a/...orageTest/invalidAndValidStudentTACH.json → ...st/invalidAndValidStudentAddressBook.json b/...orageTest/invalidAndValidStudentTACH.json → ...st/invalidAndValidStudentAddressBook.json
diff --git a/...ssBookStorageTest/invalidStudentTACH.json → ...torageTest/invalidStudentAddressBook.json b/...ssBookStorageTest/invalidStudentTACH.json → ...torageTest/invalidStudentAddressBook.json
diff --git a/...essBookStorageTest/notJsonFormatTACH.json → ...StorageTest/notJsonFormatAddressBook.json b/...essBookStorageTest/notJsonFormatTACH.json → ...StorageTest/notJsonFormatAddressBook.json
diff --git a/...AddressBookTest/duplicateStudentTACH.json → ...BookTest/duplicateStudentAddressBook.json b/...AddressBookTest/duplicateStudentTACH.json → ...BookTest/duplicateStudentAddressBook.json
diff --git a/...leAddressBookTest/invalidStudentTACH.json → ...ssBookTest/invalidStudentAddressBook.json b/...leAddressBookTest/invalidStudentTACH.json → ...ssBookTest/invalidStudentAddressBook.json
diff --git a/...eAddressBookTest/typicalStudentsTACH.json → ...sBookTest/typicalStudentsAddressBook.json b/...eAddressBookTest/typicalStudentsTACH.json → ...sBookTest/typicalStudentsAddressBook.json
diff --git a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
@@ -9,5 +9,5 @@
       "z" : 99
     }
   },
-  "addressBookFilePath" : "TACH.json"
+  "addressBookFilePath" : "addressbook.json"
 }
diff --git a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
@@ -7,5 +7,5 @@
       "y" : 100
     }
   },
-  "addressBookFilePath" : "TACH.json"
+  "addressBookFilePath" : "addressbook.json"
 }
diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
@@ -47,17 +47,17 @@ public void read_missingFile_emptyResult() throws Exception {
 
     @Test
     public void read_notJsonFormat_exceptionThrown() {
-        assertThrows(DataConversionException.class, () -> readAddressBook("notJsonFormatTACH.json"));
+        assertThrows(DataConversionException.class, () -> readAddressBook("notJsonFormatAddressBook.json"));
     }
 
     @Test
     public void readAddressBook_invalidStudentAddressBook_throwDataConversionException() {
-        assertThrows(DataConversionException.class, () -> readAddressBook("invalidStudentTACH.json"));
+        assertThrows(DataConversionException.class, () -> readAddressBook("invalidStudentAddressBook.json"));
     }
 
     @Test
     public void readAddressBook_invalidAndValidStudentAddressBook_throwDataConversionException() {
-        assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidStudentTACH.json"));
+        assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidStudentAddressBook.json"));
     }
 
     @Test

diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
@@ -16,9 +16,9 @@
 public class JsonSerializableAddressBookTest {
 
     private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableAddressBookTest");
-    private static final Path TYPICAL_STUDENTS_FILE = TEST_DATA_FOLDER.resolve("typicalStudentsTACH.json");
-    private static final Path INVALID_STUDENT_FILE = TEST_DATA_FOLDER.resolve("invalidStudentTACH.json");
-    private static final Path DUPLICATE_STUDENT_FILE = TEST_DATA_FOLDER.resolve("duplicateStudentTACH.json");
+    private static final Path TYPICAL_STUDENTS_FILE = TEST_DATA_FOLDER.resolve("typicalStudentsAddressBook.json");
+    private static final Path INVALID_STUDENT_FILE = TEST_DATA_FOLDER.resolve("invalidStudentAddressBook.json");
+    private static final Path DUPLICATE_STUDENT_FILE = TEST_DATA_FOLDER.resolve("duplicateStudentAddressBook.json");
 
     @Test
     public void toModelType_typicalStudentsFile_success() throws Exception {

diff --git a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java b/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java
@@ -73,7 +73,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataConv
     private UserPrefs getTypicalUserPrefs() {
         UserPrefs userPrefs = new UserPrefs();
         userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100));
-        userPrefs.setAddressBookFilePath(Paths.get("TACH.json"));
+        userPrefs.setAddressBookFilePath(Paths.get("addressbook.json"));
         return userPrefs;
     }