Minor modifications to jfjoch_writer and OpenAPI
This commit is contained in:
+16
-16
@@ -44,8 +44,8 @@ TEST_CASE("CBORSerialize_Start", "[CBOR]") {
|
||||
.channels = {"default", "sc2"},
|
||||
.detector_description = "EIGER 16M",
|
||||
.detector_serial_number = "123",
|
||||
.series_unique_id = "bla",
|
||||
.series_id = 4567,
|
||||
.run_name = "bla",
|
||||
.run_number = 4567,
|
||||
.gain_file_names = {"abc" , "def", "/dsadasdsa/dadsadas/dsadsa/M056.bin"},
|
||||
.roi_names = {"roi0", "roi1"},
|
||||
.goniometer = GoniometerAxis{
|
||||
@@ -110,8 +110,8 @@ TEST_CASE("CBORSerialize_Start", "[CBOR]") {
|
||||
CHECK(output_message.channels == message.channels);
|
||||
CHECK(output_message.detector_description == message.detector_description);
|
||||
CHECK(output_message.detector_serial_number == message.detector_serial_number);
|
||||
CHECK(output_message.series_unique_id == message.series_unique_id);
|
||||
CHECK(output_message.series_id == message.series_id);
|
||||
CHECK(output_message.run_name == message.run_name);
|
||||
CHECK(output_message.run_number == message.run_number);
|
||||
CHECK(output_message.source_type == message.source_type);
|
||||
CHECK(output_message.source_name == message.source_name);
|
||||
CHECK(output_message.source_name_short == message.source_name_short);
|
||||
@@ -241,8 +241,8 @@ TEST_CASE("CBORSerialize_End", "[CBOR]") {
|
||||
.max_receiver_delay = 3456,
|
||||
.efficiency = 0.99,
|
||||
.end_date = "ccc",
|
||||
.series_unique_id = "bla5",
|
||||
.series_id = 45676782
|
||||
.run_name = "bla5",
|
||||
.run_number = 45676782
|
||||
};
|
||||
|
||||
REQUIRE_NOTHROW(serializer.SerializeSequenceEnd(message));
|
||||
@@ -260,8 +260,8 @@ TEST_CASE("CBORSerialize_End", "[CBOR]") {
|
||||
REQUIRE(output_message.efficiency);
|
||||
REQUIRE(output_message.efficiency == Catch::Approx(message.efficiency.value()));
|
||||
REQUIRE(output_message.end_date == message.end_date);
|
||||
REQUIRE(output_message.series_id == message.series_id);
|
||||
REQUIRE(output_message.series_unique_id == message.series_unique_id);
|
||||
REQUIRE(output_message.run_number == message.run_number);
|
||||
REQUIRE(output_message.run_name == message.run_name);
|
||||
REQUIRE(output_message.az_int_result.empty());
|
||||
}
|
||||
|
||||
@@ -274,8 +274,8 @@ TEST_CASE("CBORSerialize_End_RadIntResult", "[CBOR]") {
|
||||
.max_receiver_delay = 3456,
|
||||
.efficiency = 0.99,
|
||||
.end_date = "ccc",
|
||||
.series_unique_id = "bla5",
|
||||
.series_id = 45676782
|
||||
.run_name = "bla5",
|
||||
.run_number = 45676782
|
||||
};
|
||||
|
||||
message.az_int_result["avg"] = {11.0, 12.0, 13.0};
|
||||
@@ -304,8 +304,8 @@ TEST_CASE("CBORSerialize_End_ADUHistogram", "[CBOR]") {
|
||||
.max_receiver_delay = 3456,
|
||||
.efficiency = 0.99,
|
||||
.end_date = "ccc",
|
||||
.series_unique_id = "bla5",
|
||||
.series_id = 45676782,
|
||||
.run_name = "bla5",
|
||||
.run_number = 45676782,
|
||||
.adu_histogram_bin_width = 55
|
||||
};
|
||||
|
||||
@@ -361,8 +361,8 @@ TEST_CASE("CBORSerialize_Image", "[CBOR]") {
|
||||
.adu_histogram = {3, 4, 5, 8},
|
||||
.timestamp = 1ul<<27 | 1ul <<35,
|
||||
.exptime = 1000,
|
||||
.series_unique_id = "bla2",
|
||||
.series_id = 4567678,
|
||||
.run_name = "bla2",
|
||||
.run_number = 4567678,
|
||||
.saturated_pixel_count = 378,
|
||||
.error_pixel_count = 123,
|
||||
.strong_pixel_count = 1234,
|
||||
@@ -393,8 +393,8 @@ TEST_CASE("CBORSerialize_Image", "[CBOR]") {
|
||||
REQUIRE(image_array.image.size == test.size());
|
||||
REQUIRE(image_array.indexing_result == message.indexing_result);
|
||||
REQUIRE(image_array.number == 456);
|
||||
REQUIRE(image_array.series_id == message.series_id);
|
||||
REQUIRE(image_array.series_unique_id == message.series_unique_id);
|
||||
REQUIRE(image_array.run_number == message.run_number);
|
||||
REQUIRE(image_array.run_name == message.run_name);
|
||||
REQUIRE(memcmp(image_array.image.data, test.data(), test.size()) == 0);
|
||||
|
||||
REQUIRE(image_array.xfel_pulse_id == message.xfel_pulse_id);
|
||||
|
||||
Reference in New Issue
Block a user