Fix unit tests

This commit is contained in:
nsubiron 2018-02-26 18:14:04 +01:00
parent 2d7c59b33f
commit 1fc3753ae6
4 changed files with 27 additions and 13 deletions

View File

@ -74,9 +74,9 @@ run_test_release:
launch_test_clients:
@echo "Launch echo client"
@python3 $(PYTHON_CLIENT_FOLDER)/test_client.py --echo -p 4000 --log echo_client.log & echo $$! > echo_client.pid
@python3 $(PYTHON_CLIENT_FOLDER)/test_client.py --echo -v -p 4000 --log echo_client.log & echo $$! > echo_client.pid
@echo "Launch carla client"
@python3 $(PYTHON_CLIENT_FOLDER)/test_client.py -p 2000 --log carla_client.log & echo $$! > carla_client.pid
@python3 $(PYTHON_CLIENT_FOLDER)/test_client.py -v -p 2000 --log carla_client.log & echo $$! > carla_client.pid
kill_test_clients:
@echo "Kill echo client"

View File

@ -67,8 +67,8 @@ def run_carla_client(args):
images = [x for x in sensor_data.values() if isinstance(x, Image)]
logging.debug('received data of %d agents', len(measurements.non_player_agents))
assert len(images) == 1
assert (images[0].width, images[0].height) == (camera.ImageSizeX, camera.ImageSizeY)
if len(images) > 0:
assert (images[0].width, images[0].height) == (camera.ImageSizeX, camera.ImageSizeY)
if args.images_to_disk:
images[0].save_to_disk(filename.format(episode, frame))

View File

@ -2,8 +2,6 @@
#include <gtest/gtest.h>
#include <random>
namespace test {
static uint32_t ID_COUNT = 0u;
@ -17,14 +15,23 @@ namespace test {
carla_sensor_data Sensor::MakeRandomData() {
std::lock_guard<std::mutex> lock(_mutex);
std::random_device device;
std::default_random_engine rng(device());
std::uniform_int_distribution<uint32_t> dist(1, 10000);
_data.header_size = dist(rng);
_data.data_size = dist(rng);
const struct {
uint32_t Width;
uint32_t Height;
uint32_t Type;
float FOV;
} ImageHeader = {300u, 200u, 1u, 90.0f};
_header = std::make_unique<const unsigned char[]>(_data.header_size);
_data.header_size = sizeof(ImageHeader);
auto header = std::make_unique<unsigned char[]>(_data.header_size);
std::memcpy(
reinterpret_cast<void *>(header.get()),
reinterpret_cast<const void *>(&ImageHeader),
_data.header_size);
_header = std::move(header);
_data.data_size = 300u * 200u;
_buffer = std::make_unique<const unsigned char[]>(_data.data_size);
_data.header = _header.get();

View File

@ -101,7 +101,14 @@ TEST(CarlaServerAPI, SimBlocking) {
ASSERT_EQ(S, carla_write_episode_ready(CarlaServer, values, TIMEOUT));
}
std::array<carla_agent, 10u> agents_data;
std::array<carla_agent, 30u> agents_data;
for (auto i = 0u; i < agents_data.size(); ++i) {
agents_data[i].id = i;
agents_data[i].type = CARLA_SERVER_AGENT_VEHICLE;
agents_data[i].transform = start_locations[0u];
agents_data[i].box_extent = {100.0f, 100.0f, 100.0f};
agents_data[i].forward_speed = 50.0f;
}
std::atomic_bool done{false};