Skip to content

Commit 9bf4fa9

Browse files
committed
Add Checkstyle fixes
To pass the CI -NOTE ModelManager still need to write integration tests for MeetingBookStorage
1 parent 027fd6b commit 9bf4fa9

10 files changed

Lines changed: 42 additions & 26 deletions

File tree

src/main/java/seedu/address/MainApp.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@
2424
import seedu.address.model.person.AddressBook;
2525
import seedu.address.model.person.ReadOnlyAddressBook;
2626
import seedu.address.model.util.SampleDataUtil;
27-
import seedu.address.storage.*;
27+
import seedu.address.storage.AddressBookStorage;
28+
import seedu.address.storage.JsonAddressBookStorage;
29+
import seedu.address.storage.JsonMeetingBookStorage;
30+
import seedu.address.storage.JsonUserPrefsStorage;
31+
import seedu.address.storage.MeetingBookStorage;
32+
import seedu.address.storage.Storage;
33+
import seedu.address.storage.StorageManager;
34+
import seedu.address.storage.UserPrefsStorage;
2835
import seedu.address.ui.Ui;
2936
import seedu.address.ui.UiManager;
3037

src/main/java/seedu/address/model/ModelManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ public void setMeeting(Meeting target, Meeting editedMeeting) {
174174
requireAllNonNull(target, editedMeeting);
175175
meetingBook.setMeeting(target, editedMeeting);
176176
}
177+
//TODO: Set MeetingBook file path in userPrefs? low priority feature(nice to have)
178+
177179
//=========== Filtered Person List Accessors =============================================================
178180

179181
/**

src/main/java/seedu/address/storage/JsonMeetingBookStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package seedu.address.storage;
22

3+
import static java.util.Objects.requireNonNull;
4+
35
import java.io.IOException;
46
import java.nio.file.Path;
57
import java.util.Optional;
@@ -14,8 +16,6 @@
1416
import seedu.address.model.meeting.ReadOnlyMeetingBook;
1517

1618

17-
import static java.util.Objects.requireNonNull;
18-
1919
/**
2020
* Represents a storage for {@link MeetingBook}.
2121
*/

src/main/java/seedu/address/storage/JsonSerializableMeetingBook.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import seedu.address.commons.exceptions.IllegalValueException;
1212
import seedu.address.model.meeting.Meeting;
1313
import seedu.address.model.meeting.MeetingBook;
14-
import seedu.address.model.meeting.ReadOnlyMeetingBook;;
14+
import seedu.address.model.meeting.ReadOnlyMeetingBook;
1515

