Findbugs finding

Ian Southam · spark404 · commit 33c2c8728788 · 2014-02-14T18:37:46.000+01:00
Signed-off-by: Hugo Trippaers &lt;htrippaers@schubergphilis.com&gt;
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java
@@ -179,9 +179,11 @@ public int mapMouseDownModifier(int code, int modifiers) {
         int mod = mapModifier(modifiers);
         switch (code) {
         case 0:
-            return mod = mod | MouseEvent.BUTTON1_DOWN_MASK;
+            mod = mod | MouseEvent.BUTTON1_DOWN_MASK;
+            break;
         case 2:
-            return mod = mod | MouseEvent.BUTTON3_DOWN_MASK;
+            mod = mod | MouseEvent.BUTTON3_DOWN_MASK;
+            break;
         default:
         }
         return mod;
@@ -191,9 +193,11 @@ public int mapMouseUpModifier(int code, int modifiers) {
         int mod = mapModifier(modifiers);
         switch (code) {
         case 0:
-            return mod = mod | MouseEvent.BUTTON1_MASK;
+            mod = mod | MouseEvent.BUTTON1_MASK;
+            break;
         case 2:
-            return mod = mod | MouseEvent.BUTTON3_MASK;
+            mod = mod | MouseEvent.BUTTON3_MASK;
+            break;
         default:
         }
         return mod;
diff --git a/services/console-proxy/server/test/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java b/services/console-proxy/server/test/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java
@@ -0,0 +1,45 @@
+package com.cloud.consoleproxy;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+public class ConsoleProxyRdpClientTest {
+
+    @Test
+    public void testMapMouseDownModifierButton1Mask() throws Exception {
+        int code = 0;
+        int modifiers = 960;
+        int expected = 1024 + 960;
+
+        ConsoleProxyRdpClient rdpc = new ConsoleProxyRdpClient();
+        int actual = rdpc.mapMouseDownModifier(code, modifiers);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testMapMouseDownModifierButton2() throws Exception {
+        int code = 1;
+        int modifiers = 0xffff;
+        int expected = 960;
+
+        ConsoleProxyRdpClient rdpc = new ConsoleProxyRdpClient();
+        int actual = rdpc.mapMouseDownModifier(code, modifiers);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testMapMouseDownModifierButton3Mask() throws Exception {
+        int code = 2;
+        int modifiers = 960;
+        int expected = 4096 + 960;
+
+        ConsoleProxyRdpClient rdpc = new ConsoleProxyRdpClient();
+        int actual = rdpc.mapMouseDownModifier(code, modifiers);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+}
