Refactor tests

src/python/dicomifier/bruker/Dataset.cpp

@@ -96,6 +96,13 @@ ::set_field(Field const & field)
     this->_fields[field.name] = field;
 }
 
+std::size_t
+Dataset
+::size() const
+{
+    return this->_fields.size();
+}
+
 void
 Dataset
 ::_load(std::string::const_iterator begin, std::string::const_iterator end)

src/python/dicomifier/bruker/Dataset.h

@@ -44,6 +44,8 @@ class Dataset
      * (except the PixelData file)
      */
     std::vector<std::string> const & get_used_files() const;
+
+    std::size_t size() const;
 
     typedef std::map<std::string, Field>::const_iterator const_iterator;
     const_iterator begin() const { return this->_fields.begin(); }

src/python/dicomifier/wrappers/Dataset.cpp

@@ -44,6 +44,7 @@ void wrap_Dataset(pybind11::module & m)
             return_value_policy::reference_internal, R"doc(
                 Return a set of files used to create the dataset 
                 (except the PixelData file))doc")
+        .def("__len__",  &Dataset::size)
         .def("__contains__", &Dataset::has_field)
         .def(
             "__getitem__", &Dataset::get_field, 
@@ -53,6 +54,11 @@ void wrap_Dataset(pybind11::module & m)
             [](Dataset const & d) { 
                 return make_key_iterator(d.begin(), d.end()); },
             keep_alive<0, 1>())
+        .def(
+            "keys", 
+            [](Dataset const & d) { 
+                return make_key_iterator(d.begin(), d.end()); },
+            keep_alive<0, 1>())
         .def(
             "items", 
             [](Dataset const & d) { return make_iterator(d.begin(), d.end()); },

tests/CMakeLists.txt

@@ -1,32 +1,3 @@
-find_package(
-    Boost 1.58 COMPONENTS filesystem system unit_test_framework REQUIRED)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib ${Boost_INCLUDE_DIRS})
-add_definitions(-DBOOST_FILESYSTEM_VERSION=3 -DBOOST_TEST_DYN_LINK)
-link_directories(${Boost_LIBRARY_DIRS})
-
-file(GLOB_RECURSE tests *.cpp)
-foreach(test_file ${tests})
-    get_filename_component(test ${test_file} NAME_WE)
-    add_executable(${test} ${test_file})
-    target_link_libraries(
-        ${test}
-        libdicomifier
-        ${Boost_LIBRARIES} ${JsonCpp_LIBRARIES})
-
-    file(READ ${test_file} content)    
-
-    set(pattern "BOOST_(AUTO|FIXTURE)_TEST_CASE\\(([^),]+)")
-
-    string(REGEX MATCHALL ${pattern} cases ${content})
-
-    foreach(case ${cases})
-        string(REGEX REPLACE ${pattern} "\\2" case ${case})
-        add_test("${test}_${case}" "${test}" "--run_test=${case}")
-    endforeach()
-endforeach()
-
 file(GLOB_RECURSE python_tests "*.py")
 add_custom_target(
     PythonTests ${CMAKE_COMMAND} -E echo "Python tests" SOURCES ${python_tests})