Skip to content

Commit d655d00

Browse files
committed
8265019: Update tests for additional TestNG test permissions
Reviewed-by: mdoerr Backport-of: ffb3771
1 parent 9121f55 commit d655d00

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;
@@ -202,14 +203,19 @@ public void setBasicPermissions() {
202203
permissions.add(new RuntimePermission("getClassLoader"));
203204
permissions.add(new RuntimePermission("setSecurityManager"));
204205
permissions.add(new RuntimePermission("createSecurityManager"));
205-
permissions.add(new PropertyPermission("testng.show.stack.frames",
206-
"read"));
207206
permissions.add(new PropertyPermission("user.dir", "read"));
208207
permissions.add(new PropertyPermission("test.src", "read"));
209208
permissions.add(new PropertyPermission("file.separator", "read"));
210209
permissions.add(new PropertyPermission("line.separator", "read"));
211210
permissions.add(new PropertyPermission("fileStringBuffer", "read"));
212211
permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
212+
permissions.add(new PropertyPermission("testng.show.stack.frames",
213+
"read"));
214+
permissions.add(new PropertyPermission("testng.thread.affinity", "read"));
215+
permissions.add(new PropertyPermission("testng.mode.dryrun", "read"));
216+
permissions.add(new PropertyPermission("testng.report.xml.name", "read"));
217+
permissions.add(new PropertyPermission("testng.timezone", "read"));
218+
permissions.add(new ReflectPermission("suppressAccessChecks"));
213219
permissions.add(new FilePermission("<<ALL FILES>>", "execute"));
214220
}
215221

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, 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;
@@ -101,12 +102,17 @@ private void setMinimalPermissions() {
101102
permissions.add(new RuntimePermission("getClassLoader"));
102103
permissions.add(new RuntimePermission("setSecurityManager"));
103104
permissions.add(new RuntimePermission("createSecurityManager"));
104-
permissions.add(new PropertyPermission("testng.show.stack.frames",
105-
"read"));
106105
permissions.add(new PropertyPermission("line.separator", "read"));
107106
permissions.add(new PropertyPermission("fileStringBuffer", "read"));
108107
permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
109108
permissions.add(new PropertyPermission("java.io.tmpdir", "read"));
109+
permissions.add(new PropertyPermission("testng.show.stack.frames",
110+
"read"));
111+
permissions.add(new PropertyPermission("testng.thread.affinity", "read"));
112+
permissions.add(new PropertyPermission("testng.mode.dryrun", "read"));
113+
permissions.add(new PropertyPermission("testng.report.xml.name", "read"));
114+
permissions.add(new PropertyPermission("testng.timezone", "read"));
115+
permissions.add(new ReflectPermission("suppressAccessChecks"));
110116
permissions.add(new FilePermission("<<ALL FILES>>",
111117
"read, write, delete"));
112118
}

0 commit comments

Comments
 (0)