#54: Fix uitests

itsallcode · Dec 5, 2020 · 378ad46 · 378ad46
1 parent 5223006
commit 378ad46
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/jfxui/src/uiTest/java/org/itsallcode/whiterabbit/jfxui/ActivitiesTest.java b/jfxui/src/uiTest/java/org/itsallcode/whiterabbit/jfxui/ActivitiesTest.java
@@ -231,13 +231,13 @@ void toggleRemainderDurationUpdatedAtMinuteTick()
     }
 
     @Test
-    void addActivitySelectRemainder()
+    void addActivityDeselectRemainder()
     {
         addActivity();
 
         final JavaFxTable<ActivityPropertyAdapter> activitiesTable = app().activitiesTable().table();
         robot.clickOn(activitiesTable.getTableCell(0, "remainder"));
-        activitiesTable.assertRowContent(0, ActivitiesTableExpectedRow.defaultRow().withRemainder(true).build());
+        activitiesTable.assertRowContent(0, ActivitiesTableExpectedRow.defaultRow().withRemainder(false).build());
     }
 
     @Test
@@ -249,7 +249,8 @@ void addActivitySelectProject()
         final Node projectCell = activitiesTable.getTableCell(0, "project");
 
         robot.doubleClickOn(projectCell).clickOn(projectCell).type(KeyCode.ENTER);
-        activitiesTable.assertRowContent(0, ActivitiesTableExpectedRow.defaultRow().withProject(PROJECT1).build());
+        activitiesTable.assertRowContent(0,
+                ActivitiesTableExpectedRow.defaultRow().withRemainder(true).withProject(PROJECT1).build());
     }
 
     @Test
@@ -321,12 +322,14 @@ private void addActivity()
         time().tickMinute();
         final ActivitiesTable activities = app().activitiesTable();
 
+        final JavaFxTable<ActivityPropertyAdapter> table = activities.table();
+        final boolean isFirstActivity = table.getRowCount() == 0;
         activities.addActivity();
 
-        final Builder expectedRowContent = ActivitiesTableExpectedRow.defaultRow();
+        final Builder expectedRowContent = ActivitiesTableExpectedRow.defaultRow().withRemainder(isFirstActivity);
 
-        assertAll(() -> activities.table().assertRowCount(1),
-                () -> activities.table().assertRowContent(0, expectedRowContent.build()));
+        assertAll(() -> table.assertRowCount(1),
+                () -> table.assertRowContent(0, expectedRowContent.build()));
     }
 
     private void selectCurrentDay()

diff --git a/jfxui/src/uiTest/java/org/itsallcode/whiterabbit/jfxui/testutil/model/ActivitiesTable.java b/jfxui/src/uiTest/java/org/itsallcode/whiterabbit/jfxui/testutil/model/ActivitiesTable.java
@@ -41,7 +41,11 @@ public void addRemainderActivity(Project project, String comment)
             final Node projectCell = table.getTableCell(rowIndex, "project");
             robot.doubleClickOn(projectCell).clickOn(projectCell).clickOn(project.getLabel());
         }
-        robot.clickOn(table.getTableCell(rowIndex, "remainder"));
+        final TableCell<?, ?> remainderCell = table.getTableCell(rowIndex, "remainder");
+        if (!(Boolean) remainderCell.getItem())
+        {
+            robot.clickOn(remainderCell);
+        }
         robot.doubleClickOn(table.getTableCell(rowIndex, "comment")).write(comment).type(KeyCode.ENTER);
     }
 
@@ -54,6 +58,12 @@ public void addActivity(Project project, Duration duration, String comment)
     {
         final int rowIndex = addActivity();
 
+        final TableCell<?, ?> remainderCell = table.getTableCell(rowIndex, "remainder");
+        if ((Boolean) remainderCell.getItem())
+        {
+            robot.clickOn(remainderCell);
+        }
+
         if (project != null)
         {
             final Node projectCell = table.getTableCell(rowIndex, "project");