jdk-sandbox: comparison jdk/test/java/util/Formatter/Constructors.java

equal deleted inserted replaced

-:0b2c3a61f004
+:a23e3f47c5a8
 /*
-* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2004, 2011, 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.
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 /* @test
-* @bug 4981811 4984465 5064492 6240171
+* @bug 4981811 4984465 5064492 6240171 7000511
 * @summary Unit test for all constructors introduced by the formatter feature
 */
 import java.io.*;
 import java.util.*;
 fail(x.getMessage());
 }
 }
 public static void main(String [] args) {
 // Formatter()
-try {
+try (Formatter f = new Formatter()) {
-Formatter f = new Formatter();
 pass();
 out(f, StringBuilder.class);
 locale(f);
 } catch (Exception x) {
 fail("new Formatter()", x);
 }
 // Formatter(Appendable a)
-try {
+try (Formatter f = new Formatter((Appendable) null)) {
-Formatter f = new Formatter((Appendable) null);
 pass();
 out(f, StringBuilder.class);
 locale(f);
 } catch (Exception x) {
 fail("new Formatter((Appendable)null)", x);
 }
 // Formatter(Locale l)
-try {
+try (Formatter f = new Formatter((Locale) null)) {
-Formatter f = new Formatter((Locale) null);
 pass();
 out(f, StringBuilder.class);
 locale(f, null);
 } catch (Exception x) {
 fail("new Formatter((Locale)null)", x);
 }
 // Formatter(Appendable a, Locale l)
-try {
+try (Formatter f = new Formatter((Appendable) null, (Locale) null)) {
-Formatter f = new Formatter((Appendable) null, (Locale) null);
 pass();
 out(f, StringBuilder.class);
 locale(f, null);
 } catch (Exception x) {
 fail("new Formatter((Appendable) null, (Locale) null)", x);
 }
 // Formatter(String fileName)
-try {
+try (Formatter f = new Formatter("foo")) {
-Formatter f = new Formatter("foo");
 pass();
 out(f, BufferedWriter.class);
 locale(f);
 } catch (Exception x) {
 fail("new Formatter(\"foo\")", x);
 }
 try {
-Formatter f = new Formatter((String)null);
+new Formatter((String)null);
 fail("new Formatter((String)null)");
 } catch (NullPointerException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter((String)null)", x);
 }
 // Formatter(String fileName, String csn)
-try {
+try (Formatter f = new Formatter("foo", "UTF-8")) {
-Formatter f = new Formatter("foo", "UTF-8");
 pass();
 out(f, BufferedWriter.class);
 locale(f);
 } catch (Exception x) {
 fail("new Formatter(\"foo\", \"UTF-8\")", x);
 }
 try {
 new Formatter(".", "bar");
 fail("new Formatter(\".\", \"bar\")");
-} catch (FileNotFoundException x) {
+} catch (FileNotFoundException|UnsupportedEncodingException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter(\".\", \"bar\")", x);
 }
 // Formatter(String fileName, String csn, Locale l)
-try {
+try (Formatter f = new Formatter("foo", "ISO-8859-1", Locale.GERMANY)) {
-Formatter f = new Formatter("foo", "ISO-8859-1", Locale.GERMANY);
 pass();
 out(f, BufferedWriter.class);
 locale(f, Locale.GERMANY);
 } catch (Exception x) {
 fail("new Formatter(\"foo\", \"ISO-8859-1\", Locale.GERMANY)", x);
 }
-try {
+try (Formatter f = new Formatter("foo", "ISO-8859-1", null)) {
-Formatter f = new Formatter("foo", "ISO-8859-1", null);
 pass();
 locale(f, null);
 out(f, BufferedWriter.class);
 } catch (Exception x) {
 fail("new Formatter(\"foo\", \"ISO-8859-1\", null)", x);
 }
 // Formatter(File)
-try {
+try (Formatter f = new Formatter(new File("foo"))) {
-Formatter f = new Formatter(new File("foo"));
 pass();
 locale(f);
 out(f, BufferedWriter.class);
 } catch (Exception x) {
 fail("new Formatter(new File(\"foo\")", x);
 }
 try {
-Formatter f = new Formatter((File)null);
+new Formatter((File)null);
 fail("new Formatter((File)null)");
 } catch (NullPointerException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter((File)null)", x);
 pass();
 } catch (Exception x) {
 fail("new Formatter((PrintStream) null)", x);
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"))) {
-Formatter f = new Formatter(new PrintStream("foo"));
 pass();
 locale(f);
 out(f, PrintStream.class);
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\")", x);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\")", x);
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"),
-Formatter f = new Formatter(new PrintStream("foo"),
+Locale.JAPANESE)) {
-Locale.JAPANESE);
 pass();
 locale(f, Locale.JAPANESE);
 out(f, PrintStream.class);
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\")", x);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\")", x);
 }
-try {
+try (PrintStream ps = new PrintStream("foo")) {
 // The cast here is necessary to avoid an ambiguity error
 // between Formatter(Appendable a, Locale l)
-// and     Formatter(OutputStream os, String csn)
+// and Formatter(OutputStream os, String csn)
-Formatter f = new Formatter(new PrintStream("foo"),
+new Formatter(ps, (String)null);
-(String)null);
 fail("new Formatter(new PrintStream(\"foo\"), (String)null)");
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\"), (String)null)", x);
 } catch (NullPointerException x) {
 pass();
 fail("new Formatter(new PrintStream(\"foo\"), (String)null)", x);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), (String)null)", x);
 }
-try {
+// The cast here is necessary to avoid an ambiguity error
-// The cast here is necessary to avoid an ambiguity error
+// between Formatter(Appendable a, Locale l)
-// between Formatter(Appendable a, Locale l)
+// and  Formatter(OutputStream os, String csn)
-// and     Formatter(OutputStream os, String csn)
+try (Formatter f = new Formatter(new PrintStream("foo"),
-Formatter f = new Formatter(new PrintStream("foo"),
+(Locale)null)) {
-(Locale)null);
 pass();
 locale(f, null);
 out(f, PrintStream.class);
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\"), (Locale)null)", x);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), (Locale)null)", x);
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"),
-Formatter f = new Formatter(new PrintStream("foo"),
+Locale.KOREAN)) {
-Locale.KOREAN);
 pass();
 locale(f, Locale.KOREAN);
 out(f, PrintStream.class);
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\"), Locale.KOREAN)", x);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), Locale.KOREAN)", x);
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"),
-Formatter f = new Formatter(new PrintStream("foo"),
+"UTF-16BE", null)) {
-"UTF-16BE", null);
 pass();
 locale(f, null);
 out(f, BufferedWriter.class);
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"UTF-16BE\", null");
 fail("new Formatter(new PrintStream(\"foo\"), \"UTF-16BE\", null");
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"UTF-16BE\", null");
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"),
-Formatter f = new Formatter(new PrintStream("foo"),
+"UTF-16BE", Locale.ITALIAN)) {
-"UTF-16BE", Locale.ITALIAN);
 pass();
 locale(f, Locale.ITALIAN);
 out(f, BufferedWriter.class);
 } catch (FileNotFoundException x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"UTF-16BE\", Locale.ITALIAN");
 pass();
 } catch (Exception x) {
 fail("new Formatter((OutputStream) null)", x);
 }
