--- old/test/java/awt/FontClass/CreateFont/BigFont.java Wed Jun 13 15:59:48 2012
+++ new/test/java/awt/FontClass/CreateFont/BigFont.java Wed Jun 13 15:59:48 2012
@@ -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 6868690
+ @summary Enforce limits on font creation
+ @run main BigFont
+*/
import java.applet.*;
import java.awt.*;
import java.io.*;
@@ -28,6 +34,11 @@
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;
@@ -59,7 +70,11 @@
fileName = getParameter("font");
System.out.println("Applet " + id + " "+
- Thread.currentThread().getThreadGroup());
+ 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 +89,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
--- old/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java Wed Jun 13 15:59:50 2012
+++ new/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java Wed Jun 13 15:59:50 2012
@@ -1,24 +1,24 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
*
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
*
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*/
/*
@@ -25,8 +25,18 @@
* @test
* @bug 6652929
* @summary verify handling of File.getPath()
+ * @compile FontFile.java
+ * @run shell TestFontFile.sh
*/
+/*
+ * When using jtreg this test needs to be run by shell script,
+ * since otherwise jtreg reflectively invokes the main method
+ * and the codebase for the purposes of the security manager
+ * is that of the jtreg harness, not the codebase (class file location)
+ * of this program, thus access to read to that location is not available.
+ */
+
import java.awt.*;
import java.io.*;
@@ -34,10 +44,21 @@
public static void main(String[] args) throws Exception {
String sep = System.getProperty("file.separator");
String fname = ".." + sep + "A.ttf";
- String dir = System.getProperty("test.src");
+ //String dir = System.getProperty("test.src");
+ String dir = System.getenv("TESTSRC");
if (dir != null) {
fname = dir + sep + fname;
}
+ //String classesDir = System.getProperty("test.classes");
+ String classesDir = System.getenv("TESTCLASSES");
+ System.out.println("classesDir="+classesDir);
+ String testfile = "somefile";
+ if (classesDir != null) {
+ testfile = classesDir + sep + testfile;
+ }
+ final String somefile = testfile;
+ System.out.println("somefile="+somefile);
+ System.out.println("userdir="+System.getProperty("user.dir"));
final String name = fname;
System.out.println("Will try to access " + name);
if (!(new File(name)).canRead()) {
@@ -66,7 +87,7 @@
return name;
} else {
read = true;
- return "somefile";
+ return somefile;
}
}
@Override public boolean canRead() {
--- /dev/null Wed Jun 13 16:03:57 2012
+++ new/test/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh Wed Jun 13 15:59:51 2012
@@ -0,0 +1,84 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+
+#!/bin/sh
+
+if [ "${TESTSRC}" = "" ]
+then TESTSRC=.
+fi
+
+if [ "${TESTJAVA}" = "" ]
+then
+ PARENT=`dirname \`which java\``
+ TESTJAVA=`dirname ${PARENT}`
+ echo "TESTJAVA not set, selecting " ${TESTJAVA}
+ echo "If this is incorrect, try setting the variable manually."
+fi
+
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+BIT_FLAG=""
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+ SunOS | Linux )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+ ## for solaris, linux it's HOME
+ FILE_LOCATION=$HOME
+ if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ]
+ then
+ BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT`
+ fi
+ ;;
+ Windows_* | CYGWIN* )
+ NULL=NUL
+ PS=";"
+ FS="\\"
+ ;;
+ * )
+ echo "Unrecognized system!"
+ exit 1;
+ ;;
+esac
+
+JEMMYPATH=${CPAPPEND}
+CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
+
+THIS_DIR=`pwd`
+
+${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version
+
+${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} FontFile > test.out 2>&1
+
+STATUS=$?
+
+cat test.out
+
+exit $STATUS
--- old/test/java/awt/FontClass/CreateFont/bigfont.html Wed Jun 13 15:59:54 2012
+++ /dev/null Wed Jun 13 16:03:59 2012
@@ -1,48 +0,0 @@
-
-
-
-
- Test Font Creation Limits
-
-
-
-
-
-
-
-
-