test: add tests for log level change in MapSyncRpcHandler (#13517)

* test: add tests for log level change in MapSyncRpcHandler
vaadin · Apr 13, 2022 · ba2c87a · ba2c87a
1 parent cd8b9be
commit ba2c87a
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 4 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandler.java b/flow-server/src/main/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandler.java
@@ -105,16 +105,18 @@ protected Optional<Runnable> handleNode(StateNode node,
         } else {
             final Logger logger = LoggerFactory
                     .getLogger(MapSyncRpcHandler.class);
-            if (node.getFeatureIfInitialized(ElementPropertyMap.class)
-                    .map(feat -> feat.getProperty(property))
-                    .orElse(null) != null) {
+            Optional<Serializable> featureProperty = node
+                    .getFeatureIfInitialized(ElementPropertyMap.class)
+                    .map(feat -> feat.getProperty(property));
+            if (featureProperty.isPresent()) {
                 logger.warn(
                         "Property update request for disabled element is received from the client side. "
                                 + "The property is '{}'. Request is ignored.",
                         property);
             } else {
                 logger.debug(
-                        "Ignored property '{}' change for disabled element. Most likely client sent the default value as no value has been set for the property.",
+                        "Ignored property '{}' change for disabled element. Most likely client sent the "
+                                + "default value as no value has been set for the property.",
                         property);
             }
         }

diff --git a/...-server/src/test/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandlerTest.java b/...-server/src/test/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandlerTest.java
@@ -16,6 +16,7 @@
 package com.vaadin.flow.server.communication.rpc;
 
 import java.io.Serializable;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -42,6 +43,17 @@
 import elemental.json.Json;
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
+import org.mockito.MockedStatic;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class MapSyncRpcHandlerTest {
 
@@ -363,6 +375,58 @@ public <F extends NodeFeature> F getFeature(Class<F> featureType) {
         Assert.assertEquals(TEST_PROPERTY, deferredKey.get());
     }
 
+    @Test
+    public void handleNode_stateNodePropertyDefaultValueNotSet_doesNotWarnForUnsetDisabledPropertyChange() {
+
+        ElementPropertyMap map = mock(ElementPropertyMap.class);
+        when(map.getProperty(anyString())).thenReturn(null);
+        StateNode disabledNode = mock(StateNode.class);
+        when(disabledNode.getFeatureIfInitialized(ElementPropertyMap.class))
+                .thenReturn(Optional.of(map));
+        when(disabledNode.isEnabled()).thenReturn(false);
+
+        Logger logger = spy(Logger.class);
+        try (MockedStatic<LoggerFactory> mockedLoggerFactory = mockStatic(
+                LoggerFactory.class)) {
+            mockedLoggerFactory.when(
+                    () -> LoggerFactory.getLogger(MapSyncRpcHandler.class))
+                    .thenReturn(logger);
+
+            new MapSyncRpcHandler().handleNode(disabledNode,
+                    createSyncPropertyInvocation(disabledNode, TEST_PROPERTY,
+                            NEW_VALUE));
+
+            verify(logger, times(0)).warn(anyString(), anyString());
+            verify(logger, times(1)).debug(anyString(), anyString());
+        }
+    }
+
+    @Test
+    public void handleNode_stateNodePropertyDefaultValueSet_warnsForSetDisabledPropertyChange() {
+
+        ElementPropertyMap map = mock(ElementPropertyMap.class);
+        when(map.getProperty(anyString())).thenReturn(NEW_VALUE);
+        StateNode disabledNode = mock(StateNode.class);
+        when(disabledNode.getFeatureIfInitialized(ElementPropertyMap.class))
+                .thenReturn(Optional.of(map));
+        when(disabledNode.isEnabled()).thenReturn(false);
+
+        Logger logger = spy(Logger.class);
+        try (MockedStatic<LoggerFactory> mockedLoggerFactory = mockStatic(
+                LoggerFactory.class)) {
+            mockedLoggerFactory.when(
+                    () -> LoggerFactory.getLogger(MapSyncRpcHandler.class))
+                    .thenReturn(logger);
+
+            new MapSyncRpcHandler().handleNode(disabledNode,
+                    createSyncPropertyInvocation(disabledNode, TEST_PROPERTY,
+                            NEW_VALUE));
+
+            verify(logger, times(1)).warn(anyString(), anyString());
+            verify(logger, times(0)).debug(anyString(), anyString());
+        }
+    }
+
     private static void sendSynchronizePropertyEvent(Element element, UI ui,
             String eventType, Serializable value) throws Exception {
         new MapSyncRpcHandler().handle(ui,