/hg/icedtea-web: Fix PolicyEditor unit tests after refactor
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Mon Mar 10 16:29:58 UTC 2014
changeset 483ab446ea4c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=483ab446ea4c
author: Andrew Azores <aazores at redhat.com>
date: Mon Mar 10 12:29:47 2014 -0400
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
diffstat:
ChangeLog | 7 +
tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java | 38 +++++-----
2 files changed, 26 insertions(+), 19 deletions(-)
diffs (74 lines):
diff -r 17c6e5a59602 -r 483ab446ea4c ChangeLog
--- 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 at 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 at redhat.com>
PolicyEditor parsing enhancements, new tests, and bugfixes
diff -r 17c6e5a59602 -r 483ab446ea4c tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java
--- 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());
}
}
More information about the distro-pkg-dev
mailing list