Unit tests: apply clang-format

Author: tstenner

testing/bench_ext_bounce.cpp

@@ -1,5 +1,5 @@
-#include "helpers.h"
 #include "catch.hpp"
+#include "helpers.h"
 #include <lsl_cpp.h>
 
 TEST_CASE("bounce", "[basic][latency]") {

testing/bench_ext_common.cpp

@@ -4,4 +4,3 @@
 TEST_CASE("common") {
 	BENCHMARK("lsl_clock") { return lsl_local_clock(); };
 }
-

testing/bench_ext_pushpull.cpp

@@ -12,14 +12,14 @@ TEMPLATE_TEST_CASE("pushpull", "[basic][throughput]", char, float, std::string)
 	const std::size_t param_inlets[] = {0, 1, 10};
 
 	const TestType data[max_nchan * chunk_size] = {TestType()};
-	//TestType data_out[max_n * chunk_size];
+	// TestType data_out[max_n * chunk_size];
 
 	const char *name = SampleType<TestType>::fmt_string();
 	lsl::channel_format_t cf = (lsl::channel_format_t)SampleType<TestType>::chan_fmt;
 
 	for (auto nchan : param_nchan) {
 		lsl::stream_outlet out(
-			lsl::stream_info(name, "PushPull", (int) nchan, lsl::IRREGULAR_RATE, cf, "streamid"));
+			lsl::stream_info(name, "PushPull", (int)nchan, lsl::IRREGULAR_RATE, cf, "streamid"));
 		auto found_stream_info(lsl::resolve_stream("name", name, 1, 2.0));
 		REQUIRE(!found_stream_info.empty());
 
@@ -30,15 +30,16 @@ TEMPLATE_TEST_CASE("pushpull", "[basic][throughput]", char, float, std::string)
 				inlet_list.front().open_stream(.5);
 			}
 
-			BENCHMARK("push_sample_nchan_" + std::to_string(nchan)+"_inlets_"+std::to_string(n_inlets)) {
+			BENCHMARK("push_sample_nchan_" + std::to_string(nchan) + "_inlets_" +
+					  std::to_string(n_inlets)) {
 				for (size_t s = 0; s < chunk_size; s++) out.push_sample(data);
 			};
 
-			BENCHMARK("push_chunk_nchan_" + std::to_string(nchan)+"_inlets_"+std::to_string(n_inlets)) {
+			BENCHMARK("push_chunk_nchan_" + std::to_string(nchan) + "_inlets_" +
+					  std::to_string(n_inlets)) {
 				out.push_chunk_multiplexed(data, chunk_size);
 			};
-			for(auto &inlet: inlet_list)
-				inlet.flush();
+			for (auto &inlet : inlet_list) inlet.flush();
 		}
 	}
 }

testing/test_ext_DataType.cpp

@@ -1,14 +1,15 @@
 #include "catch.hpp"
-#include "helpers.h"
 #include "helper_type.hpp"
+#include "helpers.h"
 #include <cstdint>
 #include <lsl_cpp.h>
 
