improved Tests

Author: JSchraff

src/main/resources/layouts/manage-work.fxml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.gluonhq.charm.glisten.control.AutoCompleteTextField?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DatePicker?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Spinner?>
-<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
@@ -30,9 +31,10 @@
       <Label text="Project" GridPane.rowIndex="2" />
       <ComboBox fx:id="projectComboBox" prefWidth="400.0" visibleRowCount="4" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2" />
       <Label text="notes" GridPane.rowIndex="3" />
-      <TextField fx:id="noteTextBox" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
       <Spinner fx:id="startTimeSpinner" editable="true" GridPane.columnIndex="2" />
       <Spinner fx:id="endTimeSpinner" editable="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+      <AutoCompleteTextField />
+      <TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3" />
    </children>
    <padding>
       <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -52,9 +52,12 @@ public class ControllerTest {
    private Model model;
    private DateProvider mockedDateProvider;
 
+   private WorkRepository mockedWorkRepository;
+
    @Before
    public void beforeTest() {
-      model = new Model(Mockito.mock(ProjectRepository.class), Mockito.mock(WorkRepository.class),
+      mockedWorkRepository = Mockito.mock(WorkRepository.class);
+      model = new Model(Mockito.mock(ProjectRepository.class), mockedWorkRepository,
             Mockito.mock(SettingsRepository.class));
       mockedDateProvider = Mockito.mock(DateProvider.class);
       testee = new Controller(model, mockedDateProvider);
@@ -348,14 +351,14 @@ public void shouldUpdateWorkItemPersistentlyWhenWorkItemIsEdited() {
       testee.editWork(originalWork, newWork);
 
       final Work testWork = model.getPastWorkItems().get(0);
-      assertThat("edited StartTime is not equal", newWork.getStartTime(), equalTo(testWork.getStartTime()));
-      assertThat("edited EndTime is not equal", newWork.getEndTime(), equalTo(testWork.getEndTime()));
-      assertThat("edited CreationDate is not equal", newWork.getCreationDate(), equalTo(testWork.getCreationDate()));
-      assertThat("edited Notes are not equal", newWork.getNotes(), equalTo(testWork.getNotes()));
-      assertThat("edited Project is not equal", newWork.getProject(), equalTo(testWork.getProject()));
+      assertThat("start time is not updated", newWork.getStartTime(), equalTo(testWork.getStartTime()));
+      assertThat("end time is not updated", newWork.getEndTime(), equalTo(testWork.getEndTime()));
+      assertThat("creation date is not updated", newWork.getCreationDate(), equalTo(testWork.getCreationDate()));
+      assertThat("notes are not updated", newWork.getNotes(), equalTo(testWork.getNotes()));
+      assertThat("project is not updated", newWork.getProject(), equalTo(testWork.getProject()));
 
       final ArgumentCaptor<Work> argument = ArgumentCaptor.forClass(Work.class);
-      Mockito.verify(model.getWorkRepository(), Mockito.times(1)).save(argument.capture());
+      Mockito.verify(mockedWorkRepository, Mockito.times(1)).save(argument.capture());
       assertThat("not saved Persistent", originalWork, is(argument.getValue()));
 
    }
@@ -388,8 +391,9 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
             not(contains(newWork)));
 
       final ArgumentCaptor<Work> argument = ArgumentCaptor.forClass(Work.class);
-      Mockito.verify(model.getWorkRepository(), Mockito.times(1)).save(argument.capture());
-      assertThat("saved other Work persistently than what should be updated", argument.getValue(), is(originalWork));
+      Mockito.verify(mockedWorkRepository, Mockito.times(1)).save(argument.capture());
+      assertThat("saved other Work persistently than what should be updated", argument.getValue(),
+            not(is(notToBeUpdatedWork)));
 
    }