[TestDataAccess] activate test

G-Node · Apr 5, 2020 · faac8b3 · faac8b3
1 parent 1034c28
commit faac8b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/util/dataAccess.cpp b/src/util/dataAccess.cpp
@@ -316,7 +316,7 @@ void getOffsetAndCount(const MultiTag &tag, const DataArray &array, const vector
  NDSize temp_count(positions.dataExtent().size(), static_cast<NDSize::value_type>(1));
 
  int dim_index = dimension_count > 1 ? 1 : 0;
- size_t count = dimension_count > 1 ? position_size[dim_index] : 1;
+ ndsize_t count = dimension_count > 1 ? position_size[dim_index] : 1;
  temp_count[dim_index] = static_cast<NDSize::value_type>(count);
 
  vector<vector<double>> start_positions(dimension_count);

diff --git a/test/BaseTestDataAccess.cpp b/test/BaseTestDataAccess.cpp
@@ -63,7 +63,7 @@ void BaseTestDataAccess::testGetDimensionUnit() {
  CPPUNIT_ASSERT_EQUAL(util::getDimensionUnit(dims[0]), no_unit);
  CPPUNIT_ASSERT_EQUAL(util::getDimensionUnit(dims[1]), unit);
  CPPUNIT_ASSERT_EQUAL(util::getDimensionUnit(dims[2]), unit);
- CPPUNIT_ASSERT_EQUAL(util::getDimensionUnit(dims[3]), no_unit);
+ CPPUNIT_ASSERT_THROW(util::getDimensionUnit(dims[3]), nix::OutOfBounds);
  CPPUNIT_ASSERT_EQUAL(util::getDimensionUnit(dims[4]), cols[0].unit);
  CPPUNIT_ASSERT_EQUAL(util::getDimensionUnit(dims[5]), no_unit);
 }

diff --git a/test/hdf5/TestDataAccessHDF5.hpp b/test/hdf5/TestDataAccessHDF5.hpp
@@ -28,6 +28,7 @@ class TestDataAccessHDF5 : public BaseTestDataAccess {
  CPPUNIT_TEST(testDataView);
  CPPUNIT_TEST(testDataSlice);
  CPPUNIT_TEST(testFlexibleTagging);
+ CPPUNIT_TEST(testGetDimensionUnit);
  CPPUNIT_TEST_SUITE_END ();
 
 public: