Outputdata: unit test for setAllTo() after clear() + fix

Core/Tools/inc/OutputData.h

@@ -39,7 +39,7 @@ class OutputData
 {
 public:
     OutputData();
-    ~OutputData() { clear(); }
+    ~OutputData();
     OutputData* clone() const;
 
     void copyFrom(const OutputData<T>& x);
@@ -239,6 +239,11 @@ OutputData<T>::OutputData()
     allocate();
 }
 
+template <class T> OutputData<T>::~OutputData() {
+    clear();
+    delete mp_ll_data;
+}
+
 template <class T>
 OutputData<T>* OutputData<T>::clone() const
 {
@@ -565,10 +570,9 @@ template <class T>
 void OutputData<T>::clear()
 {
     m_value_axes.clear();
-    delete mp_ll_data;
-    mp_ll_data = 0;
     delete mp_mask;
     mp_mask = 0;
+    allocate();
 }
 
 template <class T>

Tests/UnitTests/TestCore/OutputDataTest.h

@@ -173,6 +173,13 @@ TEST_F(OutputDataTest, SetEllipticMask)
     }
 }
 
+TEST_F(OutputDataTest, SetCleared)
+{
+    db_data_3d.clear();
+    db_data_3d.setAllTo(1.0);
+    EXPECT_EQ( db_data_3d[0], 1.0);
+}
+
 
 
 #endif // OUTPUTDATATEST_H