changeset 4623:cfb81c3c6fe5

6868690: TEST:java/awt/FontClass/CreateFont/BigFont.java test should be modified in jdk7&8 to run via jtreg Reviewed-by: coffeys
author asaha
date Tue, 31 Jan 2012 11:47:37 -0800
parents 6787ed2ec128
children 778aec779d4c
files test/java/awt/FontClass/CreateFont/BigFont.java test/java/awt/FontClass/CreateFont/bigfont.html
diffstat 2 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/awt/FontClass/CreateFont/BigFont.java	Tue Jan 31 21:14:43 2012 +0400
+++ b/test/java/awt/FontClass/CreateFont/BigFont.java	Tue Jan 31 11:47:37 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, 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
@@ -21,6 +21,12 @@
  * questions.
  */
 
+/*
+  @test
+  @bug 6522586
+  @summary Enforce limits on font creation
+  @run main BigFont
+*/
 import java.applet.*;
 import java.awt.*;
 import java.io.*;
@@ -28,8 +34,12 @@
 
 public class BigFont extends Applet {
 
+   public static void main(String args[]) {
+        System.setSecurityManager(new SecurityManager());
+        (new BigFont()).runTest1();
+   }
+
    static private class SizedInputStream extends InputStream {
-
        int size;
        int cnt = 0;
 
@@ -57,9 +67,12 @@
     public void init() {
         id = getParameter("number");
         fileName = getParameter("font");
-
         System.out.println("Applet " + id + " "+
                            Thread.currentThread().getThreadGroup());
+        runTest1();
+        runTest2();
+    }
+    void runTest1() {
         // Larger than size for a single font.
         int fontSize = 64 * 1000 * 1000;
         SizedInputStream sis = new SizedInputStream(fontSize);
@@ -74,6 +87,8 @@
                 throw new RuntimeException("Allowed file to be too large.");
             }
         }
+     }
+     void runTest2() {
         // The following part of the test was verified manually but
         // is impractical to enable  because it requires a fairly large
         // valid font to be part of the test, and we can't easily include
--- a/test/java/awt/FontClass/CreateFont/bigfont.html	Tue Jan 31 21:14:43 2012 +0400
+++ b/test/java/awt/FontClass/CreateFont/bigfont.html	Tue Jan 31 11:47:37 2012 -0800
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2008, 2012, 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
@@ -21,11 +21,6 @@
  or visit www.oracle.com if you need additional information or have any
  questions.
 
-  @test
-  @bug 6522586
-  @run applet bigfont.html
-  @summary Enforce limits on font creation
-
 -->
 
 <html>
@@ -45,4 +40,3 @@
 <hr>
   </body>
 </html>
-