infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-18 14:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8167192: [Testbug] java/io/Serializable/serialFilter test conditions wrong

Browse Source 
Reviewed-by: lancea, mchung
This commit is contained in:
Roger Riggs 2016-10-24 09:40:06 -04:00
parent c0ee1b68c1
commit 033650f9e0
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/test/java/io/Serializable/serialFilter/FilterWithSecurityManagerTest.java
View File

@ -28,6 +28,7 @@ import java.security.AccessControlException;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.testng.Assert;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@ -65,20 +66,21 @@ public class FilterWithSecurityManagerTest {
*/
@Test
public void testGlobalFilter() throws Exception {
if (ObjectInputFilter.Config.getSerialFilter() == null) {
return;
}
try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ObjectInputStream ois = new ObjectInputStream(bais)) {
ObjectInputFilter global = ObjectInputFilter.Config.getSerialFilter();
try {
ObjectInputFilter.Config.setSerialFilter(filter);
assertFalse(setSecurityManager,
"When SecurityManager exists, without "
+ "java.security.SerializablePermission(serialFilter) Exception should be thrown");
Object o = ois.readObject();
+ "java.io.SerializablePermission(serialFilter) "
+ "IllegalStateException should be thrown");
} catch (AccessControlException ex) {
assertTrue(setSecurityManager);
assertTrue(ex.getMessage().contains("java.io.SerializablePermission"));
assertTrue(ex.getMessage().contains("serialFilter"));
} catch (IllegalStateException ise) {
// ISE should occur only if global filter already set
Assert.assertNotNull(global, "Global filter should be non-null");
}
}

4
jdk/test/java/io/Serializable/serialFilter/GlobalFilterTest.java
View File

@ -126,9 +126,7 @@ public class GlobalFilterTest {
ObjectInputFilter.Config.setSerialFilter(filter);
Assert.fail("set only once process-wide filter");
} catch (IllegalStateException ise) {
if (sm != null) {
Assert.fail("wrong exception when security manager is set", ise);
}
// Normal, once set can never be re-set even if no security manager
} catch (SecurityException se) {
if (sm == null) {
Assert.fail("wrong exception when security manager is not set", se);

5
jdk/test/java/io/Serializable/serialFilter/security.policy
View File

@ -1,7 +1,8 @@
// Individual Permissions to for GlobalFilterTest
// Individual Permissions to for GlobalFilterTest and FilterWithSecurityManager
grant {
// Specific permission under test
permission java.security.SerializablePermission "serialFilter";
permission java.io.SerializablePermission "serialFilter";
// Permissions needed to run the test
permission java.util.PropertyPermission "*", "read";
permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";