OpenJDK / portola / portola
changeset 6106:c5ba8eff9aca
6972468: Security manager should be used for tests in java/beans/XMLEncoder
Reviewed-by: peterz
| author | malenkov |
|---|---|
| date | Fri, 30 Jul 2010 19:40:29 +0400 |
| parents | de4af6e215ad |
| children | 5a34dc0665fb a77ecec681b5 |
| files | jdk/test/java/beans/XMLEncoder/Test4631471.java jdk/test/java/beans/XMLEncoder/Test4903007.java jdk/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java |
| diffstat | 3 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/java/beans/XMLEncoder/Test4631471.java Fri Jul 30 19:21:27 2010 +0400 +++ b/jdk/test/java/beans/XMLEncoder/Test4631471.java Fri Jul 30 19:40:29 2010 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4631471 + * @bug 4631471 6972468 * @summary Tests DefaultTreeModel encoding * @author Sergey Malenkov, Mark Davidson */ @@ -37,6 +37,12 @@ public abstract class Test4631471 extends AbstractTest { public static void main(String[] args) throws Exception { + main(); + System.setSecurityManager(new SecurityManager()); + main(); + } + + private static void main() throws Exception { // the DefaultMutableTreeNode will archive correctly new Test4631471() { protected Object getObject() {
--- a/jdk/test/java/beans/XMLEncoder/Test4903007.java Fri Jul 30 19:21:27 2010 +0400 +++ b/jdk/test/java/beans/XMLEncoder/Test4903007.java Fri Jul 30 19:40:29 2010 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4903007 + * @bug 4903007 6972468 * @summary Tests encoding of container with boxes and BoxLayout * @author Sergey Malenkov, Mark Davidson */ @@ -36,7 +36,7 @@ public class Test4903007 extends AbstractTest<JPanel> { public static void main(String[] args) throws Exception { - new Test4903007().test(false); // TODO: could not encode with security manager + new Test4903007().test(true); } protected JPanel getObject() {
--- a/jdk/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java Fri Jul 30 19:21:27 2010 +0400 +++ b/jdk/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java Fri Jul 30 19:40:29 2010 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 5023552 + * @bug 5023552 6972468 * @summary Tests JLayeredPane encoding * @author Sergey Malenkov */ @@ -35,7 +35,7 @@ public final class javax_swing_JLayeredPane extends AbstractTest<JLayeredPane> { public static void main(String[] args) { - new javax_swing_JLayeredPane().test(false); // TODO: could not encode with security manager + new javax_swing_JLayeredPane().test(true); } private static void init(JLayeredPane pane, int layer, int x, int y, int w, int h, Color color) {