1616
/**
1717
* An Immutable MeetingBook that is serializable to JSON format.

src/main/java/seedu/address/storage/MeetingBookStorage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import seedu.address.commons.exceptions.DataConversionException;
99
import seedu.address.model.meeting.MeetingBook;
1010
import seedu.address.model.meeting.ReadOnlyMeetingBook;
11-
import seedu.address.model.person.AddressBook;
12-
import seedu.address.model.person.ReadOnlyAddressBook;
11+
1312

1413
/**
1514
* Represents a storage for {@link MeetingBook}.

src/main/java/seedu/address/storage/Storage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public interface Storage extends AddressBookStorage, UserPrefsStorage, MeetingBo
3737
Optional<ReadOnlyMeetingBook> readMeetingBook() throws DataConversionException, IOException;
3838

3939
@Override
40-
void saveMeetingBook(ReadOnlyMeetingBook MeetingBook) throws IOException;
40+
void saveMeetingBook(ReadOnlyMeetingBook meetingBook) throws IOException;
4141

4242

4343

src/test/java/seedu/address/logic/LogicManagerTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void setUp() {
4848
new JsonAddressBookStorage(temporaryFolder.resolve("addressBook.json"));
4949
JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
5050
JsonMeetingBookStorage meetingBookStorage = new JsonMeetingBookStorage(temporaryFolder.resolve(
51-
"meetingbook.json"));
51+
"meetingBook.json"));
5252
StorageManager storage = new StorageManager(addressBookStorage, meetingBookStorage, userPrefsStorage);
5353
logic = new LogicManager(model, storage);
5454
}
@@ -98,6 +98,11 @@ public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException
9898
assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredPersonList().remove(0));
9999
}
100100

101+
@Test
102+
public void getFilteredMeetingList_modifyList_throwsUnsupportedOperationException() {
103+
assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredMeetingList().remove(0));
104+
}
105+
101106
/**
102107
* Executes the command and confirms that
103108
* - no exceptions are thrown <br>

src/test/java/seedu/address/model/ModelManagerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.junit.jupiter.api.Test;
1616

1717
import seedu.address.commons.core.GuiSettings;
18+
import seedu.address.model.meeting.MeetingBook;
1819
import seedu.address.model.person.AddressBook;
1920
import seedu.address.model.person.NameContainsKeywordsPredicate;
2021
import seedu.address.testutil.AddressBookBuilder;
@@ -28,6 +29,7 @@ public void constructor() {
2829
assertEquals(new UserPrefs(), modelManager.getUserPrefs());
2930
assertEquals(new GuiSettings(), modelManager.getGuiSettings());
3031
assertEquals(new AddressBook(), new AddressBook(modelManager.getAddressBook()));
32+
assertEquals(new MeetingBook(), new MeetingBook(modelManager.getMeetingBook()));
3133
}
3234

3335
@Test

src/test/java/seedu/address/storage/JsonMeetingBookStorageTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package seedu.address.storage;
22

3-
import org.junit.jupiter.api.Test;
4-
import org.junit.jupiter.api.io.TempDir;
5-
import seedu.address.commons.exceptions.DataConversionException;
6-
import seedu.address.model.meeting.MeetingBook;
7-
import seedu.address.model.meeting.ReadOnlyMeetingBook;
8-
import seedu.address.model.person.AddressBook;
9-
import seedu.address.model.person.ReadOnlyAddressBook;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static seedu.address.testutil.Assert.assertThrows;
5+
import static seedu.address.testutil.TypicalMeetings.MEETING1;
6+
import static seedu.address.testutil.TypicalMeetings.MEETING6;
7+
import static seedu.address.testutil.TypicalMeetings.getTypicalMeetingBook;
108

119
import java.io.IOException;
1210
import java.nio.file.Path;
1311
import java.nio.file.Paths;
1412
import java.util.Optional;
1513

16-
import static org.junit.jupiter.api.Assertions.assertEquals;
17-
import static seedu.address.testutil.Assert.assertThrows;
14+
import org.junit.jupiter.api.Test;
15+
import org.junit.jupiter.api.io.TempDir;
16+
17+
import seedu.address.commons.exceptions.DataConversionException;
18+
import seedu.address.model.meeting.MeetingBook;
19+
import seedu.address.model.meeting.ReadOnlyMeetingBook;
1820

19-
import static seedu.address.testutil.TypicalMeetings.*;
20-
import static seedu.address.testutil.TypicalPersons.IDA;
2121

2222
public class JsonMeetingBookStorageTest {
2323
private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonMeetingBookStorageTest");
@@ -47,7 +47,7 @@ public void readMeetingBook_missingFile_returnsEmptyOptional() throws Exception
4747

4848
@Test
4949
public void readMeetingBook_invalidMeetingFile_throwsDataConversionException() throws Exception {
50-
assertThrows(DataConversionException.class, () -> readMeetingBook("invalidMeetingMeetingBook.json") );
50+
assertThrows(DataConversionException.class, () -> readMeetingBook("invalidMeetingMeetingBook.json"));
5151
}
5252

5353
@Test

src/test/java/seedu/address/storage/JsonSerializableMeetingBookTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package seedu.address.storage;
22

3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static seedu.address.testutil.Assert.assertThrows;
5+
6+
import java.nio.file.Path;
7+
import java.nio.file.Paths;
8+
39
import org.junit.jupiter.api.Test;
10+
411
import seedu.address.commons.exceptions.IllegalValueException;
512
import seedu.address.commons.util.JsonUtil;
613
import seedu.address.model.meeting.MeetingBook;
714
import seedu.address.testutil.TypicalMeetings;
815

916

10-
import java.nio.file.Path;
11-
import java.nio.file.Paths;
12-
13-
import static org.junit.jupiter.api.Assertions.assertEquals;
14-
import static seedu.address.testutil.Assert.assertThrows;
15-
1617
public class JsonSerializableMeetingBookTest {
1718
private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableMeetingBookTest");
1819
private static final Path TYPICAL_MEETINGS_FILE = TEST_DATA_FOLDER.resolve("sampleMeetingBook.json");

0 commit comments

Comments
 (0)