[TestDataAccess] activate test

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

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/util/dataAccess.cpp b/src/util/dataAccess.cpp
@@ -207,7 +207,10 @@ string getDimensionUnit(const Dimension &dim) {
  break;
  case DimensionType::DataFrame: {
  DataFrameDimension df_dim = dim.asDataFrameDimension();
- unit = df_dim.unit();
+ unit = "none";
+ if (df_dim.columnIndex()) {
+ unit = df_dim.unit();
+ }
  if (unit.empty()) {
  unit = "none";
  }
@@ -316,7 +319,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/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: