From d48bf9860f62766e0929a7e2ec1af5c56aea032b Mon Sep 17 00:00:00 2001
From: Christof Metzger-Kraus <christof.j.kraus@gmail.com>
Date: Wed, 22 Apr 2015 10:27:02 +0200
Subject: [PATCH] working unit test for distributions
---
src/CMakeLists.txt | 2 +
tests/opal_src/Distribution/GaussTest.cpp | 74 +++++++++++++++++------
2 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73270e05e..868d0fbb0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -79,6 +79,7 @@ include_directories (Solvers/amr
${Trilinos_TPL_INCLUDE_DIRS}
${IPPL_SOURCE_DIRS}
${CCSE_INCLUDE_DIRS}
+ ${GTEST_INCLUDE_DIR}
)
link_directories (
@@ -98,6 +99,7 @@ set (OPAL_LIBS
z
mpi
mpi_cxx
+ ${Boost_LIBRARIES}
)
add_library( OPALib ${OPAL_SRCS} opal.cpp )
diff --git a/tests/opal_src/Distribution/GaussTest.cpp b/tests/opal_src/Distribution/GaussTest.cpp
index 907c22dc4..9bf4c4813 100644
--- a/tests/opal_src/Distribution/GaussTest.cpp
+++ b/tests/opal_src/Distribution/GaussTest.cpp
@@ -22,11 +22,27 @@ Inform *gmsg;
#include <fstream>
#include <string>
#include <cstring>
+#include <sstream>
+
+namespace {
+ std::string burnAfterReading(std::ostringstream &ostr) {
+ std::string returnValue = ostr.str();
+ ostr.str("");
+
+ return returnValue;
+ }
+}
TEST(GaussTest, FullSigmaTest1) {
+ std::streambuf *defaultCout;
+ std::streambuf *defaultCerr;
+ std::ostringstream debugOutput;
+ defaultCout = std::cout.rdbuf(debugOutput.rdbuf());
+ defaultCerr = std::cerr.rdbuf(debugOutput.rdbuf());
+
char inputFileName[] = "GaussDistributionTest.in";
- std::string input = "OPTION, ECHO=TRUE;\n"
+ std::string input = "OPTION, ECHO=FALSE;\n"
"OPTION, CZERO=FALSE;\n"
"TITLE, STRING=\"gauss distribution unit test\";\n"
"DIST1: DISTRIBUTION, DISTRIBUTION = \"GAUSS\", \n"
@@ -70,6 +86,8 @@ TEST(GaussTest, FullSigmaTest1) {
is = new FileStream(inputFileName);
} catch(...) {
is = 0;
+ std::cout.rdbuf(defaultCout);
+ std::cerr.rdbuf(defaultCerr);
throw new OpalException("FullSigmaTest", "Could not read string");
}
@@ -78,6 +96,8 @@ TEST(GaussTest, FullSigmaTest1) {
try {
parser->run(is);
} catch (...) {
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
throw new OpalException("FullSigmaTest", "Could not parse input");
}
}
@@ -87,6 +107,8 @@ TEST(GaussTest, FullSigmaTest1) {
distObj = OPAL->find("DIST1");
} catch(...) {
distObj = 0;
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
throw new OpalException("FullSigmaTest", "Could not find distribution");
}
@@ -117,15 +139,18 @@ TEST(GaussTest, FullSigmaTest1) {
const double expectedR61 = 1.362;
const double expectedR62 = -0.2685;
- EXPECT_LT(std::abs(expectedR11 - R11), 0.03 * expectedR11);
- EXPECT_LT(std::abs(expectedR21 - R21), -0.03 * expectedR21);
- EXPECT_LT(std::abs(expectedR22 - R22), 0.03 * expectedR22);
- EXPECT_LT(std::abs(expectedR51 - R51), 0.03 * expectedR51);
- EXPECT_LT(std::abs(expectedR52 - R52), 0.03 * expectedR52);
- EXPECT_LT(std::abs(expectedR61 - R61), 0.03 * expectedR61);
- EXPECT_LT(std::abs(expectedR62 - R62), -0.03 * expectedR62);
+ EXPECT_LT(std::abs(expectedR11 - R11), 0.05 * expectedR11) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR21 - R21), -0.05 * expectedR21) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR22 - R22), 0.05 * expectedR22) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR51 - R51), 0.05 * expectedR51) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR52 - R52), 0.05 * expectedR52) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR61 - R61), 0.05 * expectedR61) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR62 - R62), -0.05 * expectedR62) << ::burnAfterReading(debugOutput);
}
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
+
OpalData::deleteInstance();
delete parser;
delete gmsg;
@@ -137,15 +162,21 @@ TEST(GaussTest, FullSigmaTest1) {
TEST(GaussTest, FullSigmaTest2) {
+ std::streambuf *defaultCout;
+ std::streambuf *defaultCerr;
+ std::ostringstream debugOutput;
+ defaultCout = std::cout.rdbuf(debugOutput.rdbuf());
+ defaultCerr = std::cerr.rdbuf(debugOutput.rdbuf());
+
char inputFileName[] = "GaussDistributionTest.in";
- std::string input = "OPTION, ECHO=TRUE;\n"
+ std::string input = "OPTION, ECHO=FALSE;\n"
"OPTION, CZERO=FALSE;\n"
"TITLE, STRING=\"gauss distribution unit test\";\n"
"DIST1: DISTRIBUTION, DISTRIBUTION = \"GAUSS\", \n"
"SIGMAX = 1.978e-3, SIGMAY = 2.498e-3, SIGMAZ = 1.537e-3, \n"
"SIGMAPX = 0.7998, SIGMAPY = 0.6212, SIGMAPZ = 0.9457, \n"
"CORRX= -0.40993, CORRY=0.77208, CORRZ=0.12051, \n"
- "R51=0.14935, R52=0.59095, R61=0.72795, R62=-0.3550}, \n"
+ "R51=0.14935, R52=0.59095, R61=0.72795, R62=-0.3550, \n"
"EKIN = 0.63, \n"
"EMITTED = FALSE;\n";
@@ -184,6 +215,8 @@ TEST(GaussTest, FullSigmaTest2) {
is = new FileStream(inputFileName);
} catch(...) {
is = 0;
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
throw new OpalException("FullSigmaTest", "Could not read string");
}
@@ -192,6 +225,8 @@ TEST(GaussTest, FullSigmaTest2) {
try {
parser->run(is);
} catch (...) {
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
throw new OpalException("FullSigmaTest", "Could not parse input");
}
}
@@ -201,6 +236,8 @@ TEST(GaussTest, FullSigmaTest2) {
distObj = OPAL->find("DIST1");
} catch(...) {
distObj = 0;
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
throw new OpalException("FullSigmaTest", "Could not find distribution");
}
@@ -231,15 +268,18 @@ TEST(GaussTest, FullSigmaTest2) {
const double expectedR61 = 1.362;
const double expectedR62 = -0.2685;
- EXPECT_LT(std::abs(expectedR11 - R11), 0.03 * expectedR11);
- EXPECT_LT(std::abs(expectedR21 - R21), -0.03 * expectedR21);
- EXPECT_LT(std::abs(expectedR22 - R22), 0.03 * expectedR22);
- EXPECT_LT(std::abs(expectedR51 - R51), 0.03 * expectedR51);
- EXPECT_LT(std::abs(expectedR52 - R52), 0.03 * expectedR52);
- EXPECT_LT(std::abs(expectedR61 - R61), 0.03 * expectedR61);
- EXPECT_LT(std::abs(expectedR62 - R62), -0.03 * expectedR62);
+ EXPECT_LT(std::abs(expectedR11 - R11), 0.05 * expectedR11) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR21 - R21), -0.05 * expectedR21) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR22 - R22), 0.05 * expectedR22) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR51 - R51), 0.05 * expectedR51) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR52 - R52), 0.05 * expectedR52) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR61 - R61), 0.05 * expectedR61) << ::burnAfterReading(debugOutput);
+ EXPECT_LT(std::abs(expectedR62 - R62), -0.05 * expectedR62) << ::burnAfterReading(debugOutput);
}
+ std::cout.rdbuf(defaultCout);;
+ std::cerr.rdbuf(defaultCerr);;
+
OpalData::deleteInstance();
delete parser;
delete gmsg;
--
GitLab