Mercurial > hg > release > icedtea-web-1.5

changeset 917:483ab446ea4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix PolicyEditor unit tests after refactor * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java: (testActionsRegex, testTargetRegex, testRegexesAgainstBadPermissionNames): update after moving regexes from PolicyEditorPermissions into CustomPermission
author Andrew Azores <aazores@redhat.com>
date Mon, 10 Mar 2014 12:29:47 -0400
parents 17c6e5a59602
children f6336bc81da8
files ChangeLog tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java
diffstat 2 files changed, 26 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 10 12:17:56 2014 -0400
+++ b/ChangeLog	Mon Mar 10 12:29:47 2014 -0400
@@ -1,3 +1,10 @@
+2014-03-10  Andrew Azores  <aazores@redhat.com>
+
+	* tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java:
+	(testActionsRegex, testTargetRegex, testRegexesAgainstBadPermissionNames):
+	update after moving regexes from PolicyEditorPermissions into
+	CustomPermission
+
 2014-03-10  Andrew Azores  <aazores@redhat.com>
 
 	PolicyEditor parsing enhancements, new tests, and bugfixes
--- a/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java	Mon Mar 10 12:17:56 2014 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java	Mon Mar 10 12:29:47 2014 -0400
@@ -71,37 +71,37 @@
 
     @Test
     public void testActionsRegex() throws Exception {
-    	final Pattern pattern = PolicyEditorPermissions.ACTIONS_PERMISSION;
+        final Pattern pattern = CustomPermission.ACTIONS_PERMISSION;
 
-    	final String actionsPermission = "permission java.io.FilePermission \"${user.home}\", \"read\";";
-    	final String targetPermission = "permission java.io.RuntimePermission \"queuePrintJob\";";
-    	final String badPermission = "permission java.io.FilePermission user.home read;";
+        final String actionsPermission = "permission java.io.FilePermission \"${user.home}\", \"read\";";
+        final String targetPermission = "permission java.io.RuntimePermission \"queuePrintJob\";";
+        final String badPermission = "permission java.io.FilePermission user.home read;";
 
-    	assertTrue(actionsPermission + " should match", pattern.matcher(actionsPermission).matches());
-    	assertFalse(targetPermission + " should not match", pattern.matcher(targetPermission).matches());
-    	assertFalse(badPermission + " should not match", pattern.matcher(badPermission).matches());
+        assertTrue(actionsPermission + " should match", pattern.matcher(actionsPermission).matches());
+        assertFalse(targetPermission + " should not match", pattern.matcher(targetPermission).matches());
+        assertFalse(badPermission + " should not match", pattern.matcher(badPermission).matches());
     }
 
     @Test
     public void testTargetRegex() throws Exception {
-    	final Pattern pattern = PolicyEditorPermissions.TARGET_PERMISSION;
+        final Pattern pattern = CustomPermission.TARGET_PERMISSION;
 
-    	final String actionsPermission = "permission java.io.FilePermission \"${user.home}\", \"read\";";
-    	final String targetPermission = "permission java.io.RuntimePermission \"queuePrintJob\";";
-    	final String badPermission = "permission java.io.FilePermission user.home read;";
+        final String actionsPermission = "permission java.io.FilePermission \"${user.home}\", \"read\";";
+        final String targetPermission = "permission java.io.RuntimePermission \"queuePrintJob\";";
+        final String badPermission = "permission java.io.FilePermission user.home read;";
 
-    	assertFalse(actionsPermission + " should not match", pattern.matcher(actionsPermission).matches());
-    	assertTrue(targetPermission + " should match", pattern.matcher(targetPermission).matches());
-    	assertFalse(badPermission + " should not match", pattern.matcher(badPermission).matches());
+        assertFalse(actionsPermission + " should not match", pattern.matcher(actionsPermission).matches());
+        assertTrue(targetPermission + " should match", pattern.matcher(targetPermission).matches());
+        assertFalse(badPermission + " should not match", pattern.matcher(badPermission).matches());
     }
 
     @Test
     public void testRegexesAgainstBadPermissionNames() throws Exception {
-    	final Pattern targetPattern = PolicyEditorPermissions.TARGET_PERMISSION;
-    	final Pattern actionsPattern = PolicyEditorPermissions.ACTIONS_PERMISSION;
-    	final String badPermission = "permission abc123^$% \"target\", \"actions\"";
+        final Pattern targetPattern = CustomPermission.TARGET_PERMISSION;
+        final Pattern actionsPattern = CustomPermission.ACTIONS_PERMISSION;
+        final String badPermission = "permission abc123^$% \"target\", \"actions\"";
 
-    	assertFalse(badPermission + " should not match", targetPattern.matcher(badPermission).matches());
-    	assertFalse(badPermission + " should not match", actionsPattern.matcher(badPermission).matches());
+        assertFalse(badPermission + " should not match", targetPattern.matcher(badPermission).matches());
+        assertFalse(badPermission + " should not match", actionsPattern.matcher(badPermission).matches());
     }
 }