From 2265e4e12376a645e4adc23f754d57322ed48286 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 14 Aug 2020 22:17:13 +0300
Subject: [PATCH] Fix file tests
---
components/calibration/test/test_parameters.cpp | 13 +++++++------
components/streams/test/filestream_unit.cpp | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/components/calibration/test/test_parameters.cpp b/components/calibration/test/test_parameters.cpp
index 355be37d3..d0cdc2d4b 100644
--- a/components/calibration/test/test_parameters.cpp
+++ b/components/calibration/test/test_parameters.cpp
@@ -1,6 +1,7 @@
#include "catch.hpp"
#include <ftl/calibration/parameters.hpp>
#include <ftl/calibration/structures.hpp>
+#include <ftl/file.hpp>
using cv::Size;
using cv::Mat;
@@ -55,15 +56,15 @@ TEST_CASE("Test reading/writing file") {
calib.intrinsic.cy = 0.5;
data.get(Channel::Left) = calib;
- data.writeFile("/tmp/calib.yml");
- calib_read = CalibrationData::readFile("/tmp/calib.yml");
+ data.writeFile((std::filesystem::temp_directory_path() / "calib.yml").string());
+ calib_read = CalibrationData::readFile((std::filesystem::temp_directory_path() / "calib.yml").string());
REQUIRE(calib_read.hasCalibration(Channel::Left));
- data.writeFile("/tmp/calib.json");
- calib_read = CalibrationData::readFile("/tmp/calib.json");
+ data.writeFile((std::filesystem::temp_directory_path() / "calib.json").string());
+ calib_read = CalibrationData::readFile((std::filesystem::temp_directory_path() / "calib.json").string());
REQUIRE(calib_read.hasCalibration(Channel::Left));
- data.writeFile("/tmp/calib.xml");
- calib_read = CalibrationData::readFile("/tmp/calib.xml");
+ data.writeFile((std::filesystem::temp_directory_path() / "calib.xml").string());
+ calib_read = CalibrationData::readFile((std::filesystem::temp_directory_path() / "calib.xml").string());
REQUIRE(calib_read.hasCalibration(Channel::Left));
}
diff --git a/components/streams/test/filestream_unit.cpp b/components/streams/test/filestream_unit.cpp
index 6bb3bd176..53287ae95 100644
--- a/components/streams/test/filestream_unit.cpp
+++ b/components/streams/test/filestream_unit.cpp
@@ -3,6 +3,7 @@
#include <ftl/streams/filestream.hpp>
#include <nlohmann/json.hpp>
#include <ftl/timer.hpp>
+#include <ftl/file.hpp>
using ftl::stream::File;
using ftl::stream::Stream;
@@ -25,7 +26,7 @@ TEST_CASE("ftl::stream::File write and read", "[stream]") {
REQUIRE(writer);
SECTION("write read single packet") {
- writer->set("filename", "/tmp/ftl_file_stream_test.ftl");
+ writer->set("filename", (std::filesystem::temp_directory_path() / "ftl_file_stream_test.ftl").string());
writer->setMode(File::Mode::Write);
REQUIRE( writer->begin() );
@@ -34,7 +35,7 @@ TEST_CASE("ftl::stream::File write and read", "[stream]") {
writer->end();
- reader->set("filename", "/tmp/ftl_file_stream_test.ftl");
+ reader->set("filename", (std::filesystem::temp_directory_path() / "ftl_file_stream_test.ftl").string());
ftl::codecs::StreamPacket tspkt = {4,0,0,1,ftl::codecs::Channel::Colour};
auto h = reader->onPacket([&tspkt](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) {
@@ -52,7 +53,7 @@ TEST_CASE("ftl::stream::File write and read", "[stream]") {
}
SECTION("write read multiple packets at same timestamp") {
- writer->set("filename", "/tmp/ftl_file_stream_test.ftl");
+ writer->set("filename", (std::filesystem::temp_directory_path() / "ftl_file_stream_test.ftl").string());
writer->setMode(File::Mode::Write);
REQUIRE( writer->begin() );
@@ -63,7 +64,7 @@ TEST_CASE("ftl::stream::File write and read", "[stream]") {
writer->end();
- reader->set("filename", "/tmp/ftl_file_stream_test.ftl");
+ reader->set("filename", (std::filesystem::temp_directory_path() / "ftl_file_stream_test.ftl").string());
ftl::codecs::StreamPacket tspkt = {4,0,0,1,ftl::codecs::Channel::Colour};
int count = 0;
@@ -84,7 +85,7 @@ TEST_CASE("ftl::stream::File write and read", "[stream]") {
}
SECTION("write read multiple packets at different timestamps") {
- writer->set("filename", "/tmp/ftl_file_stream_test.ftl");
+ writer->set("filename", (std::filesystem::temp_directory_path() / "ftl_file_stream_test.ftl").string());
writer->setMode(File::Mode::Write);
REQUIRE( writer->begin() );
@@ -96,7 +97,7 @@ TEST_CASE("ftl::stream::File write and read", "[stream]") {
writer->end();
- reader->set("filename", "/tmp/ftl_file_stream_test.ftl");
+ reader->set("filename", (std::filesystem::temp_directory_path() / "ftl_file_stream_test.ftl").string());
ftl::codecs::StreamPacket tspkt = {4,0,0,1,ftl::codecs::Channel::Colour};
int count = 0;
--
GitLab