Skip to content

Commit

Permalink
feat(#3251): same thread
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxonfjvipon
maxonfjvipon committed Sep 23, 2024
1 parent 29050f8 commit 9345f0f
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 160 deletions.
158 changes: 79 additions & 79 deletions eo-runtime/src/test/java/EOorg/EOeolang/EOsys/EOposixTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
import org.eolang.Phi;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
Expand All @@ -60,6 +57,7 @@
* @checkstyle TypeNameCheck (100 lines)
*/
@SuppressWarnings("JTCOP.RuleAllTestsHaveProductionClass")
@Execution(ExecutionMode.SAME_THREAD)
final class EOposixTest {
@Test
@DisabledOnOs(OS.WINDOWS)
Expand All @@ -86,89 +84,91 @@ void invokesGetpidCorrectly() {
);
}

@Nested
@DisabledOnOs(OS.WINDOWS)
@Execution(ExecutionMode.SAME_THREAD)
@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
final class SocketTest {
/**
* Server socket.
*/
private ServerSocket socket;
@Test
void connectsSuccessfullyViaSyscalls() throws IOException {
final ServerSocket socket = EOposixTest.startServer();
final int descriptor = CStdLib.INSTANCE.socket(
CStdLib.AF_INET,
CStdLib.SOCK_STREAM,
CStdLib.IPPROTO_TCP
);
assert descriptor >= 0;
final int connected = CStdLib.INSTANCE.connect(
descriptor,
new SockaddrIn(
(short) CStdLib.AF_INET,
EOposixTest.htons(8080),
CStdLib.INSTANCE.inet_addr("127.0.0.1")
),
16
);
MatcherAssert.assertThat(
"Libc 'connect' syscall should have successfully connected to local server, but it didn't",
connected,
Matchers.equalTo(0)
);
assert CStdLib.INSTANCE.close(descriptor) == 0;
EOposixTest.stopServer(socket);
}

@BeforeEach
void setUp() throws IOException {
this.socket = new ServerSocket(8080);
@Test
void connectsViaSocketObject() throws IOException {
final ServerSocket socket = EOposixTest.startServer();
final Phi sock = Phi.Φ.take("org.eolang.net.socket")
.take("posix-socket")
.copy();
sock.put(0, new Data.ToPhi("127.0.0.1"));
sock.put(1, new Data.ToPhi(8080));
final Phi connected = sock.take("connect").copy();
connected.put(0, new EOposixTest.Scope());
final byte[] result = new Dataized(connected).take();
final byte[] expected = new byte[] {1};
if (!Arrays.equals(result, expected)) {
Logger.info(
this,
"Strerror: %s",
CStdLib.INSTANCE.strerror(CStdLib.INSTANCE.errno())
);
}
MatcherAssert.assertThat(
String.format(
"Posix socket should have connected successfully to local server, but it didn't, message is: '%s'",
new String(result, StandardCharsets.UTF_8)
),
result,
Matchers.equalTo(expected)
);
EOposixTest.stopServer(socket);
}

@AfterEach
void tearDown() throws IOException {
if (this.socket != null && !this.socket.isClosed()) {
this.socket.close();
}
}

@Test
void connectsSuccessfullyViaSyscalls() {
final int descriptor = CStdLib.INSTANCE.socket(
CStdLib.AF_INET,
CStdLib.SOCK_STREAM,
CStdLib.IPPROTO_TCP
);
assert descriptor >= 0;
final int connected = CStdLib.INSTANCE.connect(
descriptor,
new SockaddrIn(
(short) CStdLib.AF_INET,
this.htons(8080),
CStdLib.INSTANCE.inet_addr("127.0.0.1")
),
16
);
MatcherAssert.assertThat(
"Libc 'connect' syscall should have successfully connected to local server, but it didn't",
connected,
Matchers.equalTo(0)
);
assert CStdLib.INSTANCE.close(descriptor) == 0;
}
/**
* Start local server socket.
* @return Local server socket
* @throws IOException If fails
*/
private static ServerSocket startServer() throws IOException {
return new ServerSocket(8080);
}

@Test
void connectsViaSocketObject() {
final Phi sock = Phi.Φ.take("org.eolang.net.socket")
.take("posix-socket")
.copy();
sock.put(0, new Data.ToPhi("127.0.0.1"));
sock.put(1, new Data.ToPhi(8080));
final Phi connected = sock.take("connect").copy();
connected.put(0, new EOposixTest.Scope());
final byte[] result = new Dataized(connected).take();
if (!Arrays.equals(result, new byte[]{0x01})) {
Logger.info(
this,
"HELLOOOOO" + CStdLib.INSTANCE.strerror(
CStdLib.INSTANCE.errno()
)
);
}
MatcherAssert.assertThat(
String.format(
"Posix socket should have connected successfully to local server, but it didn't, message is: '%s'",
new String(result, StandardCharsets.UTF_8)
),
result,
Matchers.equalTo(new byte[] {0x01})
);
/**
* Stop local server.
* @param socket Local server socket
* @throws IOException If fails
*/
private static void stopServer(final ServerSocket socket) throws IOException {
if (socket != null && !socket.isClosed()) {
socket.close();
}
}

/**
* Helper function to convert port number to network byte order (htons).
* @param port Port
* @return Port in network byte order
*/
short htons(final int port) {
return (short) (((port & 0xFF) << 8) | ((port >> 8) & 0xFF));
}
/**
* Helper function to convert port number to network byte order (htons).
* @param port Port
* @return Port in network byte order
*/
private static short htons(final int port) {
return (short) (((port & 0xFF) << 8) | ((port >> 8) & 0xFF));
}

/**
Expand Down
158 changes: 77 additions & 81 deletions eo-runtime/src/test/java/EOorg/EOeolang/EOsys/EOwin32Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.ServerSocket;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.eolang.AtVoid;
import org.eolang.Atom;
Expand All @@ -44,8 +45,6 @@
import org.eolang.Phi;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
Expand All @@ -60,6 +59,7 @@
* @checkstyle TypeNameCheck (100 lines)
*/
@SuppressWarnings("JTCOP.RuleAllTestsHaveProductionClass")
@Execution(ExecutionMode.SAME_THREAD)
final class EOwin32Test {
@Test
@DisabledOnOs({OS.LINUX, OS.MAC, OS.AIX})
Expand Down Expand Up @@ -128,6 +128,35 @@ private static int cleanupsWSA() {
return Winsock.INSTANCE.WSACleanup();
}

/**
* Helper function to convert port number to network byte order (htons).
* @param port Port
* @return Port in network byte order
*/
private static short htons(final int port) {
return (short) (((port & 0xFF) << 8) | ((port >> 8) & 0xFF));
}

/**
* Start local server socket.
* @return Local server socket
* @throws IOException If fails
*/
private static ServerSocket startServer() throws IOException {
return new ServerSocket(8080);
}

/**
* Stop local server.
* @param socket Local server socket
* @throws IOException If fails
*/
private static void stopServer(final ServerSocket socket) throws IOException {
if (socket != null && !socket.isClosed()) {
socket.close();
}
}

/**
* Test case for {@link Winsock}.
* @since 0.40
Expand Down Expand Up @@ -182,88 +211,55 @@ void closesTcpSocket() {
EOwin32Test.cleanupsWSA();
}

@Nested
@Execution(ExecutionMode.SAME_THREAD)
@DisabledOnOs({OS.LINUX, OS.MAC, OS.AIX})
@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
final class ConnectSocketTest {
/**
* Server socket.
*/
private ServerSocket socket;

@BeforeEach
void setUp() throws IOException {
this.socket = new ServerSocket(8080);
}

@AfterEach
void tearDown() throws IOException {
if (this.socket != null && !this.socket.isClosed()) {
this.socket.close();
}
}

@Test
void connectsSuccessfullyViaSyscalls() {
assert EOwin32Test.startupsWSA() == 0;
final int descriptor = EOwin32Test.createsSocket();
assert descriptor >= 0;
final int connected = Winsock.INSTANCE.connect(
descriptor,
new SockaddrIn(
(short) Winsock.AF_INET,
this.htons(8080),
Winsock.INSTANCE.inet_addr("127.0.0.1")
),
16
);
if (connected != 0) {
Logger.info(
this,
"WIN SOCK ERROR " + Winsock.INSTANCE.WSAGetLastError()
);
}
MatcherAssert.assertThat(
"Winsock 'connect' func call should have successfully connected to local server, but it didn't",
connected,
Matchers.equalTo(0)
);
assert EOwin32Test.closesSocket(descriptor) == 0;
EOwin32Test.cleanupsWSA();
}

@Test
void connectsViaSocketObject() {
final Phi sock = Phi.Φ.take("org.eolang.net.socket")
.take("win-socket")
.copy();
sock.put(0, new Data.ToPhi("127.0.0.1"));
sock.put(1, new Data.ToPhi(8080));
final Phi connected = sock.take("connect").copy();
connected.put(0, new EOwin32Test.Scope());
final byte[] result = new Dataized(connected).take();
if (!Arrays.equals(result, new byte[] {1})) {
Logger.info(
this,
"HELLO WIN " + Winsock.INSTANCE.WSAGetLastError()
);
}
MatcherAssert.assertThat(
"Windows socket should have connected successfully to local server, but it didn't",
result,
Matchers.equalTo(new byte[] {1})
);
@Test
void connectsSuccessfullyViaSyscalls() throws IOException {
final ServerSocket socket = EOwin32Test.startServer();
assert EOwin32Test.startupsWSA() == 0;
final int descriptor = EOwin32Test.createsSocket();
assert descriptor >= 0;
final int connected = Winsock.INSTANCE.connect(
descriptor,
new SockaddrIn(
(short) Winsock.AF_INET,
EOwin32Test.htons(8080),
Winsock.INSTANCE.inet_addr("127.0.0.1")
),
16
);
if (connected != 0) {
Logger.info(this, "Error code: %d", Winsock.INSTANCE.WSAGetLastError());
}
MatcherAssert.assertThat(
"Winsock 'connect' func call should have successfully connected to local server, but it didn't",
connected,
Matchers.equalTo(0)
);
assert EOwin32Test.closesSocket(descriptor) == 0;
EOwin32Test.cleanupsWSA();
EOwin32Test.stopServer(socket);
}

/**
* Helper function to convert port number to network byte order (htons).
* @param port Port
* @return Port in network byte order
*/
short htons(final int port) {
return (short) (((port & 0xFF) << 8) | ((port >> 8) & 0xFF));
@Test
void connectsViaSocketObject() throws IOException {
final ServerSocket socket = EOwin32Test.startServer();
final Phi sock = Phi.Φ.take("org.eolang.net.socket").take("win-socket").copy();
sock.put(0, new Data.ToPhi("127.0.0.1"));
sock.put(1, new Data.ToPhi(8080));
final Phi connected = sock.take("connect").copy();
connected.put(0, new EOwin32Test.Scope());
final byte[] result = new Dataized(connected).take();
final byte[] expected = new byte[] {1};
if (!Arrays.equals(result, expected)) {
Logger.info(this, "Error code: %d", Winsock.INSTANCE.WSAGetLastError());
}
MatcherAssert.assertThat(
String.format(
"Windows socket should have connected successfully to local server, but it didn't, message is: %s",
new String(result, StandardCharsets.UTF_8)
),
result, Matchers.equalTo(expected)
);
EOwin32Test.stopServer(socket);
}
}

Expand Down

0 comments on commit 9345f0f

Please sign in to comment.