From 33c2c872878874f83c25c656de4325a32c3b8d8c Mon Sep 17 00:00:00 2001 From: Ian Southam Date: Mon, 10 Feb 2014 16:04:48 +0100 Subject: [PATCH] Findbugs finding Signed-off-by: Hugo Trippaers --- .../consoleproxy/ConsoleProxyRdpClient.java | 12 +++-- .../ConsoleProxyRdpClientTest.java | 45 +++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 services/console-proxy/server/test/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java index 7d49b19bfe3..dc3f31b1235 100644 --- 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 class ConsoleProxyRdpClient extends ConsoleProxyClientBase { 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 class ConsoleProxyRdpClient extends ConsoleProxyClientBase { 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 new file mode 100644 index 00000000000..038f438400e --- /dev/null +++ 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); + } + +}