apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Findbugs finding

Browse Source 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
This commit is contained in:
Ian Southam 2014-02-10 16:04:48 +01:00 committed by Hugo Trippaers
parent 1237bf3222
commit 33c2c87287
2 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyRdpClient.java
View File

@ -179,9 +179,11 @@ public class ConsoleProxyRdpClient extends ConsoleProxyClientBase {
int mod = mapModifier(modifiers); int mod = mapModifier(modifiers);
switch (code) { switch (code) {
case 0: case 0:
return mod = mod | MouseEvent.BUTTON1_DOWN_MASK; mod = mod | MouseEvent.BUTTON1_DOWN_MASK;
break;
case 2: case 2:
return mod = mod | MouseEvent.BUTTON3_DOWN_MASK; mod = mod | MouseEvent.BUTTON3_DOWN_MASK;
break;
default: default:
} }
return mod; return mod;
@ -191,9 +193,11 @@ public class ConsoleProxyRdpClient extends ConsoleProxyClientBase {
int mod = mapModifier(modifiers); int mod = mapModifier(modifiers);
switch (code) { switch (code) {
case 0: case 0:
return mod = mod | MouseEvent.BUTTON1_MASK; mod = mod | MouseEvent.BUTTON1_MASK;
break;
case 2: case 2:
return mod = mod | MouseEvent.BUTTON3_MASK; mod = mod | MouseEvent.BUTTON3_MASK;
break;
default: default:
} }
return mod; return mod;

45
services/console-proxy/server/test/com/cloud/consoleproxy/ConsoleProxyRdpClientTest.java Normal file
View File

@ -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);
}
}