infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-20 04:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

8233860: AfterClose.java test incorrectly handles IP_MULTICAST_IF

Browse Source 
Correction to invalid value used to ensure test fails as expected.

Reviewed-by: alanb, dfuchs, vtewari
This commit is contained in:
Patrick Concannon 2019-11-14 10:49:20 +00:00
parent cef999178c
commit 11433529aa
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/jdk/java/net/SocketOption/AfterClose.java
View File

@ -34,8 +34,10 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.DatagramSocket;
import java.net.MulticastSocket;
import java.net.NetworkInterface;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import java.net.SocketOption;
import java.nio.channels.DatagramChannel;
import java.nio.channels.ServerSocketChannel;
@ -45,6 +47,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static java.lang.Boolean.*;
@ -57,9 +60,26 @@ public class AfterClose {
static Map<SocketOption<?>,List<Object>> OPTION_VALUES_MAP = optionValueMap();
static boolean supportsMulticast(NetworkInterface ni) {
try {
return ni.supportsMulticast();
} catch (SocketException e) {
return false;
}
}
static List<Object> listNetworkInterfaces() {
try {
return NetworkInterface.networkInterfaces()
.filter(AfterClose::supportsMulticast)
.collect(Collectors.toList());
} catch (Exception e) { }
return List.of();
}
static Map<SocketOption<?>,List<Object>> optionValueMap() {
Map<SocketOption<?>,List<Object>> map = new HashMap<>();
map.put(IP_MULTICAST_IF, listOf(TRUE, FALSE) );
map.put(IP_MULTICAST_IF, listNetworkInterfaces() );
map.put(IP_MULTICAST_LOOP, listOf(TRUE, FALSE) );
map.put(IP_MULTICAST_TTL, listOf(0, 100, 255) );
map.put(IP_TOS, listOf(0, 101, 255) );