/hg/icedtea-web: CustomPermission properly formats basic permiss...

[aazores at icedtea.classpath.org]

changeset 0e97a940f5c4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0e97a940f5c4
author: Andrew Azores <aazores at redhat.com>
date: Fri Jun 06 14:35:41 2014 -0400

	CustomPermission properly formats basic permissions

	2014-06-06  Andrew Azores  <aazores at redhat.com>

	    * netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java
	    (toString): fixed empty actions string appearing on basic permissions, which
	    do not have actions
	    * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java:
	    (testToStringWithoutActions): new test


diffstat:

 ChangeLog                                                                            |  8 ++++++++
 netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java                |  2 +-
 tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java |  9 +++++++++
 3 files changed, 18 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r 7f4465671398 -r 0e97a940f5c4 ChangeLog
--- a/ChangeLog	Fri Jun 06 09:21:53 2014 -0400
+++ b/ChangeLog	Fri Jun 06 14:35:41 2014 -0400
@@ -1,3 +1,11 @@
+2014-06-06  Andrew Azores  <aazores at redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java
+	(toString): fixed empty actions string appearing on basic permissions, which
+	do not have actions
+	* tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java:
+	(testToStringWithoutActions): new test
+
 2014-06-06  Andrew Azores  <aazores at redhat.com>
 
 	PolicyEditor copy/paste/rename methods extracted and unit tests added
diff -r 7f4465671398 -r 0e97a940f5c4 netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java
--- a/netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java	Fri Jun 06 09:21:53 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java	Fri Jun 06 14:35:41 2014 -0400
@@ -107,7 +107,7 @@
         sb.append(target);
         sb.append("\"");
 
-        if (!this.actions.equals(PermissionActions.NONE)) {
+        if (!this.actions.equals(PermissionActions.NONE.rawString())) {
             sb.append(", \"");
             sb.append(actions);
             sb.append("\"");
diff -r 7f4465671398 -r 0e97a940f5c4 tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java	Fri Jun 06 09:21:53 2014 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java	Fri Jun 06 14:35:41 2014 -0400
@@ -36,7 +36,9 @@
 
 package net.sourceforge.jnlp.security.policyeditor;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class CustomPermissionTest {
@@ -114,6 +116,13 @@
     }
 
     @Test
+    public void testToStringWithoutActions() throws Exception {
+        final CustomPermission cp = new CustomPermission("java.lang.RuntimePermission", "createClassLoader", "");
+        final String expected = "permission java.lang.RuntimePermission \"createClassLoader\";";
+        assertEquals(expected, cp.toString());
+    }
+
+    @Test
     public void testCompareTo() throws Exception {
         final CustomPermission cp1 = new CustomPermission("java.io.FilePermission", "*", "read");
         final CustomPermission cp2 = new CustomPermission("java.io.FilePermission", "${user.home}${/}*", "read");