Skip to content

Commit 89d4ef2

Browse files
Jonathan DowlandRealCLanger
Jonathan Dowland
authored and
RealCLanger
committedSep 30, 2021
8078219: Verify lack of @test tag in files in java/net test directory
Backport-of: a9f92be
·
jdk-11.0.28+0jdk-11.0.14-ga
1 parent e5b1dbf commit 89d4ef2

File tree

3 files changed

+75
-75
lines changed

3 files changed

+75
-75
lines changed
 

‎test/jdk/java/net/MulticastSocket/MulticastAddresses.java

+60-70
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2019, 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
@@ -22,76 +22,32 @@
2222
*/
2323

2424
/*
25-
*
25+
* @test
2626
* @bug 4488458
27+
* @library /test/lib
2728
* @summary Test that MutlicastSocket.joinGroup is working for
2829
* various multicast and non-multicast addresses.
2930
*/
31+
32+
import jdk.test.lib.NetworkConfiguration;
33+
3034
import java.net.*;
31-
import java.util.Enumeration;
3235
import java.io.IOException;
36+
import java.util.stream.Collectors;
3337

3438
public class MulticastAddresses {
35-
36-
public static void main(String args[]) throws Exception {
37-
38-
boolean ipv6_available = false;
39-
NetworkInterface ni = null;
40-
41-
/*
42-
* Examine the network interfaces and determine :-
43-
*
44-
* 1. If host has IPv6 support
45-
* 2. Get reference to a non-loopback interface
46-
*/
47-
Enumeration nifs = NetworkInterface.getNetworkInterfaces();
48-
while (nifs.hasMoreElements()) {
49-
NetworkInterface this_ni = (NetworkInterface)nifs.nextElement();
50-
51-
Enumeration addrs = this_ni.getInetAddresses();
52-
while (addrs.hasMoreElements()) {
53-
InetAddress addr = (InetAddress)addrs.nextElement();
54-
if (addr instanceof Inet6Address) {
55-
ipv6_available = true;
56-
}
57-
58-
if (!addr.isLoopbackAddress() && ni == null) {
59-
ni = this_ni;
60-
}
61-
}
62-
63-
if (ipv6_available) {
64-
break;
65-
}
66-
}
67-
39+
public static void runTest(NetworkInterface ni,
40+
String[] multicasts,
41+
String[] nonMulticasts) throws Exception {
6842
int failures = 0;
6943

70-
String multicasts[] = {
71-
"224.80.80.80",
72-
"ff01::1",
73-
"ff02::1234",
74-
"ff05::a",
75-
"ff0e::1234:a" };
76-
77-
String non_multicasts[] = {
78-
"129.1.1.1",
79-
"::1",
80-
"::129.1.1.1",
81-
"fe80::a00:20ff:fee5:bc02" };
82-
8344
MulticastSocket s = new MulticastSocket();
8445

8546
/* test valid multicast addresses */
86-
87-
for (int i=0; i<multicasts.length; i++) {
47+
for (int i = 0; i < multicasts.length; i++) {
8848
InetAddress ia = InetAddress.getByName(multicasts[i]);
89-
if (ia instanceof Inet6Address && !ipv6_available) {
90-
continue;
91-
}
92-
93-
System.out.println("Test: " + ia);
9449

50+
System.out.println("Test: " + ia + " " + " ni: " + ni);
9551
try {
9652

9753
System.out.print(" joinGroup(InetAddress) ");
@@ -100,8 +56,8 @@ public static void main(String args[]) throws Exception {
10056
System.out.println(" Passed.");
10157

10258
System.out.print(" joinGroup(InetAddress,NetworkInterface) ");
103-
s.joinGroup(new InetSocketAddress(ia,0), ni);
104-
s.leaveGroup(new InetSocketAddress(ia,0), ni);
59+
s.joinGroup(new InetSocketAddress(ia, 0), ni);
60+
s.leaveGroup(new InetSocketAddress(ia, 0), ni);
10561
System.out.println(" Passed.");
10662
} catch (IOException e) {
10763
failures++;
@@ -111,13 +67,8 @@ public static void main(String args[]) throws Exception {
11167
}
11268

11369
/* test non-multicast addresses */
114-
115-
for (int i=0; i<non_multicasts.length; i++) {
116-
InetAddress ia = InetAddress.getByName(non_multicasts[i]);
117-
if (ia instanceof Inet6Address && !ipv6_available) {
118-
continue;
119-
}
120-
70+
for (int i = 0; i < nonMulticasts.length; i++) {
71+
InetAddress ia = InetAddress.getByName(nonMulticasts[i]);
12172
boolean failed = false;
12273

12374
System.out.println("Test: " + ia + " ");
@@ -130,20 +81,59 @@ public static void main(String args[]) throws Exception {
13081
} catch (IOException e) {
13182
System.out.println(" Passed: " + e.getMessage());
13283
}
133-
13484
if (failed) {
13585
s.leaveGroup(ia);
13686
failures++;
13787
}
13888
}
139-
140-
/* done */
141-
14289
s.close();
143-
14490
if (failures > 0) {
14591
throw new Exception(failures + " test(s) failed - see log file.");
14692
}
14793
}
14894

95+
96+
public static void main(String args[]) throws Exception {
97+
98+
String[] multicastIPv4 = {
99+
"224.80.80.80",
100+
};
101+
String[] multicastIPv6 = {
102+
"ff01::1",
103+
"ff02::1234",
104+
"ff05::a",
105+
"ff0e::1234:a"};
106+
107+
String[] nonMulticastIPv4 = {
108+
"129.1.1.1"
109+
};
110+
111+
String[] nonMulticastIPv6 = {
112+
"::1",
113+
"::129.1.1.1",
114+
"fe80::a00:20ff:fee5:bc02"};
115+
116+
/*
117+
* Examine the network interfaces and determine :-
118+
*
119+
* 1. If host has IPv6 support
120+
* 2. Get reference to a non-loopback interface
121+
*/
122+
NetworkConfiguration nc = NetworkConfiguration.probe();
123+
var ipv6List = nc.ip6MulticastInterfaces(false)
124+
.collect(Collectors.toList());
125+
126+
var ipv4List = nc.ip4MulticastInterfaces(false)
127+
.collect(Collectors.toList());
128+
129+
if (ipv6List.retainAll(ipv4List)) {
130+
runTest(ipv6List.get(0), multicastIPv4, nonMulticastIPv4);
131+
runTest(ipv6List.get(0), multicastIPv6, nonMulticastIPv6);
132+
} else {
133+
if (!ipv4List.isEmpty())
134+
runTest(ipv4List.get(0), multicastIPv4, nonMulticastIPv4);
135+
if (!ipv6List.isEmpty())
136+
runTest(ipv6List.get(0), multicastIPv6, nonMulticastIPv6);
137+
}
138+
}
149139
}

‎test/jdk/java/net/MulticastSocket/Reuse.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2019, 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,6 +24,11 @@
2424
import java.net.MulticastSocket;
2525
import java.net.BindException;
2626

27+
/*
28+
* @test
29+
* @summary Check if MulticastSocket sets SO_REUSEADDR
30+
*/
31+
2732
public class Reuse {
2833
public static void main(String[] args) throws Exception {
2934
MulticastSocket s1, s2;

‎test/jdk/java/net/URLClassLoader/GetURLsTest.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2019, 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,19 +25,24 @@
2525
import java.io.*;
2626

2727
/*
28-
* Regression test for URLClassLoader getURLs() and addURL() methods.
28+
* @test
29+
* @summary Regression test for URLClassLoader getURLs() and addURL() methods.
2930
* See RFE 4102580: Need URLClassLoader.getURLs() method
3031
*/
31-
class GetURLsTest {
32+
public class GetURLsTest {
33+
static final String TEST_DIR = System.getProperty("test.src", ".");
34+
3235
public static void main(String[] args) throws Exception {
36+
File testJars = new File(TEST_DIR, "jars");
37+
3338
MyURLClassLoader ucl =
3439
new MyURLClassLoader(new URL[] { new File(".").toURL() });
3540
p("initial urls = ", ucl.getURLs());
3641
URL u = ucl.getResource("GetURLsTest.java");
3742
if (u != null) {
3843
p("found resource = " + u);
3944
}
40-
ucl.addURL(new File("jars", "class_path_test.jar").toURL());
45+
ucl.addURL(new File(testJars, "class_path_test.jar").toURL());
4146
p("new urls = ", ucl.getURLs());
4247
Class c = ucl.loadClass("Foo");
4348
p("found class = " + c);

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Sep 30, 2021

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Sep 30, 2021

Review

Issues

Please sign in to comment.