Skip to content

Commit

Permalink
[eclipse-iceoryx#72] Remove explicit ports in udp socket tests, other…
Browse files Browse the repository at this point in the history 
…wise ports already in use will be used in tests
  • Loading branch information
@elfenpiff
elfenpiff committed Jan 5, 2024
1 parent e439684 commit 09c80d2
Showing 1 changed file with 32 additions and 37 deletions.
69 changes: 32 additions & 37 deletions iceoryx2-bb/posix/tests/udp_socket_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ use iceoryx2_bb_posix::{
barrier::{BarrierBuilder, BarrierHandle},
udp_socket::*,
};
use iceoryx2_bb_system_types::{
ipv4_address::{self, Ipv4Address},
port::Port,
};
use iceoryx2_bb_system_types::ipv4_address::{self, Ipv4Address};
use iceoryx2_bb_testing::assert_that;

const TIMEOUT: Duration = Duration::from_millis(25);
Expand Down Expand Up @@ -71,76 +68,83 @@ fn udp_socket_send_receive_works() {

#[test]
fn udp_socket_server_with_same_address_and_port_fails() {
let _sut_server_1 = UdpServerBuilder::new()
let sut_server_1 = UdpServerBuilder::new()
.address(Ipv4Address::new(127, 0, 0, 1))
.port(Port::new(55555))
.listen()
.unwrap();

let sut_server_2 = UdpServerBuilder::new()
.address(Ipv4Address::new(127, 0, 0, 1))
.port(Port::new(55555))
.port(sut_server_1.port())
.listen();

assert_that!(sut_server_2.err().unwrap(), eq UdpServerCreateError::AddressAlreadyInUse);
}

#[test]
fn udp_socket_when_socket_goes_out_of_scope_address_is_free_again() {
let port;
{
let _sut_server_1 = UdpServerBuilder::new()
let sut_server_1 = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55555))
.listen()
.unwrap();
port = sut_server_1.port();
}

let sut_server_2 = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55555))
.port(port)
.listen();

assert_that!(sut_server_2, is_ok);
}

#[test]
fn udp_socket_server_has_correct_address() {
let port;
{
let sut_server_1 = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.listen()
.unwrap();
port = sut_server_1.port();
}

let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55223))
.port(port)
.listen()
.unwrap();

assert_that!(sut_server.address(), eq ipv4_address::LOCALHOST);
assert_that!(sut_server.port(), eq Port::new(55223));
assert_that!(sut_server.port(), eq port);
}

#[test]
fn udp_socket_client_returns_address_of_server() {
let _sut_server = UdpServerBuilder::new()
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

assert_that!(sut_client.address(), eq ipv4_address::LOCALHOST);
assert_that!(sut_client.port(), eq Port::new(55222));
assert_that!(sut_client.address(), eq sut_server.address());
assert_that!(sut_client.port(), eq sut_server.port());
}

#[test]
fn udp_socket_client_can_send_data_to_server() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let send_buffer = [12u8, 24u8, 36u8];
Expand All @@ -154,12 +158,11 @@ fn udp_socket_client_can_send_data_to_server() {
fn udp_socket_server_can_send_data_to_client() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let send_buffer = [12u8, 24u8, 36u8];
Expand All @@ -179,14 +182,13 @@ fn udp_socket_server_can_send_data_to_client() {

#[test]
fn udp_socket_client_try_receive_does_not_block() {
let _sut_server = UdpServerBuilder::new()
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let mut recv_buffer = [0u8; 8];
Expand All @@ -197,7 +199,6 @@ fn udp_socket_client_try_receive_does_not_block() {
fn udp_socket_server_try_receive_from_does_not_block() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

Expand All @@ -210,14 +211,13 @@ fn udp_socket_server_try_receive_from_does_not_block() {

#[test]
fn udp_socket_client_timed_receive_does_block_for_at_least_timeout() {
let _sut_server = UdpServerBuilder::new()
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let mut recv_buffer = [0u8; 8];
Expand All @@ -230,7 +230,6 @@ fn udp_socket_client_timed_receive_does_block_for_at_least_timeout() {
fn udp_socket_server_timed_receive_from_does_block_for_at_least_timeout() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

Expand All @@ -249,12 +248,11 @@ fn udp_socket_server_timed_receive_from_does_block_for_at_least_timeout() {
fn udp_socket_client_blocking_receive_does_block() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let send_buffer = [12u8, 24u8, 36u8];
Expand Down Expand Up @@ -296,12 +294,11 @@ fn udp_socket_client_blocking_receive_does_block() {
fn udp_socket_server_blocking_receive_from_does_block() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let barrier_handle = BarrierHandle::new();
Expand Down Expand Up @@ -334,12 +331,11 @@ fn udp_socket_server_blocking_receive_from_does_block() {
fn udp_socket_client_timed_receive_does_blocks() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let send_buffer = [12u8, 24u8, 36u8];
Expand Down Expand Up @@ -381,12 +377,11 @@ fn udp_socket_client_timed_receive_does_blocks() {
fn udp_socket_server_timed_receive_from_does_block() {
let sut_server = UdpServerBuilder::new()
.address(ipv4_address::LOCALHOST)
.port(Port::new(55222))
.listen()
.unwrap();

let sut_client = UdpClientBuilder::new(ipv4_address::LOCALHOST)
.connect_to(Port::new(55222))
.connect_to(sut_server.port())
.unwrap();

let barrier_handle = BarrierHandle::new();
Expand Down

0 comments on commit 09c80d2

Please sign in to comment.