8266460: java.io tests fail on null stream with upgraded jtreg/TestNG
Reviewed-by: bpb
diff --git a/test/jdk/java/io/InputStream/NullInputStream.java b/test/jdk/java/io/InputStream/NullInputStream.java
index 4b7ff51..7431782 100644
--- a/test/jdk/java/io/InputStream/NullInputStream.java
+++ b/test/jdk/java/io/InputStream/NullInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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,13 +21,15 @@
* questions.
*/
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
-import java.io.InputStream;
import java.io.IOException;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
+import java.io.InputStream;
+
import static org.testng.Assert.*;
/*
@@ -40,13 +42,9 @@
private static InputStream openStream;
private static InputStream closedStream;
- @BeforeGroups(groups="open")
- public static void openStream() {
+ @BeforeClass
+ public static void setup() {
openStream = InputStream.nullInputStream();
- }
-
- @BeforeGroups(groups="closed")
- public static void openAndCloseStream() {
closedStream = InputStream.nullInputStream();
try {
closedStream.close();
@@ -55,7 +53,7 @@
}
}
- @AfterGroups(groups="open")
+ @AfterClass
public static void closeStream() {
try {
openStream.close();
@@ -64,12 +62,12 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testOpen() {
assertNotNull(openStream, "InputStream.nullInputStream() returned null");
}
- @Test(groups = "open")
+ @Test
public static void testAvailable() {
try {
assertEquals(0, openStream.available(), "available() != 0");
@@ -78,7 +76,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testRead() {
try {
assertEquals(-1, openStream.read(), "read() != -1");
@@ -87,7 +85,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testReadBII() {
try {
assertEquals(-1, openStream.read(new byte[1], 0, 1),
@@ -97,7 +95,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testReadAllBytes() {
try {
assertEquals(0, openStream.readAllBytes().length,
@@ -107,7 +105,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testReadNBytes() {
try {
assertEquals(0, openStream.readNBytes(new byte[1], 0, 1),
@@ -117,7 +115,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testReadNBytesWithLength() {
try {
assertEquals(0, openStream.readNBytes(-1).length,
@@ -137,7 +135,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testSkip() {
try {
assertEquals(0, openStream.skip(1), "skip() != 0");
@@ -146,7 +144,7 @@
}
}
- @Test(groups = "open")
+ @Test
public static void testSkipNBytes() {
try {
openStream.skipNBytes(-1);
@@ -156,12 +154,12 @@
}
}
- @Test(groups = "open", expectedExceptions = EOFException.class)
+ @Test(expectedExceptions = EOFException.class)
public static void testSkipNBytesEOF() throws IOException {
openStream.skipNBytes(1);
}
- @Test(groups = "open")
+ @Test
public static void testTransferTo() {
try {
assertEquals(0, openStream.transferTo(new ByteArrayOutputStream(7)),
@@ -171,7 +169,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testAvailableClosed() {
try {
closedStream.available();
@@ -180,7 +178,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testReadClosed() {
try {
closedStream.read();
@@ -189,7 +187,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testReadBIIClosed() {
try {
closedStream.read(new byte[1], 0, 1);
@@ -198,7 +196,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testReadAllBytesClosed() {
try {
closedStream.readAllBytes();
@@ -207,7 +205,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testReadNBytesClosed() {
try {
closedStream.readNBytes(new byte[1], 0, 1);
@@ -216,7 +214,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testReadNBytesWithLengthClosed() {
try {
closedStream.readNBytes(1);
@@ -225,7 +223,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testSkipClosed() {
try {
closedStream.skip(1);
@@ -234,7 +232,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testSkipNBytesClosed() {
try {
closedStream.skipNBytes(1);
@@ -243,7 +241,7 @@
}
}
- @Test(groups = "closed")
+ @Test
public static void testTransferToClosed() {
try {
closedStream.transferTo(new ByteArrayOutputStream(7));
diff --git a/test/jdk/java/io/OutputStream/NullOutputStream.java b/test/jdk/java/io/OutputStream/NullOutputStream.java
index 2d1751b..e0041e4 100644
--- a/test/jdk/java/io/OutputStream/NullOutputStream.java
+++ b/test/jdk/java/io/OutputStream/NullOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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,12 +21,15 @@
* questions.
*/
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import java.io.IOException;
import java.io.OutputStream;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.fail;
/*
* @test
@@ -38,13 +41,9 @@
private static OutputStream openStream;
private static OutputStream closedStream;
- @BeforeGroups(groups="open")
- public static void openStream() {
+ @BeforeClass
+ public static void setup() {
openStream = OutputStream.nullOutputStream();
- }
-
- @BeforeGroups(groups="closed")
- public static void openAndCloseStream() {
closedStream = OutputStream.nullOutputStream();
try {
closedStream.close();
@@ -53,7 +52,7 @@
}
}
- @AfterGroups(groups="open")
+ @AfterClass
public static void closeStream() {
try {
openStream.close();
@@ -62,13 +61,13 @@
}
}
- @Test(groups="open")
+ @Test
public static void testOpen() {
assertNotNull(openStream,
"OutputStream.nullOutputStream() returned null");
}
- @Test(groups="open")
+ @Test
public static void testWrite() {
try {
openStream.write(62832);
@@ -77,7 +76,7 @@
}
}
- @Test(groups="open")
+ @Test
public static void testWriteBII() {
try {
openStream.write(new byte[] {(byte)6}, 0, 1);
@@ -86,7 +85,7 @@
}
}
- @Test(groups="closed")
+ @Test
public static void testWriteClosed() {
try {
closedStream.write(62832);
@@ -95,7 +94,7 @@
}
}
- @Test(groups="closed")
+ @Test
public static void testWriteBIIClosed() {
try {
closedStream.write(new byte[] {(byte)6}, 0, 1);
diff --git a/test/jdk/java/io/Reader/NullReader.java b/test/jdk/java/io/Reader/NullReader.java
index 86d00ee..9c16f33 100644
--- a/test/jdk/java/io/Reader/NullReader.java
+++ b/test/jdk/java/io/Reader/NullReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -27,9 +27,7 @@
import java.nio.CharBuffer;
import java.nio.ReadOnlyBufferException;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import static org.testng.Assert.*;
@@ -43,107 +41,103 @@
private static Reader openReader;
private static Reader closedReader;
- @BeforeGroups(groups = "open")
- public static void openStream() {
+ @BeforeClass
+ public static void setup() throws IOException {
openReader = Reader.nullReader();
- }
-
- @BeforeGroups(groups = "closed")
- public static void openAndCloseStream() throws IOException {
closedReader = Reader.nullReader();
closedReader.close();
}
- @AfterGroups(groups = "open")
+ @AfterClass
public static void closeStream() throws IOException {
openReader.close();
}
- @Test(groups = "open")
+ @Test
public static void testOpen() {
assertNotNull(openReader, "Reader.nullReader() returned null");
}
- @Test(groups = "open")
+ @Test
public static void testRead() throws IOException {
assertEquals(-1, openReader.read(), "read() != -1");
}
- @Test(groups = "open")
+ @Test
public static void testReadBII() throws IOException {
assertEquals(-1, openReader.read(new char[1], 0, 1),
"read(char[],int,int) != -1");
}
- @Test(groups = "open")
+ @Test
public static void testReadBIILenZero() throws IOException {
assertEquals(0, openReader.read(new char[1], 0, 0),
"read(char[],int,int) != 0");
}
- @Test(groups = "open")
+ @Test
public static void testReadCharBuffer() throws IOException {
CharBuffer charBuffer = CharBuffer.allocate(1);
assertEquals(-1, openReader.read(charBuffer),
"read(CharBuffer) != -1");
}
- @Test(groups = "open")
+ @Test
public static void testReadCharBufferZeroRemaining() throws IOException {
CharBuffer charBuffer = CharBuffer.allocate(0);
assertEquals(0, openReader.read(charBuffer),
"read(CharBuffer) != 0");
}
- @Test(groups = "open")
+ @Test
public static void testReady() throws IOException {
assertFalse(openReader.ready());
}
- @Test(groups = "open")
+ @Test
public static void testSkip() throws IOException {
assertEquals(0, openReader.skip(1), "skip() != 0");
}
- @Test(groups = "open")
+ @Test
public static void testTransferTo() throws IOException {
assertEquals(0, openReader.transferTo(new StringWriter(7)),
"transferTo() != 0");
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testReadClosed() throws IOException {
closedReader.read();
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testReadBIIClosed() throws IOException {
closedReader.read(new char[1], 0, 1);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testReadCharBufferClosed() throws IOException {
CharBuffer charBuffer = CharBuffer.allocate(0);
closedReader.read(charBuffer);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testReadCharBufferZeroRemainingClosed() throws IOException {
CharBuffer charBuffer = CharBuffer.allocate(0);
closedReader.read(charBuffer);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testReadyClosed() throws IOException {
closedReader.ready();
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testSkipClosed() throws IOException {
closedReader.skip(1);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testTransferToClosed() throws IOException {
closedReader.transferTo(new StringWriter(7));
}
diff --git a/test/jdk/java/io/Writer/NullWriter.java b/test/jdk/java/io/Writer/NullWriter.java
index 4d2ef0a..d632947 100644
--- a/test/jdk/java/io/Writer/NullWriter.java
+++ b/test/jdk/java/io/Writer/NullWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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,14 +21,15 @@
* questions.
*/
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import java.io.IOException;
import java.io.Writer;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
/*
* @test
@@ -40,127 +41,123 @@
private static Writer openWriter;
private static Writer closedWriter;
- @BeforeGroups(groups = "open")
- public static void openStream() {
+ @BeforeClass
+ public static void setup() throws IOException {
openWriter = Writer.nullWriter();
- }
-
- @BeforeGroups(groups = "closed")
- public static void openAndCloseStream() throws IOException {
closedWriter = Writer.nullWriter();
closedWriter.close();
}
- @AfterGroups(groups = "open")
+ @AfterClass
public static void closeStream() throws IOException {
openWriter.close();
}
- @Test(groups = "open")
+ @Test
public static void testOpen() {
assertNotNull(openWriter, "Writer.nullWriter() returned null");
}
- @Test(groups = "open")
+ @Test
public static void testAppendChar() throws IOException {
assertSame(openWriter, openWriter.append('x'));
}
- @Test(groups = "open")
+ @Test
public static void testAppendCharSequence() throws IOException {
CharSequence cs = "abc";
assertSame(openWriter, openWriter.append(cs));
}
- @Test(groups = "open")
+ @Test
public static void testAppendCharSequenceNull() throws IOException {
assertSame(openWriter, openWriter.append(null));
}
- @Test(groups = "open")
+ @Test
public static void testAppendCharSequenceII() throws IOException {
CharSequence cs = "abc";
assertSame(openWriter, openWriter.append(cs, 0, 1));
}
- @Test(groups = "open")
+ @Test
public static void testAppendCharSequenceIINull() throws IOException {
assertSame(openWriter, openWriter.append(null, 2, 1));
}
- @Test(groups = "open")
+ @Test
public static void testFlush() throws IOException {
openWriter.flush();
}
- @Test(groups = "open")
+ @Test
public static void testWrite() throws IOException {
openWriter.write(62832);
}
- @Test(groups = "open")
+ @Test
public static void testWriteString() throws IOException {
openWriter.write("");
}
- @Test(groups = "open")
+ @Test
public static void testWriteStringII() throws IOException {
openWriter.write("", 0, 0);
}
- @Test(groups = "open")
+ @Test
public static void testWriteBII() throws IOException, Exception {
openWriter.write(new char[]{(char) 6}, 0, 1);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testAppendCharClosed() throws IOException {
closedWriter.append('x');
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testAppendCharSequenceClosed() throws IOException {
CharSequence cs = "abc";
closedWriter.append(cs);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testAppendCharSequenceNullClosed() throws IOException {
closedWriter.append(null);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testAppendCharSequenceIIClosed() throws IOException {
CharSequence cs = "abc";
closedWriter.append(cs, 0, 1);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testAppendCharSequenceIINullClosed() throws IOException {
closedWriter.append(null, 2, 1);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testFlushClosed() throws IOException {
closedWriter.flush();
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testWriteClosed() throws IOException {
closedWriter.write(62832);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testWriteStringClosed() throws IOException {
closedWriter.write("");
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testWriteStringIIClosed() throws IOException {
closedWriter.write("", 0, 0);
}
- @Test(groups = "closed", expectedExceptions = IOException.class)
+ @Test(expectedExceptions = IOException.class)
public static void testWriteBIIClosed() throws IOException {
closedWriter.write(new char[]{(char) 6}, 0, 1);
}
