From 690f2bfcf66ce540b87211a1fa014a6196c214eb Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Thu, 4 Jun 2020 10:09:18 +0200
Subject: [PATCH] Remove tests with format that does not exist

---
 sf-buffer/CMakeLists.txt                |  5 +-
 sf-buffer/include/BufferUdpReceiver.hpp |  2 +-
 sf-buffer/test/test_BufferH5Writer.cpp  | 81 +++++++++++++------------
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/sf-buffer/CMakeLists.txt b/sf-buffer/CMakeLists.txt
index a47f0b7..6ce30ce 100644
--- a/sf-buffer/CMakeLists.txt
+++ b/sf-buffer/CMakeLists.txt
@@ -11,10 +11,7 @@ add_executable(sf-buffer src/main.cpp)
 set_target_properties(sf-buffer PROPERTIES OUTPUT_NAME sf_buffer)
 target_link_libraries(sf-buffer
         core-buffer-lib
-        sf-buffer-lib
-        zmq
-        hdf5
-        hdf5_cpp)
+        sf-buffer-lib)
 
 enable_testing()
 add_subdirectory(test/)
diff --git a/sf-buffer/include/BufferUdpReceiver.hpp b/sf-buffer/include/BufferUdpReceiver.hpp
index 2d97a47..e441b34 100644
--- a/sf-buffer/include/BufferUdpReceiver.hpp
+++ b/sf-buffer/include/BufferUdpReceiver.hpp
@@ -3,7 +3,7 @@
 
 #include <netinet/in.h>
 #include "UdpReceiver.hpp"
-#include "jungfrau.hpp"
+#include "formats.hpp"
 #include "buffer_config.hpp"
 
 class BufferUdpReceiver {
diff --git a/sf-buffer/test/test_BufferH5Writer.cpp b/sf-buffer/test/test_BufferH5Writer.cpp
index 816b41c..353562e 100644
--- a/sf-buffer/test/test_BufferH5Writer.cpp
+++ b/sf-buffer/test/test_BufferH5Writer.cpp
@@ -1,48 +1,49 @@
-#include "BufferH5Writer.hpp"
 #include "gtest/gtest.h"
 
 using namespace core_buffer;
 
-TEST(BufferH5Writer, basic_interaction)
-{
-    auto root_folder = ".";
-    auto device_name = "fast_device";
-    size_t pulse_id = 1;
+// TODO: Rewrite tests with new format.
 
-    auto buffer = make_unique<char[]>(JUNGFRAU_DATA_BYTES_PER_FRAME);
-
-    ModuleFrame metadata;
-    metadata.pulse_id = 1;
-    metadata.frame_index = 2;
-    metadata.daq_rec = 3;
-    metadata.n_received_packets = 128;
-
-    BufferH5Writer writer(root_folder, device_name);
-    writer.set_pulse_id(pulse_id);
-    writer.write(&metadata, buffer.get());
-    writer.close_file();
-
-    auto filename = BufferUtils::get_filename(
-            root_folder, device_name, pulse_id);
-
-    auto file_frame_index = BufferUtils::get_file_frame_index(pulse_id);
-
-    H5::H5File input_file(filename, H5F_ACC_RDONLY);
-
-    auto image_dataset = input_file.openDataSet("image");
-    size_t image_buffer_n_bytes = JUNGFRAU_DATA_BYTES_PER_FRAME * FILE_MOD;
-    auto image_buffer = make_unique<uint16_t[]>(image_buffer_n_bytes);
-    image_dataset.read(image_buffer.get(), H5::PredType::NATIVE_UINT16);
-
-    auto metadata_dataset = input_file.openDataSet("metadata");
-    auto metadata_buffer = make_unique<ModuleFrame[]>(FILE_MOD);
-    metadata_dataset.read(metadata_buffer.get(), H5::PredType::NATIVE_UINT64);
-
-    EXPECT_EQ(metadata_buffer[file_frame_index].pulse_id, 1);
-    EXPECT_EQ(metadata_buffer[file_frame_index].frame_index, 2);
-    EXPECT_EQ(metadata_buffer[file_frame_index].daq_rec, 3);
-    EXPECT_EQ(metadata_buffer[file_frame_index].n_received_packets, 128);
-}
+//TEST(BufferH5Writer, basic_interaction)
+//{
+//    auto root_folder = ".";
+//    auto device_name = "fast_device";
+//    size_t pulse_id = 1;
+//
+//    auto buffer = make_unique<char[]>(JUNGFRAU_DATA_BYTES_PER_FRAME);
+//
+//    ModuleFrame metadata;
+//    metadata.pulse_id = 1;
+//    metadata.frame_index = 2;
+//    metadata.daq_rec = 3;
+//    metadata.n_received_packets = 128;
+//
+//    BufferH5Writer writer(root_folder, device_name);
+//    writer.set_pulse_id(pulse_id);
+//    writer.write(&metadata, buffer.get());
+//    writer.close_file();
+//
+//    auto filename = BufferUtils::get_filename(
+//            root_folder, device_name, pulse_id);
+//
+//    auto file_frame_index = BufferUtils::get_file_frame_index(pulse_id);
+//
+//    H5::H5File input_file(filename, H5F_ACC_RDONLY);
+//
+//    auto image_dataset = input_file.openDataSet("image");
+//    size_t image_buffer_n_bytes = JUNGFRAU_DATA_BYTES_PER_FRAME * FILE_MOD;
+//    auto image_buffer = make_unique<uint16_t[]>(image_buffer_n_bytes);
+//    image_dataset.read(image_buffer.get(), H5::PredType::NATIVE_UINT16);
+//
+//    auto metadata_dataset = input_file.openDataSet("metadata");
+//    auto metadata_buffer = make_unique<ModuleFrame[]>(FILE_MOD);
+//    metadata_dataset.read(metadata_buffer.get(), H5::PredType::NATIVE_UINT64);
+//
+//    EXPECT_EQ(metadata_buffer[file_frame_index].pulse_id, 1);
+//    EXPECT_EQ(metadata_buffer[file_frame_index].frame_index, 2);
+//    EXPECT_EQ(metadata_buffer[file_frame_index].daq_rec, 3);
+//    EXPECT_EQ(metadata_buffer[file_frame_index].n_received_packets, 128);
+//}
 //
 //TEST(BufferH5Writer, SWMR)
 //{