Fix for when status reports are disabled (#2454)

* StatusPollTimer can now properly set the update interval * Removed unused code * Updated dependencies * Updated test to work on JDK17
winder · Feb 6, 2024 · 105ae59 · 105ae59
1 parent 9ff4267
commit 105ae59
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 360 deletions.
diff --git a/pom.xml b/pom.xml
@@ -53,15 +53,15 @@
     <gluegen.version>2.5.0</gluegen.version>
     <jogl.version>2.5.0</jogl.version>
     <miglayout.version>3.7.4</miglayout.version>
-    <guava.version>28.1-jre</guava.version>
+    <guava.version>33.0.0-jre</guava.version>
     <jssc.version>2.8.0</jssc.version>
     <jserialcomm.version>2.10.4</jserialcomm.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-io.version>2.14.0</commons-io.version>
     <commons-csv.version>1.9.0</commons-csv.version>
     <gson.version>2.10.1</gson.version>
     <jmf.version>2.1.1e</jmf.version>
-    <zxing.version>3.4.0</zxing.version>
+    <zxing.version>3.5.3</zxing.version>
     <qrgen.version>1.4</qrgen.version>
     <jacoco.version>0.8.7</jacoco.version>
     <swing-layout.version>1.0.3</swing-layout.version>
@@ -78,9 +78,11 @@
     <ugs.maven-shade-plugin.version>3.4.1</ugs.maven-shade-plugin.version>
     <ugs.progressbar.version>0.7.2</ugs.progressbar.version>
     <ugs.commons-cli.version>1.4</ugs.commons-cli.version>
-    <ugs.easymock.version>3.4</ugs.easymock.version>
+    <ugs.easymock.version>5.2.0</ugs.easymock.version>
     <ugs.maven-assembly-plugin.version>2.5.3</ugs.maven-assembly-plugin.version>
-    <ugs.snakeyaml.version>1.30</ugs.snakeyaml.version>
+    <ugs.snakeyaml.version>2.2</ugs.snakeyaml.version>
+    <ugs.nashorn-core.version>15.4</ugs.nashorn-core.version>
+    <ugs.jackson.version>2.15.3</ugs.jackson.version>
 
     <!-- Sets the timestamp format -->
     <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>

diff --git a/ugs-core/pom.xml b/ugs-core/pom.xml
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.openjdk.nashorn</groupId>
             <artifactId>nashorn-core</artifactId>
-            <version>15.4</version>
+            <version>${ugs.nashorn-core.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/ugs-core/src/com/willwinder/universalgcodesender/StatusPollTimer.java b/ugs-core/src/com/willwinder/universalgcodesender/StatusPollTimer.java
@@ -118,7 +118,7 @@ public void receivedStatus() {
      */
     public void setUpdateInterval(int updateInterval) {
         this.updateInterval = Math.max(updateInterval, 10);
-        if (timer.isRunning()) {
+        if (timer != null && timer.isRunning()) {
             stop();
             start();
         }

diff --git a/ugs-core/src/com/willwinder/universalgcodesender/model/GUIBackend.java b/ugs-core/src/com/willwinder/universalgcodesender/model/GUIBackend.java
@@ -697,7 +697,7 @@ public void applySettingsToController(Settings settings, IController controller)
                     .append(Localization.getString("firmware.feature.linesToArc")).append(NEW_LINE)
                     .append(Localization.getString("firmware.feature.statusUpdates")).append(NEW_LINE)
                     .append(Localization.getString("firmware.feature.statusUpdateRate"));
-
+            logger.log(Level.SEVERE, "Could not load firmware settings", ex);
             throw new Exception(message.toString(), ex);
         }
     }

diff --git a/ugs-core/test/com/willwinder/universalgcodesender/AbstractControllerTest.java b/ugs-core/test/com/willwinder/universalgcodesender/AbstractControllerTest.java
@@ -33,24 +33,31 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.universalgcodesender.utils.SimpleGcodeStreamReader;
 import org.apache.commons.io.FileUtils;
 import org.easymock.EasyMock;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.or;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
 import org.easymock.IMockBuilder;
 import org.junit.AfterClass;
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertEquals;
-
 /**
  *
  * @author wwinder
  */
 public class AbstractControllerTest {
-    
+
     private AbstractCommunicator mockCommunicator;
     private ControllerListener mockListener;
     private MessageService mockMessageService;
@@ -68,9 +75,8 @@ public void init() throws IllegalArgumentException {
         mockMessageService = EasyMock.createMock(MessageService.class);
         gcodeCreator = new DefaultCommandCreator();
 
-        IMockBuilder<AbstractController> instanceBuilder = EasyMock
-                .createMockBuilder(AbstractController.class)
-                .addMockedMethods(
+        IMockBuilder<AbstractController> instanceBuilder = EasyMock.createMockBuilder(AbstractController.class);
+        instanceBuilder.addMockedMethods(
                         "closeCommBeforeEvent",
                         "closeCommAfterEvent",
                         "openCommAfterEvent",
@@ -134,7 +140,7 @@ private void streamInstanceExpectUtility() throws Exception {
     private void startStreamExpectation(String port, int rate) throws Exception {
         openInstanceExpectUtility(port, rate);
         streamInstanceExpectUtility();
-        
+
         // Making sure the commands get queued.
         mockCommunicator.queueStreamForComm(anyObject(IGcodeStreamReader.class));
         expect(expectLastCall()).times(1);
@@ -172,7 +178,7 @@ public void testQueueCommand() throws Exception {
 
         openInstanceExpectUtility(port, rate);
         streamInstanceExpectUtility();
-        
+
         // Making sure the commands get queued.
         mockCommunicator.queueStreamForComm(anyObject(IGcodeStreamReader.class));
         expect(expectLastCall()).times(1);
@@ -200,7 +206,7 @@ public void testQueueCommands() throws Exception {
 
         openInstanceExpectUtility(port, rate);
         streamInstanceExpectUtility();
-        
+
         // Making sure the commands get queued.
         mockCommunicator.queueStreamForComm(anyObject(IGcodeStreamReader.class));
         expect(expectLastCall()).times(1);

diff --git a/ugs-core/test/com/willwinder/universalgcodesender/StatusPollTimerTest.java b/ugs-core/test/com/willwinder/universalgcodesender/StatusPollTimerTest.java
@@ -0,0 +1,26 @@
+package com.willwinder.universalgcodesender;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class StatusPollTimerTest {
+    private StatusPollTimer statusPollTimer;
+
+    @Mock
+    private IController controller;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        statusPollTimer = new StatusPollTimer(controller);
+    }
+
+    @Test
+    public void setUpdateIntervalShouldSetTheIntervalWhenTimerIsNotRunning() {
+        statusPollTimer.setUpdateInterval(100);
+        assertEquals(100, statusPollTimer.getUpdateInterval());
+    }
+}
diff --git a/ugs-pendant/pom.xml b/ugs-pendant/pom.xml
@@ -85,17 +85,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.15.3</version>
+            <version>${ugs.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.15.3</version>
+            <version>${ugs.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.15.3</version>
+            <version>${ugs.jackson.version}</version>
         </dependency>
 
         <!-- For WebSocket -->