phynexis-deps/cereal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tests split, switch to CHECk_EQ over CHECK

Browse Source 
see #139
This commit is contained in:
Shane Grant
2016-11-01 11:36:22 -07:00
parent 671999e4ea
commit 0a262ece48
7 changed files with 272 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unittests/boost_variant.cpp
+8 -43
View File
@@ -24,64 +24,29 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "common.hpp"
#include <boost/test/unit_test.hpp>
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "boost_variant.hpp"
template <class IArchive, class OArchive>
void test_boost_variant()
{
std::random_device rd;
std::mt19937 gen(rd());
TEST_SUITE("boost_variant");
boost::variant<int, double, std::string> o_bv1 = random_value<int>(gen);
boost::variant<int, double, std::string> o_bv2 = random_value<double>(gen);
boost::variant<int, double, std::string> o_bv3 = random_basic_string<char>(gen);
std::ostringstream os;
{
OArchive oar(os);
oar(o_bv1);
oar(o_bv2);
oar(o_bv3);
}
decltype(o_bv1) i_bv1;
decltype(o_bv2) i_bv2;
decltype(o_bv3) i_bv3;
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_bv1);
iar(i_bv2);
iar(i_bv3);
}
BOOST_CHECK_EQUAL( boost::get<int>(i_bv1), boost::get<int>(o_bv1) );
BOOST_CHECK_CLOSE( boost::get<double>(i_bv2), boost::get<double>(o_bv2), 1e-5 );
BOOST_CHECK_EQUAL( boost::get<std::string>(i_bv3), boost::get<std::string>(o_bv3) );
}
BOOST_AUTO_TEST_CASE( binary_boost_variant )
TEST_CASE("binary_boost_variant")
{
test_boost_variant<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE( portable_binary_boost_variant )
TEST_CASE("portable_binary_boost_variant")
{
test_boost_variant<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE( xml_boost_variant )
TEST_CASE("xml_boost_variant")
{
test_boost_variant<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
}
BOOST_AUTO_TEST_CASE( json_boost_variant )
TEST_CASE("json_boost_variant")
{
test_boost_variant<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
}
TEST_SUITE_END();
unittests/boost_variant.hpp
+70
View File
@@ -0,0 +1,70 @@
/*
Copyright (c) 2015, Kyle Fleming
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of cereal nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CEREAL_TEST_BOOST_VARIANT_H_
#define CEREAL_TEST_BOOST_VARIANT_H_
#include "common.hpp"
#include <cereal/types/boost_variant.hpp>
template <class IArchive, class OArchive> inline
void test_boost_variant()
{
std::random_device rd;
std::mt19937 gen(rd());
boost::variant<int, double, std::string> o_bv1 = random_value<int>(gen);
boost::variant<int, double, std::string> o_bv2 = random_value<double>(gen);
boost::variant<int, double, std::string> o_bv3 = random_basic_string<char>(gen);
std::ostringstream os;
{
OArchive oar(os);
oar(o_bv1);
oar(o_bv2);
oar(o_bv3);
}
decltype(o_bv1) i_bv1;
decltype(o_bv2) i_bv2;
decltype(o_bv3) i_bv3;
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_bv1);
iar(i_bv2);
iar(i_bv3);
}
CHECK_EQ( boost::get<int>(i_bv1), boost::get<int>(o_bv1) );
CHECK_EQ( boost::get<double>(i_bv2), doctest::Approx(boost::get<double>(o_bv2)).epsilon(1e-5) );
CHECK_EQ( boost::get<std::string>(i_bv3), boost::get<std::string>(o_bv3) );
}
#endif // CEREAL_TEST_BOOST_VARIANT_H_
unittests/chrono.cpp
+6 -81
View File
@@ -24,100 +24,25 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "common.hpp"
#include <boost/test/unit_test.hpp>
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "chrono.hpp"
template <class IArchive, class OArchive>
void test_chrono()
{
for(int ii=0; ii<100; ++ii)
{
auto o_timePoint1 = std::chrono::system_clock::now();
#ifndef CEREAL_OLDER_GCC
auto o_timePoint2 = std::chrono::steady_clock::now();
#endif // CEREAL_OLDER_GCC
auto o_timePoint3 = std::chrono::high_resolution_clock::now();
auto o_duration1 = std::chrono::system_clock::now() - o_timePoint1;
#ifndef CEREAL_OLDER_GCC
auto o_duration2 = std::chrono::steady_clock::now() - o_timePoint2;
#endif // CEREAL_OLDER_GCC
auto o_duration3 = std::chrono::high_resolution_clock::now() - o_timePoint3;
std::ostringstream os;
{
OArchive oar(os);
oar(o_timePoint1);
#ifndef CEREAL_OLDER_GCC
oar(o_timePoint2);
#endif // CEREAL_OLDER_GCC
oar(o_timePoint3);
oar(o_duration1);
#ifndef CEREAL_OLDER_GCC
oar(o_duration2);
#endif // CEREAL_OLDER_GCC
oar(o_duration3);
}
decltype(o_timePoint1) i_timePoint1;
#ifndef CEREAL_OLDER_GCC
decltype(o_timePoint2) i_timePoint2;
#endif // CEREAL_OLDER_GCC
decltype(o_timePoint3) i_timePoint3;
decltype(o_duration1) i_duration1;
#ifndef CEREAL_OLDER_GCC
decltype(o_duration2) i_duration2;
#endif // CEREAL_OLDER_GCC
decltype(o_duration3) i_duration3;
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_timePoint1);
#ifndef CEREAL_OLDER_GCC
iar(i_timePoint2);
#endif // CEREAL_OLDER_GCC
iar(i_timePoint3);
iar(i_duration1);
#ifndef CEREAL_OLDER_GCC
iar(i_duration2);
#endif // CEREAL_OLDER_GCC
iar(i_duration3);
}
BOOST_CHECK( o_timePoint1 == i_timePoint1 );
#ifndef CEREAL_OLDER_GCC
BOOST_CHECK( o_timePoint2 == i_timePoint2 );
#endif // CEREAL_OLDER_GCC
BOOST_CHECK( o_timePoint3 == i_timePoint3 );
BOOST_CHECK( o_duration1 == i_duration1 );
#ifndef CEREAL_OLDER_GCC
BOOST_CHECK( o_duration2 == i_duration2 );
#endif // CEREAL_OLDER_GCC
BOOST_CHECK( o_duration3 == i_duration3 );
}
}
BOOST_AUTO_TEST_CASE( binary_chrono )
TEST_CASE("binary_chrono")
{
test_chrono<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE( portable_binary_chrono )
TEST_CASE("portable_binary_chrono")
{
test_chrono<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE( xml_chrono )
TEST_CASE("xml_chrono")
{
test_chrono<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
}
BOOST_AUTO_TEST_CASE( json_chrono )
TEST_CASE("json_chrono")
{
test_chrono<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
}
unittests/chrono.hpp
+105
View File
@@ -0,0 +1,105 @@
/*
Copyright (c) 2014, Randolph Voorhies, Shane Grant
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of cereal nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CEREAL_TEST_CHRONO_H_
#define CEREAL_TEST_CHRONO_H_
#include "common.hpp"
template <class IArchive, class OArchive> inline
void test_chrono()
{
for(int ii=0; ii<100; ++ii)
{
auto o_timePoint1 = std::chrono::system_clock::now();
#ifndef CEREAL_OLDER_GCC
auto o_timePoint2 = std::chrono::steady_clock::now();
#endif // CEREAL_OLDER_GCC
auto o_timePoint3 = std::chrono::high_resolution_clock::now();
auto o_duration1 = std::chrono::system_clock::now() - o_timePoint1;
#ifndef CEREAL_OLDER_GCC
auto o_duration2 = std::chrono::steady_clock::now() - o_timePoint2;
#endif // CEREAL_OLDER_GCC
auto o_duration3 = std::chrono::high_resolution_clock::now() - o_timePoint3;
std::ostringstream os;
{
OArchive oar(os);
oar(o_timePoint1);
#ifndef CEREAL_OLDER_GCC
oar(o_timePoint2);
#endif // CEREAL_OLDER_GCC
oar(o_timePoint3);
oar(o_duration1);
#ifndef CEREAL_OLDER_GCC
oar(o_duration2);
#endif // CEREAL_OLDER_GCC
oar(o_duration3);
}
decltype(o_timePoint1) i_timePoint1;
#ifndef CEREAL_OLDER_GCC
decltype(o_timePoint2) i_timePoint2;
#endif // CEREAL_OLDER_GCC
decltype(o_timePoint3) i_timePoint3;
decltype(o_duration1) i_duration1;
#ifndef CEREAL_OLDER_GCC
decltype(o_duration2) i_duration2;
#endif // CEREAL_OLDER_GCC
decltype(o_duration3) i_duration3;
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_timePoint1);
#ifndef CEREAL_OLDER_GCC
iar(i_timePoint2);
#endif // CEREAL_OLDER_GCC
iar(i_timePoint3);
iar(i_duration1);
#ifndef CEREAL_OLDER_GCC
iar(i_duration2);
#endif // CEREAL_OLDER_GCC
iar(i_duration3);
}
CHECK_EQ( o_timePoint1, i_timePoint1 );
#ifndef CEREAL_OLDER_GCC
CHECK_EQ( o_timePoint2, i_timePoint2 );
#endif // CEREAL_OLDER_GCC
CHECK_EQ( o_timePoint3, i_timePoint3 );
CHECK_EQ( o_duration1, i_duration1 );
#ifndef CEREAL_OLDER_GCC
CHECK_EQ( o_duration2, i_duration2 );
#endif // CEREAL_OLDER_GCC
CHECK_EQ( o_duration3, i_duration3 );
}
}
#endif // CEREAL_TEST_CHRONO_H_
unittests/common.hpp
-1
View File
@@ -47,7 +47,6 @@
#include <cereal/types/complex.hpp>
#include <cereal/types/chrono.hpp>
#include <cereal/types/polymorphic.hpp>
#include <cereal/types/boost_variant.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/archives/portable_binary.hpp>
unittests/complex.cpp
+6 -54
View File
@@ -24,73 +24,25 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "common.hpp"
#include <boost/test/unit_test.hpp>
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "complex.hpp"
template <class IArchive, class OArchive>
void test_complex()
{
std::random_device rd;
std::mt19937 gen(rd());
auto rngF = [&](){ return random_value<float>(gen); };
auto rngD = [&](){ return random_value<double>(gen); };
auto rngLD = [&](){ return random_value<long double>(gen); };
for(int ii=0; ii<100; ++ii)
{
std::complex<float> o_float( rngF(), rngF() );
std::complex<double> o_double( rngD(), rngD() );
std::complex<long double> o_ldouble( rngLD(), rngLD() );
std::ostringstream os;
{
OArchive oar(os);
oar(o_float);
oar(o_double);
oar(o_ldouble);
}
std::complex<float> i_float;
std::complex<double> i_double;
std::complex<long double> i_ldouble;
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_float);
iar(i_double);
iar(i_ldouble);
}
BOOST_CHECK_EQUAL( o_float, i_float );
BOOST_CHECK_CLOSE( o_double.real(), i_double.real(), 1e-5);
BOOST_CHECK_CLOSE( o_double.imag(), i_double.imag(), 1e-5);
BOOST_CHECK_CLOSE( o_ldouble.real(), i_ldouble.real(), 1e-5);
BOOST_CHECK_CLOSE( o_ldouble.imag(), i_ldouble.imag(), 1e-5);
}
}
BOOST_AUTO_TEST_CASE( binary_complex )
TEST_CASE("binary_complex")
{
test_complex<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE( portable_binary_complex )
TEST_CASE("portable_binary_complex")
{
test_complex<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
}
BOOST_AUTO_TEST_CASE( xml_complex )
TEST_CASE("xml_complex")
{
test_complex<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
}
BOOST_AUTO_TEST_CASE( json_complex )
TEST_CASE("json_complex")
{
test_complex<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
}
unittests/complex.hpp
+77
View File
@@ -0,0 +1,77 @@
/*
Copyright (c) 2014, Randolph Voorhies, Shane Grant
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of cereal nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CEREAL_TEST_COMPLEX_H_
#define CEREAL_TEST_COMPLEX_H_
#include "common.hpp"
template <class IArchive, class OArchive> inline
void test_complex()
{
std::random_device rd;
std::mt19937 gen(rd());
auto rngF = [&](){ return random_value<float>(gen); };
auto rngD = [&](){ return random_value<double>(gen); };
auto rngLD = [&](){ return random_value<long double>(gen); };
for(int ii=0; ii<100; ++ii)
{
std::complex<float> o_float( rngF(), rngF() );
std::complex<double> o_double( rngD(), rngD() );
std::complex<long double> o_ldouble( rngLD(), rngLD() );
std::ostringstream os;
{
OArchive oar(os);
oar(o_float);
oar(o_double);
oar(o_ldouble);
}
std::complex<float> i_float;
std::complex<double> i_double;
std::complex<long double> i_ldouble;
std::istringstream is(os.str());
{
IArchive iar(is);
iar(i_float);
iar(i_double);
iar(i_ldouble);
}
CHECK_EQ( o_float, i_float );
CHECK_EQ( o_double.real(), doctest::Approx(i_double.real()).epsilon(1e-5) );
CHECK_EQ( o_double.imag(), doctest::Approx(i_double.imag()).epsilon(1e-5) );
CHECK_EQ( o_ldouble.real(), doctest::Approx(i_ldouble.real()).epsilon(1e-5) );
CHECK_EQ( o_ldouble.imag(), doctest::Approx(i_ldouble.imag()).epsilon(1e-5) );
}
}
#endif // CEREAL_TEST_COMPLEX_H_