start auto save separately to fix unit test

* remove no longer needed workaround dependencies

Author: Death111

.github/workflows/mavenCi.yml

@@ -37,7 +37,7 @@ jobs:
           languages: 'java'
 
       - name: Build
-        run:  mvn -V -B clean package org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage -Dproject.version=${{ env.version }}-SNAPSHOT -Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true
+        run:  mvn -V -B clean package org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage -Dproject.version=${{ env.version }}-SNAPSHOT
 
       - name: Upload Build Artifact
         uses: actions/upload-artifact@v3

pom.xml

@@ -129,19 +129,6 @@
       <artifactId>hamcrest-library</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.testfx</groupId>
-      <artifactId>testfx-junit5</artifactId>
-      <version>4.0.16-alpha</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.testfx/openjfx-monocle -->
-    <dependency>
-      <groupId>org.testfx</groupId>
-      <artifactId>openjfx-monocle</artifactId>
-      <version>jdk-12.0.1+2</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

src/main/java/de/doubleslash/keeptime/App.java

@@ -95,6 +95,7 @@ public void init() throws Exception {
 
       model = springContext.getBean(Model.class);
       controller = springContext.getBean(Controller.class);
+      controller.enableAutoSave();
       model.setSpringContext(springContext);
    }
 

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -38,20 +38,28 @@
 
 @Service
 public class Controller {
-   private final long QUICK_SAVE_INTERVAL = 60;
 
    private static final Logger LOG = LoggerFactory.getLogger(Controller.class);
 
+   private final long AUTO_SAVE_INTERVAL_SECONDS = 60;
+   private Interval autoSaveInterval;
+
    private final Model model;
 
    private final DateProvider dateProvider;
 
    public Controller(final Model model, final DateProvider dateProvider) {
       this.model = model;
       this.dateProvider = dateProvider;
+   }
 
-      // initiate quicksaving
-      new Interval(QUICK_SAVE_INTERVAL).registerCallBack(() -> saveCurrentWork(dateProvider.dateTimeNow()));
+   public void enableAutoSave() {
+      LOG.info("Enabling auto save with interval '{}' seconds.", AUTO_SAVE_INTERVAL_SECONDS);
+      autoSaveInterval = new Interval(AUTO_SAVE_INTERVAL_SECONDS);
+      autoSaveInterval.registerCallBack(() -> {
+         LOG.debug("Auto saving current work.");
+         saveCurrentWork(dateProvider.dateTimeNow());
+      });
    }
 
    public void changeProject(final Project newProject) {
@@ -178,7 +186,7 @@ public void deleteProject(final Project p) {
          changeProject(model.getIdleProject());
       }
 
-      LOG.info("Disabeling project '{}'.", p);
+      LOG.info("Disabling project '{}'.", p);
 
       final int indexToRemove = p.getIndex();
       p.setEnabled(false); // we don't delete it because of the referenced work
@@ -317,7 +325,7 @@ public void setComment(final String notes) {
    }
 
    /**
-    * Calculate todays seconds counted as work
+    * Calculate today's seconds counted as work
     */
    public long calcTodaysWorkSeconds() {
       final List<Work> workItems = new ArrayList<>();
@@ -338,16 +346,12 @@ public long calcTodaysWorkSeconds() {
    }
 
    /**
-    * Calculate todays present seconds (work+nonWork)
+    * Calculate today's present seconds (work+nonWork)
     */
    public long calcTodaysSeconds() {
       return calcSeconds(model.getPastWorkItems());
    }
 
-   public ObservableList<Project> getAvailableProjects() {
-      return model.getAvailableProjects();
-   }
-
    public long calcSeconds(final List<Work> workItems) {
       long seconds = 0;
 

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

@@ -32,7 +32,6 @@
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -45,10 +44,7 @@
 import de.doubleslash.keeptime.model.repos.SettingsRepository;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
 import javafx.scene.paint.Color;
-import org.testfx.framework.junit5.ApplicationExtension;
 
-
-@ExtendWith(ApplicationExtension.class)
 class ControllerTest {
 
    private static Controller testee;