-TEMPLATE_TEST_CASE("datatransfer", "[datatransfer][basic]", char, int16_t, int32_t, int64_t, float, double) {
+TEMPLATE_TEST_CASE(
+	"datatransfer", "[datatransfer][basic]", char, int16_t, int32_t, int64_t, float, double) {
 	const int numBounces = sizeof(TestType) * 8;
 	double timestamps[numBounces][2];
-	const char* name = SampleType<TestType>::fmt_string();
-	lsl::channel_format_t cf = (lsl::channel_format_t) SampleType<TestType>::chan_fmt;
+	const char *name = SampleType<TestType>::fmt_string();
+	lsl::channel_format_t cf = (lsl::channel_format_t)SampleType<TestType>::chan_fmt;
 
 	Streampair sp(create_streampair(
 		lsl::stream_info(name, "Bounce", 2, lsl::IRREGULAR_RATE, cf, "streamid")));
@@ -37,8 +38,8 @@ TEMPLATE_TEST_CASE("datatransfer", "[datatransfer][basic]", char, int16_t, int32
 TEST_CASE("data datatransfer", "[datatransfer][multi][string]") {
 	const std::size_t numChannels = 2;
 
-	Streampair sp(create_streampair(
-		lsl::stream_info("cf_string", "DataType", numChannels, lsl::IRREGULAR_RATE, lsl::cf_string, "streamid")));
+	Streampair sp(create_streampair(lsl::stream_info(
+		"cf_string", "DataType", numChannels, lsl::IRREGULAR_RATE, lsl::cf_string, "streamid")));
 
 	std::vector<std::string> sent_data, received_data(numChannels);
 	const char nullstr[] = "\0Test\0string\0with\0nulls";
@@ -49,23 +50,22 @@ TEST_CASE("data datatransfer", "[datatransfer][multi][string]") {
 	CHECK(sp.in_.pull_sample(received_data, 5.) != 0.0);
 	CHECK(received_data[0] == sent_data[0]);
 	// Manually check second string for equality to avoid printing the entire test string
-	if(received_data[1] != sent_data[1])
+	if (received_data[1] != sent_data[1])
 		FAIL("Sent large string data doesn't match received data");
 }
 
 TEST_CASE("TypeConversion", "[datatransfer][types][basic]") {
-	Streampair sp{
-		create_streampair(lsl::stream_info("TypeConversion", "int2str2int", 1, 1, lsl::cf_string, "TypeConversion"))};
+	Streampair sp{create_streampair(
+		lsl::stream_info("TypeConversion", "int2str2int", 1, 1, lsl::cf_string, "TypeConversion"))};
 	const int num_bounces = 31;
 	std::vector<int32_t> data;
 	for (int i = 0; i < num_bounces; ++i) data.push_back(1 << i);
 
 	sp.out_.push_chunk_multiplexed(data);
 
-	for (int32_t val: data) {
+	for (int32_t val : data) {
 		int32_t result;
 		sp.in_.pull_sample(&result, 1, 1.);
 		CHECK(result == val);
 	}
 }
-

testing/test_ext_move.cpp

@@ -63,4 +63,4 @@ TEST_CASE("move C++ API types", "[move][basic]") {
 	REQUIRE(found_stream_info.empty());
 }
 
-}
+} // namespace

testing/test_ext_time.cpp

@@ -1,7 +1,7 @@
-#include "helpers.h"
 #include "catch.hpp"
-#include <lsl_cpp.h>
+#include "helpers.h"
 #include <atomic>
+#include <lsl_cpp.h>
 #include <thread>
 
 namespace {
@@ -21,11 +21,12 @@ TEST_CASE("simple timesync", "[timesync][basic]") {
 
 
 TEST_CASE("timeouts", "[pull][basic]") {
-	auto sp = create_streampair(lsl::stream_info("timeouts", "Test", 1, lsl::IRREGULAR_RATE, lsl::cf_int8, "timeouts"));
+	auto sp = create_streampair(
+		lsl::stream_info("timeouts", "Test", 1, lsl::IRREGULAR_RATE, lsl::cf_int8, "timeouts"));
 	std::atomic<bool> done{false};
 
 	// Push a sample after some time so the test can continue even if the timeout isn't honored
-	std::thread saver([&](){
+	std::thread saver([&]() {
 		char val;
 		auto end = lsl::local_clock() + 2;
 		while (!done && lsl::local_clock() < end)

testing/test_int_asiocancel.cpp

@@ -18,7 +18,11 @@ const uint16_t port = 28812;
 
 static std::mutex output_mutex;
 
-#define MINFO(str) {std::unique_lock<std::mutex> out_lock(output_mutex); INFO(str)}
+#define MINFO(str)                                                                                 \
+	{                                                                                              \
+		std::unique_lock<std::mutex> out_lock(output_mutex);                                       \
+		INFO(str)                                                                                  \
+	}
 
 template <typename T> void test_cancel_thread(T &&task, cancellable_streambuf &sb) {
 	std::condition_variable cv;

testing/test_int_inireader.cpp

@@ -2,21 +2,21 @@
 #include "catch.hpp"
 #include <sstream>
 
-void try_load(INI& pt, const char* contents) {
+void try_load(INI &pt, const char *contents) {
 	std::istringstream stream{std::string(contents)};
 	pt.load(stream);
 }
 
 TEST_CASE("ini files are parsed correctly", "[ini][basic]") {
 	INI pt;
 	try_load(pt, "x=5\n"
-			 "y=2\n"
-			 "[foo]\n"
-			 "foo=bar\n"
-			 "; foo=commented out\n"
-			 "double=equals=sign\n"
-			 "[white space]\n"
-			 "\tfoo  =\t bar\r\n");
+				 "y=2\n"
+				 "[foo]\n"
+				 "foo=bar\n"
+				 "; foo=commented out\n"
+				 "double=equals=sign\n"
+				 "[white space]\n"
+				 "\tfoo  =\t bar\r\n");
 	CHECK(pt.get("doesntexist", 0) == 0);
 	CHECK(pt.get<int>("defaultval") == 0);
 	CHECK(pt.get<int>("x") == 5);

testing/test_int_samples.cpp

@@ -38,7 +38,7 @@ TEST_CASE("consumer_queue_threaded", "[queue][threads]") {
 
 	unsigned int n = 0, total = 0;
 	// Pull samples until the pusher is done and the queue is empty
-	while((n = queue.flush()) != 0 || !done) total+=n;
+	while ((n = queue.flush()) != 0 || !done) total += n;
 	CHECK(total == size);
 	pusher.join();
 }

testing/test_int_streaminfo.cpp

@@ -1,15 +1,21 @@
-#include "../src/stream_info_impl.h"
 #include "../src/api_config.h"
+#include "../src/stream_info_impl.h"
 #include "catch.hpp"
 
 TEST_CASE("streaminfo matching via XPath", "[basic][streaminfo][xml]") {
 	lsl::stream_info_impl info(
 		"streamname", "streamtype", 8, 500, lsl_channel_format_t::cft_string, "sourceid");
 	auto channels = info.desc().append_child("channels");
-	for(int i=0; i< 4;++i)
-		channels.append_child("channel").append_child("type").append_child(pugi::node_pcdata).set_value("EEG");
-	for(int i=0; i< 4;++i)
-		channels.append_child("channel").append_child("type").append_child(pugi::node_pcdata).set_value("EOG");
+	for (int i = 0; i < 4; ++i)
+		channels.append_child("channel")
+			.append_child("type")
+			.append_child(pugi::node_pcdata)
+			.set_value("EEG");
+	for (int i = 0; i < 4; ++i)
+		channels.append_child("channel")
+			.append_child("type")
+			.append_child(pugi::node_pcdata)
+			.set_value("EOG");
 
 	INFO(info.to_fullinfo_message());
 	REQUIRE(info.matches_query("name='streamname'"));
@@ -24,9 +30,12 @@ TEST_CASE("streaminfo matching via XPath", "[basic][streaminfo][xml]") {
 
 #ifdef CATCH_CONFIG_ENABLE_BENCHMARKING
 	// Append lots of dummy channels for performance tests
-	for(int i=0; i<50000; ++i)
-		channels.append_child("chn").append_child("type").append_child(pugi::node_pcdata).set_value("foobar");
-	for(int i=0; i<2000; ++i) {
+	for (int i = 0; i < 50000; ++i)
+		channels.append_child("chn")
+			.append_child("type")
+			.append_child(pugi::node_pcdata)
+			.set_value("foobar");
+	for (int i = 0; i < 2000; ++i) {
 		channels = channels.append_child("chn");
 		channels.append_child(pugi::node_pcdata).set_value("1");
 	}
@@ -50,5 +59,4 @@ TEST_CASE("streaminfo matching via XPath", "[basic][streaminfo][xml]") {
 	};
 
 #endif
-
 }