Skip to content

Commit ffb3771

Browse files
author
Lance Andersen
committed
8265019: Update tests for additional TestNG test permissions
Reviewed-by: naoto, bpb, alanb
1 parent 7e4cd48 commit ffb3771

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

test/jdk/java/lang/ProcessHandle/PermissionTest.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
2323

2424
import java.io.FilePermission;
2525
import java.io.IOException;
26+
import java.lang.reflect.ReflectPermission;
2627
import java.security.CodeSource;
2728
import java.security.Permission;
2829
import java.security.PermissionCollection;
@@ -205,14 +206,19 @@ public void setBasicPermissions() {
205206
permissions.add(new RuntimePermission("getClassLoader"));
206207
permissions.add(new RuntimePermission("setSecurityManager"));
207208
permissions.add(new RuntimePermission("createSecurityManager"));
208-
permissions.add(new PropertyPermission("testng.show.stack.frames",
209-
"read"));
210209
permissions.add(new PropertyPermission("user.dir", "read"));
211210
permissions.add(new PropertyPermission("test.src", "read"));
212211
permissions.add(new PropertyPermission("file.separator", "read"));
213212
permissions.add(new PropertyPermission("line.separator", "read"));
214213
permissions.add(new PropertyPermission("fileStringBuffer", "read"));
215214
permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
215+
permissions.add(new PropertyPermission("testng.show.stack.frames",
216+
"read"));
217+
permissions.add(new PropertyPermission("testng.thread.affinity", "read"));
218+
permissions.add(new PropertyPermission("testng.mode.dryrun", "read"));
219+
permissions.add(new PropertyPermission("testng.report.xml.name", "read"));
220+
permissions.add(new PropertyPermission("testng.timezone", "read"));
221+
permissions.add(new ReflectPermission("suppressAccessChecks"));
216222
permissions.add(new FilePermission("<<ALL FILES>>", "execute"));
217223
}
218224

test/jdk/java/sql/testng/util/TestPolicy.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
2323
package util;
2424

2525
import java.io.FilePermission;
26+
import java.lang.reflect.ReflectPermission;
2627
import java.security.AllPermission;
2728
import java.security.CodeSource;
2829
import java.security.Permission;
@@ -102,12 +103,17 @@ private void setMinimalPermissions() {
102103
permissions.add(new RuntimePermission("getClassLoader"));
103104
permissions.add(new RuntimePermission("setSecurityManager"));
104105
permissions.add(new RuntimePermission("createSecurityManager"));
105-
permissions.add(new PropertyPermission("testng.show.stack.frames",
106-
"read"));
107106
permissions.add(new PropertyPermission("line.separator", "read"));
108107
permissions.add(new PropertyPermission("fileStringBuffer", "read"));
109108
permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
110109
permissions.add(new PropertyPermission("java.io.tmpdir", "read"));
110+
permissions.add(new PropertyPermission("testng.show.stack.frames",
111+
"read"));
112+
permissions.add(new PropertyPermission("testng.thread.affinity", "read"));
113+
permissions.add(new PropertyPermission("testng.mode.dryrun", "read"));
114+
permissions.add(new PropertyPermission("testng.report.xml.name", "read"));
115+
permissions.add(new PropertyPermission("testng.timezone", "read"));
116+
permissions.add(new ReflectPermission("suppressAccessChecks"));
111117
permissions.add(new FilePermission("<<ALL FILES>>",
112118
"read, write, delete"));
113119
}

0 commit comments

Comments
 (0)