Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / analysisdata / tests / arraydata.cpp

diff --git a/src/gromacs/analysisdata/tests/arraydata.cpp b/src/gromacs/analysisdata/tests/arraydata.cpp
index 74601b265d0f96e108d2cd1672a472f46195c2f6..a1d2755bf48e0f57de17e8d7411f7d498f253d62 100644 (file)
--- a/src/gromacs/analysisdata/tests/arraydata.cpp
+++ b/src/gromacs/analysisdata/tests/arraydata.cpp
@@ -44,10 +44,12 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
-#include <gtest/gtest.h>
+#include "gmxpre.h"
 
 #include "gromacs/analysisdata/arraydata.h"
 
+#include <gtest/gtest.h>
+
 #include "gromacs/analysisdata/tests/datatest.h"
 #include "testutils/testasserts.h"
 
@@ -69,8 +71,13 @@ class SimpleInputData
     public:
         static const AnalysisDataTestInput &get()
         {
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static SimpleInputData singleton;
             return singleton.data_;
+#else
+            static SimpleInputData singleton_arraydata;
+            return singleton_arraydata.data_;
+#endif
         }
 
         SimpleInputData() : data_(1, false)
@@ -109,4 +116,42 @@ TEST_F(AnalysisArrayDataTest, StorageWorks)
     ASSERT_NO_THROW_GMX(data.valuesReady());
 }
 
+TEST_F(AnalysisArrayDataTest, CanSetXAxis)
+{
+    gmx::AnalysisArrayData       data;
+    data.setRowCount(5);
+    data.setXAxis(1.0, 1.0);
+    EXPECT_FLOAT_EQ(1.0, data.xvalue(0));
+    EXPECT_FLOAT_EQ(3.0, data.xvalue(2));
+    EXPECT_FLOAT_EQ(5.0, data.xvalue(4));
+    data.setXAxisValue(0, 3.0);
+    data.setXAxisValue(2, 1.0);
+    EXPECT_FLOAT_EQ(3.0, data.xvalue(0));
+    EXPECT_FLOAT_EQ(2.0, data.xvalue(1));
+    EXPECT_FLOAT_EQ(1.0, data.xvalue(2));
+    EXPECT_FLOAT_EQ(4.0, data.xvalue(3));
+}
+
+TEST_F(AnalysisArrayDataTest, CanSetXAxisBeforeRowCount)
+{
+    {
+        gmx::AnalysisArrayData       data;
+        data.setXAxis(1.0, 1.0);
+        data.setRowCount(5);
+        EXPECT_FLOAT_EQ(1.0, data.xvalue(0));
+        EXPECT_FLOAT_EQ(3.0, data.xvalue(2));
+        EXPECT_FLOAT_EQ(5.0, data.xvalue(4));
+    }
+    {
+        gmx::AnalysisArrayData       data;
+        data.setXAxisValue(0, 2.0);
+        data.setXAxisValue(1, 3.0);
+        data.setXAxisValue(2, 5.0);
+        data.setRowCount(3);
+        EXPECT_FLOAT_EQ(2.0, data.xvalue(0));
+        EXPECT_FLOAT_EQ(3.0, data.xvalue(1));
+        EXPECT_FLOAT_EQ(5.0, data.xvalue(2));
+    }
+}
+
 } // namespace