feat(language): numeric expressions

2 files changed, 25 insertions, 30 deletions

diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
index 49464d27..74695c9a 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
@@ -1,35 +1,35 @@
 package tools.refinery.language.web.tests;
 
-import static org.junit.jupiter.api.Assertions.fail;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class WebSocketIntegrationTestClient {
-        private static long TIMEOUT_MILLIS = Duration.ofSeconds(1).toMillis();
-        
+        private static final long TIMEOUT_MILLIS = Duration.ofSeconds(1).toMillis();
+
         private boolean finished = false;
 
-        private Object lock = new Object();
+        private final Object lock = new Object();
 
         private Throwable error;
 
         private int closeStatusCode;
 
-        private List<String> responses = new ArrayList<>();
-        
+        private final List<String> responses = new ArrayList<>();
+
         public int getCloseStatusCode() {
                 return closeStatusCode;
         }
-        
+
         public List<String> getResponses() {
                 return responses;
         }
@@ -38,7 +38,7 @@ public abstract class WebSocketIntegrationTestClient {
         public void onConnect(Session session) {
                 arrangeAndCatchErrors(session);
         }
-        
+
         private void arrangeAndCatchErrors(Session session) {
                 try {
                         arrange(session, responses.size());
@@ -46,8 +46,8 @@ public abstract class WebSocketIntegrationTestClient {
                         finishedWithError(e);
                 }
         }
-        
-        protected abstract void arrange(Session session, int responsesReceived) throws IOException; 
+
+        protected abstract void arrange(Session session, int responsesReceived) throws IOException;
 
         @OnWebSocketClose
         public void onClose(int statusCode, String reason) {
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
index 5b8fedba..83030b2b 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
@@ -1,16 +1,6 @@
 package tools.refinery.language.web.xtext.servlet;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasProperty;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import java.util.List;
-import java.util.Map;
-
+import com.google.inject.Inject;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.testing.InjectWith;
@@ -23,9 +13,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.junit.jupiter.MockitoExtension;
-
-import com.google.inject.Inject;
-
 import tools.refinery.language.web.tests.AwaitTerminationExecutorServiceProvider;
 import tools.refinery.language.web.tests.ProblemWebInjectorProvider;
 import tools.refinery.language.web.xtext.server.ResponseHandler;
@@ -35,6 +22,13 @@ import tools.refinery.language.web.xtext.server.message.XtextWebOkResponse;
 import tools.refinery.language.web.xtext.server.message.XtextWebRequest;
 import tools.refinery.language.web.xtext.server.message.XtextWebResponse;
 
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.*;
+
 @ExtendWith(MockitoExtension.class)
 @ExtendWith(InjectionExtension.class)
 @InjectWith(ProblemWebInjectorProvider.class)
@@ -92,7 +86,8 @@ class TransactionExecutorTest {
                 var stateId = updateFullText();
                 var responseHandler = sendRequestAndWaitForAllResponses(
                                 new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId",
-                                                stateId, "deltaText", "indiv q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0")));
+                                                stateId, "deltaText", "individual q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength",
+                                                "0")));
 
                 var captor = newCaptor();
                 verify(responseHandler, times(2)).onResponse(captor.capture());