Skip to content

Commit aece6f4

Browse files
dfuchdfuch
committed
8381842: Refactor remaining TestNG tests under java/net/ to use JUnit
Reviewed-by: vyazici
1 parent d114e8d commit aece6f4

17 files changed

Lines changed: 527 additions & 508 deletions

‎test/jdk/java/net/DatagramPacket/Constructor.java‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,19 @@
2525
* @bug 4091803 7021373
2626
* @summary this tests that the constructor of DatagramPacket rejects
2727
* bogus arguments properly.
28-
* @run testng Constructor
28+
* @run junit ${test.main.class}
2929
*/
3030

3131
import java.net.DatagramPacket;
3232
import java.net.InetAddress;
3333
import java.net.InetSocketAddress;
3434

35-
import org.testng.annotations.Test;
36-
37-
import static org.testng.Assert.assertFalse;
38-
import static org.testng.Assert.assertTrue;
39-
import static org.testng.Assert.expectThrows;
35+
import org.junit.jupiter.api.Test;
36+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
37+
import static org.junit.jupiter.api.Assertions.assertEquals;
38+
import static org.junit.jupiter.api.Assertions.assertNull;
39+
import static org.junit.jupiter.api.Assertions.assertSame;
40+
import static org.junit.jupiter.api.Assertions.assertThrows;
4041