-try {
+try (Formatter f = new Formatter((OutputStream) new PrintStream("foo"))) {
-Formatter f = new Formatter((OutputStream) new PrintStream("foo"));
 pass();
 locale(f);
 out(f, BufferedWriter.class);
 } catch (Exception x) {
 fail("new Formatter((OutputStream) new PrintStream(\"foo\")", x);
 pass();
 } catch (Exception x) {
 fail("new Formatter((OutputStream) null, \"ISO-8859-1\")", x);
 }
-try {
+try (PrintStream ps = new PrintStream("foo")) {
-new Formatter((OutputStream) new PrintStream("foo"), null);
+new Formatter((OutputStream) ps, null);
 fail("new Formatter((OutputStream) new PrintStream(\"foo\"), null");
 } catch (NullPointerException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter((OutputStream) new PrintStream(\"foo\"), null",
 x);
 }
-try {
+try (PrintStream ps = new PrintStream("foo")) {
-new Formatter(new PrintStream("foo"), "bar");
+new Formatter(ps, "bar");
 fail("new Formatter(new PrintStream(\"foo\"), \"bar\")");
 } catch (UnsupportedEncodingException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"bar\")", x);
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"), "UTF-8")) {
-Formatter f = new Formatter(new PrintStream("foo"), "UTF-8");
 pass();
 locale(f);
 out(f, BufferedWriter.class);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"UTF-8\")", x);
 } catch (Exception x) {
 fail("new Formatter((OutputStream) null, \"ISO-8859-1\", Locale.UK)",
 x);
 }
-try {
+try (PrintStream ps = new PrintStream("foo")) {
-new Formatter(new PrintStream("foo"), null, Locale.UK);
+new Formatter(ps, null, Locale.UK);
 fail("new Formatter(new PrintStream(\"foo\"), null, Locale.UK)");
 } catch (NullPointerException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), null, Locale.UK)",
 x);
 }
-try {
+try (PrintStream ps = new PrintStream("foo")) {
-new Formatter(new PrintStream("foo"), "bar", Locale.UK);
+new Formatter(ps, "bar", Locale.UK);
 fail("new Formatter(new PrintStream(\"foo\"), \"bar\", Locale.UK)");
 } catch (UnsupportedEncodingException x) {
 pass();
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"bar\", Locale.UK)",
 x);
 }
-try {
+try (Formatter f = new Formatter(new PrintStream("foo"), "UTF-8", Locale.UK)) {
-Formatter f
-= new Formatter(new PrintStream("foo"), "UTF-8", Locale.UK);
 pass();
 out(f, BufferedWriter.class);
 locale(f, Locale.UK);
 } catch (Exception x) {
 fail("new Formatter(new PrintStream(\"foo\"), \"UTF-8\"), Locale.UK",
 x);
 }
 // PrintStream(String fileName)
-try {
+try (PrintStream ps = new PrintStream("foo")) {
-new PrintStream("foo");
 pass();
 } catch (Exception x) {
 fail("new PrintStream(\"foo\")", x);
 }
 } catch (Exception x) {
 fail("new PrintStream(\"foo\", null)", x);
 }
 // PrintStream(File file)
-try {
+try (PrintStream ps = new PrintStream(new File("foo"))) {
-new PrintStream(new File("foo"));
 pass();
 } catch (Exception x) {
 fail("new PrintStream(new File(\"foo\"))", x);
 }
 } catch (Exception x) {
 fail("new PrintStream(new File(\"foo\"), null)", x);
 }
 // PrintWriter(String fileName)
-try {
+try (PrintWriter pw = new PrintWriter("foo")) {
-new PrintWriter("foo");
 pass();
 } catch (Exception x) {
 fail("new PrintWriter(\"foo\")", x);
 }
 } catch (Exception x) {
 fail("new PrintWriter(\"foo\"), null", x);
 }
 // PrintWriter(File file)
-try {
+try (PrintWriter pw = new PrintWriter(new File("foo"))) {
-new PrintWriter(new File("foo"));
 pass();
 } catch (Exception x) {
 fail("new PrintWriter(new File(\"foo\"))", x);
 }

changeset 7966	a23e3f47c5a8
parent 7668	d4a77089c587