openjdk/jdk23u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk23u.git synced 2025-12-13 04:30:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

8334600: TEST java/net/MulticastSocket/IPMulticastIF.java fails on linux-aarch64

Browse Source 
Reviewed-by: clanger
Backport-of: f23295ec1dde58d239a2625c9b1645534a2bb625
This commit is contained in:
SendaoYan 2024-07-01 15:48:32 +00:00 committed by Daniel Fuchs
parent 7040de19bd
commit 4410cdc839
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/jdk/java/net/MulticastSocket/IPMulticastIF.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -63,9 +63,25 @@ public class IPMulticastIF {
InetAddress.getLoopbackAddress()); InetAddress.getLoopbackAddress());
List<Object[]> list = new ArrayList<>(); List<Object[]> list = new ArrayList<>();
NetworkConfiguration nc = NetworkConfiguration.probe(); NetworkConfiguration nc = NetworkConfiguration.probe();
// retains only network interface whose bound addresses match
addrs.stream().forEach(a -> nc.multicastInterfaces(true) addrs.stream().forEach(a -> nc.multicastInterfaces(true)
.filter(nif -> nif.inetAddresses().toList().contains(a))
.map(nif -> new Object[] { new InetSocketAddress(a, 0), nif }) .map(nif -> new Object[] { new InetSocketAddress(a, 0), nif })
.forEach(list::add) ); .forEach(list::add) );
// any network interface should work with the wildcard address
nc.multicastInterfaces(true)
.map(nif -> new Object[] {new InetSocketAddress(0), nif})
.forEach(list::add);
return list.stream().toArray(Object[][]::new);
}
@DataProvider(name = "interfaces")
public Object[][] interfaces() throws Exception {
List<Object[]> list = new ArrayList<>();
NetworkConfiguration nc = NetworkConfiguration.probe();
nc.multicastInterfaces(true)
.map(nif -> new Object[] {nif})
.forEach(list::add);
return list.stream().toArray(Object[][]::new); return list.stream().toArray(Object[][]::new);
} }
@ -82,8 +98,8 @@ public class IPMulticastIF {
} }
} }
@Test(dataProvider = "scenarios") @Test(dataProvider = "interfaces")
public void testSetGetInterfaceUnbound(InetSocketAddress ignore, NetworkInterface nif) public void testSetGetInterfaceUnbound(NetworkInterface nif)
throws Exception throws Exception
{ {
out.println(format("\n\n--- testSetGetInterfaceUnbound nif=[%s]", nif)); out.println(format("\n\n--- testSetGetInterfaceUnbound nif=[%s]", nif));
@ -106,8 +122,8 @@ public class IPMulticastIF {
} }
} }
@Test(dataProvider = "scenarios") @Test(dataProvider = "interfaces")
public void testSetGetOptionUnbound(InetSocketAddress ignore, NetworkInterface nif) public void testSetGetOptionUnbound(NetworkInterface nif)
throws Exception throws Exception
{ {
out.println(format("\n\n--- testSetGetOptionUnbound nif=[%s]", nif)); out.println(format("\n\n--- testSetGetOptionUnbound nif=[%s]", nif));
@ -139,8 +155,8 @@ public class IPMulticastIF {
} }
@Test @Test
public void testGettInterfaceUnbound() throws Exception { public void testGetInterfaceUnbound() throws Exception {
out.println("\n\n--- testGettInterfaceUnbound "); out.println("\n\n--- testGetInterfaceUnbound ");
try (MulticastSocket ms = new MulticastSocket()) { try (MulticastSocket ms = new MulticastSocket()) {
assertPlaceHolder(ms.getNetworkInterface()); assertPlaceHolder(ms.getNetworkInterface());
} }