Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change XML file from the original person data to calendar event data, Fix SelectCommandSystemTest #112

Merged
merged 13 commits into from
Nov 7, 2018

Conversation

bryanwongweiheng
Copy link

Fix regressions caused by changing xml as well

# Conflicts:
#	src/test/java/seedu/address/ui/TaskListPanelTest.java
#	src/test/java/seedu/address/ui/ToDoListEventCardTest.java
#	src/test/java/systemtests/AddEventCommandSystemTest.java
#	src/test/java/systemtests/ClearCalendarCommandSystemTest.java
#	src/test/java/systemtests/DeleteEventCommandSystemTest.java
#	src/test/java/systemtests/EditEventCommandSystemTest.java
#	src/test/java/systemtests/FindEventCommandSystemTest.java
#	src/test/java/systemtests/HelpCommandSystemTest.java
#	src/test/java/systemtests/SelectCommandSystemTest.java
# Conflicts:
#	src/test/java/seedu/address/ui/TaskListPanelTest.java
#	src/test/java/seedu/address/ui/ToDoListEventCardTest.java
#	src/test/java/systemtests/AddEventCommandSystemTest.java
#	src/test/java/systemtests/ClearCalendarCommandSystemTest.java
#	src/test/java/systemtests/DeleteEventCommandSystemTest.java
#	src/test/java/systemtests/EditEventCommandSystemTest.java
#	src/test/java/systemtests/FindEventCommandSystemTest.java
#	src/test/java/systemtests/HelpCommandSystemTest.java
#	src/test/java/systemtests/SelectCommandSystemTest.java
@bryanwongweiheng bryanwongweiheng changed the title Change XML file from the original person data to calendar event data Change XML file from the original person data to calendar event data, Fix SelectCommandSystemTest Nov 7, 2018
@coveralls
Copy link

coveralls commented Nov 7, 2018

Pull Request Test Coverage Report for Build 261

  • 109 of 127 (85.83%) changed or added relevant lines in 37 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+2.2%) to 87.319%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/main/java/seedu/address/logic/commands/EditEventCommand.java 17 18 94.44%
src/main/java/seedu/address/MainApp.java 1 3 33.33%
src/main/java/seedu/address/commons/events/ui/SwitchTabEvent.java 0 2 0.0%
src/main/java/seedu/address/model/calendarevent/DateTimeInfo.java 0 2 0.0%
src/main/java/seedu/address/storage/XmlAdaptedToDoListEvent.java 3 5 60.0%
src/main/java/seedu/address/ui/MainWindow.java 7 16 43.75%
Files with Coverage Reduction New Missed Lines %
src/main/java/seedu/address/ui/MainWindow.java 1 71.43%
Totals Coverage Status
Change from base Build 256: 2.2%
Covered Lines: 2045
Relevant Lines: 2342

💛 - Coveralls

# Conflicts:
#	src/main/java/seedu/address/logic/commands/Command.java
#	src/main/java/seedu/address/model/calendarevent/DateTime.java
#	src/main/resources/view/DarkTheme.css
#	src/main/resources/view/MainWindow.fxml
#	src/main/resources/view/ToDoListEventCard.fxml
TODO: refactor MainWindow (it has too many responsibilities now)
@SleepySanjinLi
Copy link

seems good to merge

throw new AssertionError(e);
}
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a random qn, why are so many edits just adding and deleting the same things?

+ DESCRIPTION_DESC_TUTORIAL + START_DESC_TUTORIAL + END_DESC_TUTORIAL
+ VENUE_DESC_TUTORIAL + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
+ DESCRIPTION_DESC_TUTORIAL + START_DESC_TUTORIAL + END_DESC_TUTORIAL
+ VENUE_DESC_TUTORIAL + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably (eventually) replace the TAG_DESC_HUSBAND and TAG_DESC_FRIEND to something more relevant, like PROJECT or something.

TagsPredicate tagsPredicate = prepareTagsPredicate("");
FindEventCommand command = new FindEventCommand(predicate, comparator, tagsPredicate);
expectedModel.updateFilteredCalendarEventList(predicate);
expectedModel.sortFilteredCalendarEventList(comparator); // added because FindEventCommand sorts as well
assertCommandSuccess(command, model, commandHistory, expectedMessage, expectedModel);
assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getFilteredCalendarEventList());
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 3 should also eventually be renamed as events. Maybe can put as a TODO?

@vig42
Copy link

vig42 commented Nov 7, 2018

Looks great!

@vig42 vig42 merged commit e0895fd into CS2103-AY1819S1-T10-1:master Nov 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants