diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 61 | ||||
| -rw-r--r-- | tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java | 70 |
3 files changed, 100 insertions, 39 deletions
@@ -1,3 +1,11 @@ +2013-09-04 Andrew Azores <[email protected]> + + * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: + (getIntegerResponseAsBoolean) extracted integer response casting/handling + logic into new method + * tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java: + new unit test for SecurityDialogs#getIntegerReponseAsBoolean() + 2013-08-23 Adam Domurad <[email protected]> Spawn Java side during C++ unit tests. Many new tests. diff --git a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java index a2dc6eb..da70d79 100644 --- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java +++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java @@ -132,16 +132,7 @@ public class SecurityDialogs { Object selectedValue = getUserResponse(message); - if (selectedValue == null) { - return false; - } else if (selectedValue instanceof Integer) { - if (((Integer) selectedValue).intValue() == 0) - return true; - else - return false; - } else { - return false; - } + return getIntegerResponseAsBoolean(selectedValue); } /** @@ -164,17 +155,7 @@ public class SecurityDialogs { Object selectedValue = getUserResponse(message); - if (selectedValue == null) { - return false; - } else if (selectedValue instanceof Integer) { - if (((Integer) selectedValue).intValue() == 0) { - return true; - } else { - return false; - } - } else { - return false; - } + return getIntegerResponseAsBoolean(selectedValue); } /** @@ -224,16 +205,7 @@ public class SecurityDialogs { Object selectedValue = getUserResponse(message); - if (selectedValue == null) { - return false; - } else if (selectedValue instanceof Integer) { - if (((Integer) selectedValue).intValue() == 0) - return true; - else - return false; - } else { - return false; - } + return getIntegerResponseAsBoolean(selectedValue); } /** @@ -263,11 +235,7 @@ public class SecurityDialogs { message.extras = new Object[] { host, port, prompt, type }; Object response = getUserResponse(message); - if (response == null) { - return null; - } else { - return (Object[]) response; - } + return (Object[]) response; } /** @@ -286,11 +254,11 @@ public class SecurityDialogs { Object selectedValue = getUserResponse(message); // result 0 = Yes, 1 = No, 2 = Cancel - if (selectedValue == null) { - return 2; - } else if (selectedValue instanceof Integer) { + if (selectedValue instanceof Integer) { + // If the selected value can be cast to Integer, use that value return ((Integer) selectedValue).intValue(); } else { + // Otherwise default to "cancel" return 2; } } @@ -376,6 +344,21 @@ public class SecurityDialogs { } /** + * Returns true iff the given Object reference can be cast to Integer and that Integer's + * intValue is 0. + * @param ref the Integer (hopefully) reference + * @return whether the given reference is both an Integer type and has intValue of 0 + */ + public static boolean getIntegerResponseAsBoolean(Object ref) { + boolean isInteger = ref instanceof Integer; + if (isInteger) { + Integer i = (Integer) ref; + return i.intValue() == 0; + } + return false; + } + + /** * Returns whether the current runtime configuration allows prompting user * for security warnings. * diff --git a/tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java b/tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java new file mode 100644 index 0000000..5f1e3fd --- /dev/null +++ b/tests/netx/unit/net/sourceforge/jnlp/security/SecurityDialogsTest.java @@ -0,0 +1,70 @@ +/*Copyright (C) 2013 Red Hat, Inc. + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 2. + +IcedTea is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package net.sourceforge.jnlp.security; + +import static net.sourceforge.jnlp.security.SecurityDialogs.getIntegerResponseAsBoolean; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; + +public class SecurityDialogsTest { + + @Test + public void testGetIntegerResponseAsBoolean() throws Exception { + Object nullRef = null; + Object objRef = new Object(); + Float floatRef = new Float(0.0f); + Double doubleRef = new Double(0.0d); + Long longRef = new Long(0); + Byte byteRef = new Byte((byte)0); + Short shortRef = new Short((short)0); + String strRef = "0"; + Integer intRef1 = new Integer(5); + Integer intRef2 = new Integer(0); + + assertFalse("null reference should have resulted in false", getIntegerResponseAsBoolean(nullRef)); + assertFalse("Object reference should have resulted in false", getIntegerResponseAsBoolean(objRef)); + assertFalse("Float reference should have resulted in false", getIntegerResponseAsBoolean(floatRef)); + assertFalse("Double reference should have resulted in false", getIntegerResponseAsBoolean(doubleRef)); + assertFalse("Long reference should have resulted in false", getIntegerResponseAsBoolean(longRef)); + assertFalse("Byte reference should have resulted in false", getIntegerResponseAsBoolean(byteRef)); + assertFalse("Short reference should have resulted in false", getIntegerResponseAsBoolean(shortRef)); + assertFalse("String reference should have resulted in false", getIntegerResponseAsBoolean(strRef)); + assertFalse("Non-0 Integer reference should have resulted in false", getIntegerResponseAsBoolean(intRef1)); + assertTrue("0 Integer reference should have resulted in true", getIntegerResponseAsBoolean(intRef2)); + } +} |