Skip to content

Commit e72f960

Browse files
kohlschuetterkohlschuetter
committed
test: common: SocketChannelTests for JEP380/Java, not-yet conn/bound
1 parent fdf8a3a commit e72f960

File tree

4 files changed

+108
-4
lines changed

4 files changed

+108
-4
lines changed

‎junixsocket-common/src/test/java/org/newsclub/net/unix/SelftestProvider.java

+11-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.OutputStreamWriter;
2121
import java.io.PrintWriter;
2222
import java.net.InetSocketAddress;
23+
import java.net.SocketAddress;
2324
import java.nio.charset.Charset;
2425
import java.util.Arrays;
2526
import java.util.HashSet;
@@ -79,9 +80,9 @@ public SelftestProvider() {
7980
registerTest(InetAddressTest.class);
8081

8182
registerTest(org.newsclub.net.unix.domain.InterruptTest.class);
82-
registerTest(COMMON, org.newsclub.net.unix.domain.InterruptIssue158Test.class);
83-
registerTest(COMMON_JEP380, org.newsclub.net.unix.jep380.InterruptIssue158Test.class);
84-
registerTest(COMMON_JAVA_INET, org.newsclub.net.unix.java.InterruptIssue158Test.class);
83+
registerTest(org.newsclub.net.unix.domain.InterruptIssue158Test.class);
84+
registerTestJavaInet(org.newsclub.net.unix.java.InterruptIssue158Test.class);
85+
registerTestJEP380(org.newsclub.net.unix.jep380.InterruptIssue158Test.class);
8586

8687
registerTestJavaInet(org.newsclub.net.unix.java.InterruptTest.class);
8788

@@ -103,6 +104,8 @@ public SelftestProvider() {
103104
registerTest(org.newsclub.net.unix.domain.SocketAddressTest.class);
104105

105106
registerTest(org.newsclub.net.unix.domain.SocketChannelTest.class);
107+
registerTestJavaInet(org.newsclub.net.unix.java.SocketChannelTest.class);
108+
registerTestJEP380(org.newsclub.net.unix.jep380.SocketChannelTest.class);
106109

107110
registerTest(org.newsclub.net.unix.domain.SocketFactoryTest.class);
108111

@@ -138,6 +141,11 @@ private void registerTestJavaInet( //
138141
registerTest(COMMON_JAVA_INET, testJava);
139142
}
140143

144+
private void registerTestJEP380( //
145+
Class<? extends SocketTestBase<SocketAddress>> testJava) {
146+
registerTest(COMMON_JEP380, testJava);
147+
}
148+
141149
private void registerTest(String group, Class<?> test) {
142150
if (test != null) {
143151
testMap.computeIfAbsent(group, (key) -> new LinkedHashSet<>()).add(test);

‎junixsocket-common/src/test/java/org/newsclub/net/unix/SocketChannelTest.java

+27-1
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@
1919

2020
import static org.junit.jupiter.api.Assertions.assertEquals;
2121
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertThrows;
2223
import static org.junit.jupiter.api.Assertions.assertTrue;
2324
import static org.junit.jupiter.api.Assertions.fail;
2425

2526
import java.io.IOException;
2627
import java.net.SocketAddress;
2728
import java.net.SocketException;
2829
import java.net.SocketTimeoutException;
30+
import java.net.StandardSocketOptions;
2931
import java.nio.ByteBuffer;
3032
import java.nio.channels.ClosedChannelException;
33+
import java.nio.channels.NotYetBoundException;
34+
import java.nio.channels.NotYetConnectedException;
3135
import java.nio.channels.ServerSocketChannel;
3236
import java.nio.channels.SocketChannel;
3337
import java.util.Objects;
@@ -159,7 +163,11 @@ private void testDoubleBind(boolean reuseAddress) throws Exception {
159163
});
160164

161165
try (ServerSocketChannel ssc2 = selectorProvider().openServerSocketChannel()) {
162-
ssc2.socket().setReuseAddress(reuseAddress);
166+
try {
167+
ssc2.setOption(StandardSocketOptions.SO_REUSEADDR, reuseAddress);
168+
} catch (UnsupportedOperationException e) {
169+
// ignore
170+
}
163171

164172
try {
165173
wasRebound.set(true);
@@ -406,4 +414,22 @@ protected SocketAddress resolveAddressForSecondBind(SocketAddress originalAddres
406414
protected boolean socketDomainPermitsDoubleBind() {
407415
return false;
408416
}
417+
418+
@Test
419+
public void testReadNotConnectedYet() throws Exception {
420+
SocketChannel sc = newSocketChannel();
421+
assertThrows(NotYetConnectedException.class, () -> sc.read(ByteBuffer.allocate(1)));
422+
}
423+
424+
@Test
425+
public void testWriteNotConnectedYet() throws Exception {
426+
SocketChannel sc = newSocketChannel();
427+
assertThrows(NotYetConnectedException.class, () -> sc.write(ByteBuffer.allocate(1)));
428+
}
429+
430+
@Test
431+
public void testAcceptNotBoundYet() throws Exception {
432+
ServerSocketChannel sc = newServerSocketChannel();
433+
assertThrows(NotYetBoundException.class, sc::accept);
434+
}
409435
}

‎junixsocket-common/src/test/java/org/newsclub/net/unix/java/SocketChannelTest.java

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* junixsocket
3+
*
4+
* Copyright 2009-2024 Christian Kohlschütter
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
package org.newsclub.net.unix.java;
19+
20+
import java.net.InetSocketAddress;
21+
22+
import org.newsclub.net.unix.AFSocketCapability;
23+
import org.newsclub.net.unix.AFSocketCapabilityRequirement;
24+
25+
import com.kohlschutter.annotations.compiletime.SuppressFBWarnings;
26+
27+
@AFSocketCapabilityRequirement(AFSocketCapability.CAPABILITY_UNIX_DOMAIN)
28+
@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
29+
public final class SocketChannelTest extends
30+
org.newsclub.net.unix.SocketChannelTest<InetSocketAddress> {
31+
32+
public SocketChannelTest() {
33+
super(JavaAddressSpecifics.INSTANCE);
34+
}
35+
}

‎junixsocket-common/src/test/java/org/newsclub/net/unix/jep380/SocketChannelTest.java

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* junixsocket
3+
*
4+
* Copyright 2009-2024 Christian Kohlschütter
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
package org.newsclub.net.unix.jep380;
19+
20+
import java.net.SocketAddress;
21+
22+
import org.newsclub.net.unix.AFSocketCapability;
23+
import org.newsclub.net.unix.AFSocketCapabilityRequirement;
24+
25+
import com.kohlschutter.annotations.compiletime.SuppressFBWarnings;
26+
27+
@AFSocketCapabilityRequirement(AFSocketCapability.CAPABILITY_UNIX_DOMAIN)
28+
@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
29+
public final class SocketChannelTest extends
30+
org.newsclub.net.unix.SocketChannelTest<SocketAddress> {
31+
32+
public SocketChannelTest() {
33+
super(JEP380AddressSpecifics.INSTANCE);
34+
}
35+
}

0 commit comments

Comments
 (0)