Enable static anon namespace workaround on pathscale

[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 8baf800b6443cbea7d12065973fdda5e61c14949..184a0ef631f53a15b79f00342a41efcf848479c7 100644 (file)
--- a/src/gromacs/analysisdata/tests/arraydata.cpp
+++ b/src/gromacs/analysisdata/tests/arraydata.cpp
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -48,9 +48,11 @@
 
 #include "gromacs/analysisdata/arraydata.h"
 
-#include "testutils/datatest.h"
+#include "gromacs/analysisdata/tests/datatest.h"
 #include "testutils/testasserts.h"
 
+using gmx::test::AnalysisDataTestInput;
+
 namespace
 {
 
@@ -61,19 +63,38 @@ namespace
 //! Test fixture for gmx::AnalysisArrayData.
 typedef gmx::test::AnalysisDataTestFixture AnalysisArrayDataTest;
 
-using gmx::test::END_OF_FRAME;
-//! Input data for gmx::AnalysisArrayData tests.
-const real inputdata[] = {
-    1.0,  0.0, 1.0, 2.0, END_OF_FRAME,
-    2.0,  1.0, 1.0, 1.0, END_OF_FRAME,
-    3.0,  2.0, 0.0, 0.0, END_OF_FRAME,
-    4.0,  3.0, 2.0, 1.0, END_OF_FRAME
+// Input data for gmx::AnalysisArrayData tests.
+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)
+        {
+            data_.setColumnCount(0, 3);
+            data_.addFrameWithValues(1.0,  0.0, 1.0, 2.0);
+            data_.addFrameWithValues(2.0,  1.0, 1.0, 1.0);
+            data_.addFrameWithValues(3.0,  2.0, 0.0, 0.0);
+            data_.addFrameWithValues(4.0,  3.0, 2.0, 1.0);
+        }
+
+    private:
+        AnalysisDataTestInput  data_;
 };
 
 TEST_F(AnalysisArrayDataTest, CallsModuleCorrectly)
 {
-    gmx::test::AnalysisDataTestInput input(inputdata);
-    gmx::AnalysisArrayData           data;
+    const AnalysisDataTestInput &input = SimpleInputData::get();
+    gmx::AnalysisArrayData       data;
     data.setXAxis(1.0, 1.0);
     setupArrayData(input, &data);
 
@@ -84,8 +105,8 @@ TEST_F(AnalysisArrayDataTest, CallsModuleCorrectly)
 
 TEST_F(AnalysisArrayDataTest, StorageWorks)
 {
-    gmx::test::AnalysisDataTestInput input(inputdata);
-    gmx::AnalysisArrayData           data;
+    const AnalysisDataTestInput &input = SimpleInputData::get();
+    gmx::AnalysisArrayData       data;
     data.setXAxis(1.0, 1.0);
     setupArrayData(input, &data);
 
@@ -93,4 +114,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