4142
public class Constructor {
4243

@@ -48,50 +49,48 @@ public class Constructor {
4849

4950
@Test
5051
public void testNullPacket() {
51-
expectThrows(NPE,
52+
assertThrows(NPE,
5253
() -> new DatagramPacket(null, 100));
5354
}
5455
@Test
5556
public void testNull() throws Exception {
56-
expectThrows(NPE, () -> new DatagramPacket(null, 100));
57-
expectThrows(NPE, () -> new DatagramPacket(null, 0, 10));
58-
expectThrows(NPE, () -> new DatagramPacket(null, 0, 10, LOOPBACK, 80));
59-
expectThrows(NPE, () -> new DatagramPacket(null, 10, LOOPBACK, 80));
60-
expectThrows(NPE, () -> new DatagramPacket(null, 0, 10, new InetSocketAddress(80)));
61-
expectThrows(NPE, () -> new DatagramPacket(null, 10, new InetSocketAddress(80)));
57+
assertThrows(NPE, () -> new DatagramPacket(null, 100));
58+
assertThrows(NPE, () -> new DatagramPacket(null, 0, 10));
59+
assertThrows(NPE, () -> new DatagramPacket(null, 0, 10, LOOPBACK, 80));
60+
assertThrows(NPE, () -> new DatagramPacket(null, 10, LOOPBACK, 80));
61+
assertThrows(NPE, () -> new DatagramPacket(null, 0, 10, new InetSocketAddress(80)));
62+
assertThrows(NPE, () -> new DatagramPacket(null, 10, new InetSocketAddress(80)));
6263

6364
// no Exception expected for null addresses
64-
new DatagramPacket(buf, 10, null, 0);
65-
new DatagramPacket(buf, 10, 10, null, 0);
65+
assertDoesNotThrow(() -> new DatagramPacket(buf, 10, null, 0));
66+
assertDoesNotThrow(() -> new DatagramPacket(buf, 10, 10, null, 0));
6667
}
6768

6869
@Test
6970
public void testNegativeBufferLength() {
7071
/* length lesser than buffer length */
71-
expectThrows(IAE,
72-
() -> new DatagramPacket(buf, -128));
72+
assertThrows(IAE, () -> new DatagramPacket(buf, -128));
7373
}
7474

7575
@Test
7676
public void testPacketLengthTooLarge() {
7777
/* length greater than buffer length */
78-
expectThrows(IAE,
79-
() -> new DatagramPacket(buf, 256));
78+
assertThrows(IAE, () -> new DatagramPacket(buf, 256));
8079
}
8180

8281
@Test
8382
public void testNegativePortValue() throws Exception {
8483
/* negative port */
8584
InetAddress addr = InetAddress.getLocalHost();
8685

87-
expectThrows(IAE,
86+
assertThrows(IAE,
8887
() -> new DatagramPacket(buf, 100, addr, -1));
8988
}
9089

9190
@Test
9291
public void testPortValueTooLarge() {
9392
/* invalid port value */
94-
expectThrows(IAE,
93+
assertThrows(IAE,
9594
() -> new DatagramPacket(buf, 128, LOOPBACK, Integer.MAX_VALUE));
9695
}
9796

@@ -101,8 +100,9 @@ public void testSimpleConstructor() {
101100
int length = 50;
102101
DatagramPacket pkt = new DatagramPacket(buf, offset, length);
103102

104-
assertFalse((pkt.getData() != buf || pkt.getOffset() != offset ||
105-
pkt.getLength() != length), "simple constructor failed");
103+
assertSame(buf, pkt.getData());
104+
assertEquals(offset, pkt.getOffset());
105+
assertEquals(length, pkt.getLength());
106106
}
107107

108108
@Test
@@ -112,20 +112,21 @@ public void testFullConstructor() {
112112
int port = 8080;
113113
DatagramPacket packet = new DatagramPacket(buf, offset, length, LOOPBACK, port);
114114

115-
assertFalse((packet.getData() != buf || packet.getOffset() != offset ||
116-
packet.getLength() != length ||
117-
packet.getAddress() != LOOPBACK ||
118-
packet.getPort() != port), "full constructor failed");
115+
assertSame(buf, packet.getData());
116+
assertEquals(offset, packet.getOffset());
117+
assertEquals(length, packet.getLength());
118+
assertSame(LOOPBACK, packet.getAddress());
119+
assertEquals(port, packet.getPort());
119120
}
120121

121122
@Test
122123
public void testDefaultValues() {
123124
DatagramPacket packet = new DatagramPacket(buf, 0);
124-
assertTrue(packet.getAddress() == null);
125-
assertTrue(packet.getPort() == 0);
125+
assertNull(packet.getAddress());
126+
assertEquals(0, packet.getPort());
126127

127128
DatagramPacket packet1 = new DatagramPacket(buf, 0, 0);
128-
assertTrue(packet1.getAddress() == null);
129-
assertTrue(packet1.getPort() == 0);
129+
assertNull(packet1.getAddress());
130+
assertEquals(0, packet1.getPort());
130131
}
131132
}

‎test/jdk/java/net/DatagramPacket/Getters.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,15 @@
2424
/* @test
2525
* @bug 8237890
2626
* @summary Check that DatagramPacket's get methods perform as expected
27-
* @run testng Getters
27+
* @run junit ${test.main.class}
2828
*/
2929

30-
import org.testng.annotations.Test;
31-
3230
import java.net.DatagramPacket;
3331
import java.net.InetSocketAddress;
3432

35-
import static org.testng.Assert.assertTrue;
33+
import org.junit.jupiter.api.Test;
34+
import static org.junit.jupiter.api.Assertions.assertEquals;
35+
import static org.junit.jupiter.api.Assertions.assertTrue;
3636

3737
public class Getters {
3838

@@ -42,6 +42,6 @@ public void testDefaultGetSocketAddress() {
4242
InetSocketAddress addr = (InetSocketAddress)packet.getSocketAddress();
4343

4444
assertTrue(addr.getAddress().isAnyLocalAddress());
45-
assertTrue(addr.getPort() == 0);
45+
assertEquals(0, addr.getPort());
4646
}
4747
}

‎test/jdk/java/net/DatagramPacket/Setters.java‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,19 @@
2525
* @bug 7021373
2626
* @summary check that the DatagramPacket setter methods
2727
* throw the correct exceptions
28-
* @run testng Setters
28+
* @run junit ${test.main.class}
2929
*/
3030

3131

3232
import java.net.DatagramPacket;
3333

34-
import org.testng.annotations.DataProvider;
35-
import org.testng.annotations.Test;
36-
37-
import static org.testng.Assert.assertTrue;
38-
import static org.testng.Assert.expectThrows;
34+
import org.junit.jupiter.api.Test;
35+
import org.junit.jupiter.params.ParameterizedTest;
36+
import org.junit.jupiter.params.provider.MethodSource;
37+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
38+
import static org.junit.jupiter.api.Assertions.assertNull;
39+
import static org.junit.jupiter.api.Assertions.assertThrows;
40+
import static org.junit.jupiter.api.Assertions.assertTrue;
3941

4042
public class Setters {
4143

@@ -50,11 +52,10 @@ public void testSetAddress() throws Exception {
5052

5153
// No Exception expected for null addresses
5254
pkt.setAddress(null);
53-
assertTrue(pkt.getAddress() == null);
55+
assertNull(pkt.getAddress());
5456
}
5557

56-
@DataProvider
57-
Object[][] data() { // add checks for setAddress with null - add getAddress to verify
58+
static Object[][] data() { // add checks for setAddress with null - add getAddress to verify
5859
return new Object[][]{
5960
{ buf, 0, -1, IAE },
6061
{ buf, -1, 1, IAE },
@@ -66,24 +67,24 @@ Object[][] data() { // add checks for setAddress with null - add getAddress to v
6667
};
6768
}
6869

69-
@Test(dataProvider = "data")
70+
@ParameterizedTest
71+
@MethodSource("data")
7072
public void testSetData(byte[] buf,
7173
int offset,
7274
int length,
7375
Class<? extends Exception> exception) {
7476
DatagramPacket pkt = new DatagramPacket(new byte[8], 8);
7577

78+
7679
if (exception != null) {
77-
expectThrows(exception, () -> pkt.setData(buf, offset, length));
78-
} else if (buf == null) {
79-
expectThrows(exception, () -> pkt.setData(buf));
80+
assertThrows(exception, () -> pkt.setData(buf, offset, length));
81+
if (buf == null) assertThrows(exception, () -> pkt.setData(buf));
8082
} else {
81-
pkt.setData(buf, offset, length);
83+
assertDoesNotThrow(() -> pkt.setData(buf, offset, length));
8284
}
8385
}
8486

85-
@DataProvider
86-
Object[][] lengths() {
87+
static Object[][] lengths() {
8788
return new Object[][]{
8889
{ 0, -1, IAE },
8990
{ 8, 1, IAE },
@@ -94,20 +95,20 @@ Object[][] lengths() {
9495
};
9596
}
9697

97-
@Test(dataProvider = "lengths")
98+
@ParameterizedTest
99+
@MethodSource("lengths")
98100
public void testSetLength(int offset, int length,
99101
Class<? extends Exception> exception) {
100102
DatagramPacket pkt = new DatagramPacket(new byte[8], offset, 0);
101103

102104
if (exception != null) {
103-
expectThrows(exception, () -> pkt.setLength(length));
105+
assertThrows(exception, () -> pkt.setLength(length));
104106
} else {
105-
pkt.setLength(length);
107+
assertDoesNotThrow(() -> pkt.setLength(length));
106108
}
107109
}
108110

109-
@DataProvider
110-
Object[][] ports() {
111+
static Object[][] ports() {
111112
return new Object[][]{
112113
{ -1, IAE },
113114
{ -666, IAE },
@@ -122,14 +123,15 @@ Object[][] ports() {
122123
};
123124
}
124125

125-
@Test(dataProvider = "ports")
126+
@ParameterizedTest
127+
@MethodSource("ports")
126128
public void testSetPort(int port, Class<? extends Exception> exception) {
127129
DatagramPacket pkt = new DatagramPacket(new byte[8], 0);
128130

129131
if (exception != null) {
130-
expectThrows(exception, () -> pkt.setPort(port));
132+
assertThrows(exception, () -> pkt.setPort(port));
131133
} else {
132-
pkt.setPort(port);
134+
assertDoesNotThrow(() -> pkt.setPort(port));
133135
}
134136
}
135137
}

‎test/jdk/java/net/InetAddress/HostsFileOrderingTest.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,9 @@
3434

3535
import jdk.test.lib.net.IPSupport;
3636

37-
import org.testng.annotations.BeforeClass;
38-
import org.testng.annotations.Test;
39-
import org.testng.Assert;
37+
import org.junit.jupiter.api.BeforeAll;
38+
import org.junit.jupiter.api.Test;
39+
import static org.junit.jupiter.api.Assertions.fail;
4040

4141

4242
/* @test
@@ -46,32 +46,32 @@
4646
* @summary Test that "jdk.net.hosts.file" NameService implementation returns addresses
4747
* with respect to "java.net.preferIPv4Stack" and "java.net.preferIPv6Addresses" system
4848
* property values
49-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
50-
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=true HostsFileOrderingTest
51-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
52-
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false HostsFileOrderingTest
53-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
54-
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=system HostsFileOrderingTest
55-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
56-
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=notVALID HostsFileOrderingTest
57-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
58-
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true HostsFileOrderingTest
59-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
60-
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=false HostsFileOrderingTest
61-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
62-
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=system HostsFileOrderingTest
63-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
64-
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=notVALID HostsFileOrderingTest
65-
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt HostsFileOrderingTest
49+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
50+
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=true ${test.main.class}
51+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
52+
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false ${test.main.class}
53+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
54+
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=system ${test.main.class}
55+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
56+
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=notVALID ${test.main.class}
57+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
58+
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true ${test.main.class}
59+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
60+
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=false ${test.main.class}
61+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
62+
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=system ${test.main.class}
63+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt
64+
* -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=notVALID ${test.main.class}
65+
* @run junit/othervm -Djdk.net.hosts.file=TestHostsFile.txt ${test.main.class}
6666
*/
6767

6868
public class HostsFileOrderingTest {
6969

7070
/*
7171
* Generate hosts file with the predefined list of IP addresses
7272
*/
73-
@BeforeClass
74-
public void generateHostsFile() throws Exception {
73+
@BeforeAll
74+
public static void generateHostsFile() throws Exception {
7575
String content = ADDRESSES_LIST.stream()
7676
.map(addr -> addr + " " + TEST_HOST_NAME)
7777
.collect(
@@ -97,7 +97,7 @@ public void testOrdering() throws Exception {
9797
} else {
9898
System.err.printf("Expected addresses:%n%s%n", Arrays.deepToString(expectedAddresses));
9999
System.err.printf("Resolved addresses:%n%s%n", Arrays.deepToString(resolvedAddresses));
100-
Assert.fail("Wrong host resolution result is returned");
100+
fail("Wrong host resolution result is returned");
101101
}
102102
}
103103

0 commit comments

Comments
 (0)