< prev index next >
test/java/nio/charset/CharsetDecoder/AverageMax.java
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
@@ -22,54 +22,41 @@
*/
/* @test
* @bug 4853350
* @summary Ensure that averages do not exceed maxima
- *
- * @build AverageMax
- * @run main AverageMax
- * @run main/othervm -Dsun.nio.cs.bugLevel=1.4 AverageMax
*/
import java.nio.*;
import java.nio.charset.*;
public class AverageMax {
- static boolean compat;
-
static abstract class Test {
public abstract void go() throws Exception;
Test() throws Exception {
try {
go();
} catch (Exception x) {
- if (compat) {
- throw new Exception("Exception thrown", x);
- }
if (x instanceof IllegalArgumentException) {
System.err.println("Thrown as expected: " + x);
return;
}
throw new Exception("Incorrect exception: "
+ x.getClass().getName(),
x);
}
- if (!compat)
throw new Exception("No exception thrown");
}
}
public static void main(String[] args) throws Exception {
- // If sun.nio.cs.bugLevel == 1.4 then we want the 1.4 behavior
- String bl = System.getProperty("sun.nio.cs.bugLevel");
- compat = (bl != null && bl.equals("1.4"));
final Charset ascii = Charset.forName("US-ASCII");
new Test() {
public void go() throws Exception {
new CharsetDecoder(ascii, 3.9f, 1.2f) {
< prev index next >