Skip to content

Commit

Permalink
Initial progress on removing boost test and moving to doctest to bett…
Browse files Browse the repository at this point in the history 
…er support modules

relates USCiLab#123
  • Loading branch information
@AzothAmmo
AzothAmmo committed Oct 28, 2016
1 parent 195c0bf commit 671999e
Show file tree
Hide file tree
Showing 8 changed files with 3,724 additions and 274 deletions.
77 changes: 8 additions & 69 deletions unittests/array.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,90 +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 "array.hpp"

template <class IArchive, class OArchive>
void test_array()
{
std::random_device rd;
std::mt19937 gen(rd());

for(int ii=0; ii<100; ++ii)
{
std::array<int, 100> o_podarray;
for(auto & elem : o_podarray)
elem = random_value<int>(gen);

std::array<StructInternalSerialize, 100> o_iserarray;
for(auto & elem : o_iserarray)
elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );

std::array<StructInternalSplit, 100> o_isplarray;
for(auto & elem : o_isplarray)
elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );

std::array<StructExternalSerialize, 100> o_eserarray;
for(auto & elem : o_eserarray)
elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );

std::array<StructExternalSplit, 100> o_esplarray;
for(auto & elem : o_esplarray)
elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );

std::ostringstream os;
{
OArchive oar(os);

oar(o_podarray);
oar(o_iserarray);
oar(o_isplarray);
oar(o_eserarray);
oar(o_esplarray);
}

std::array<int, 100> i_podarray;
std::array<StructInternalSerialize, 100> i_iserarray;
std::array<StructInternalSplit, 100> i_isplarray;
std::array<StructExternalSerialize, 100> i_eserarray;
std::array<StructExternalSplit, 100> i_esplarray;

std::istringstream is(os.str());
{
IArchive iar(is);

iar(i_podarray);
iar(i_iserarray);
iar(i_isplarray);
iar(i_eserarray);
iar(i_esplarray);
}

BOOST_CHECK_EQUAL_COLLECTIONS(i_podarray.begin(), i_podarray.end(), o_podarray.begin(), o_podarray.end());
BOOST_CHECK_EQUAL_COLLECTIONS(i_iserarray.begin(), i_iserarray.end(), o_iserarray.begin(), o_iserarray.end());
BOOST_CHECK_EQUAL_COLLECTIONS(i_isplarray.begin(), i_isplarray.end(), o_isplarray.begin(), o_isplarray.end());
BOOST_CHECK_EQUAL_COLLECTIONS(i_eserarray.begin(), i_eserarray.end(), o_eserarray.begin(), o_eserarray.end());
BOOST_CHECK_EQUAL_COLLECTIONS(i_esplarray.begin(), i_esplarray.end(), o_esplarray.begin(), o_esplarray.end());
}
}
TEST_SUITE("array");

BOOST_AUTO_TEST_CASE( binary_array )
TEST_CASE("binary_array")
{
test_array<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
}

BOOST_AUTO_TEST_CASE( portable_binary_array )
TEST_CASE("portable_binary_array")
{
test_array<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
}

BOOST_AUTO_TEST_CASE( xml_array )
TEST_CASE("xml_array")
{
test_array<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
}

BOOST_AUTO_TEST_CASE( json_array )
TEST_CASE("json_array")
{
test_array<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
}

TEST_SUITE_END();
95 changes: 95 additions & 0 deletions unittests/array.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/*
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_ARRAY_H_
#define CEREAL_TEST_ARRAY_H_
#include "common.hpp"

template <class IArchive, class OArchive> inline
void test_array()
{
std::random_device rd;
std::mt19937 gen(rd());

for(int ii=0; ii<100; ++ii)
{
std::array<int, 100> o_podarray;
for(auto & elem : o_podarray)
elem = random_value<int>(gen);

std::array<StructInternalSerialize, 100> o_iserarray;
for(auto & elem : o_iserarray)
elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );

std::array<StructInternalSplit, 100> o_isplarray;
for(auto & elem : o_isplarray)
elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );

std::array<StructExternalSerialize, 100> o_eserarray;
for(auto & elem : o_eserarray)
elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );

std::array<StructExternalSplit, 100> o_esplarray;
for(auto & elem : o_esplarray)
elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );

std::ostringstream os;
{
OArchive oar(os);

oar(o_podarray);
oar(o_iserarray);
oar(o_isplarray);
oar(o_eserarray);
oar(o_esplarray);
}

std::array<int, 100> i_podarray;
std::array<StructInternalSerialize, 100> i_iserarray;
std::array<StructInternalSplit, 100> i_isplarray;
std::array<StructExternalSerialize, 100> i_eserarray;
std::array<StructExternalSplit, 100> i_esplarray;

std::istringstream is(os.str());
{
IArchive iar(is);

iar(i_podarray);
iar(i_iserarray);
iar(i_isplarray);
iar(i_eserarray);
iar(i_esplarray);
}

check_collection( i_podarray, o_podarray );
check_collection( i_iserarray, o_iserarray );
check_collection( i_isplarray, o_isplarray );
check_collection( i_eserarray, o_eserarray );
check_collection( i_esplarray, o_esplarray );
}
}

#endif // CEREAL_TEST_ARRAY_H_
128 changes: 14 additions & 114 deletions unittests/basic_string.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,109 +24,27 @@
(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>
#include <boost/utility/string_ref.hpp>
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "basic_string.hpp"

template <class IArchive, class OArchive>
void test_string_basic()
{
std::random_device rd;
std::mt19937 gen(rd());

for(size_t i=0; i<100; ++i)
{
std::basic_string<char> o_string = random_basic_string<char>(gen);
std::basic_string<char> o_string2 = "";
std::basic_string<char> o_string3;

std::ostringstream os;
{
OArchive oar(os);
oar(o_string);
oar(o_string2);
oar(o_string3);
}

std::basic_string<char> i_string;
std::basic_string<char> i_string2;
std::basic_string<char> i_string3;

std::istringstream is(os.str());
{
IArchive iar(is);

iar(i_string);
iar(i_string2);
iar(i_string3);
}

BOOST_CHECK_EQUAL(i_string, o_string);
BOOST_CHECK_EQUAL(i_string2, o_string2);
BOOST_CHECK_EQUAL(i_string3, o_string3);
}
}
TEST_SUITE("basic_string");

template <class IArchive, class OArchive>
void test_string_all()
{
std::random_device rd;
std::mt19937 gen(rd());

for(size_t i=0; i<100; ++i)
{
std::basic_string<char> o_string = random_basic_string<char>(gen);
std::basic_string<wchar_t> o_wstring = random_basic_string<wchar_t>(gen);
std::basic_string<char16_t> o_u16string = random_basic_string<char16_t>(gen);
std::basic_string<char32_t> o_u32string = random_basic_string<char32_t>(gen);

std::ostringstream os;
{
OArchive oar(os);
oar(o_string);
oar(o_wstring);
oar(o_u16string);
oar(o_u32string);
}

std::basic_string<char> i_string;
std::basic_string<wchar_t> i_wstring;
std::basic_string<char16_t> i_u16string;
std::basic_string<char32_t> i_u32string;

std::istringstream is(os.str());
{
IArchive iar(is);

iar(i_string);
iar(i_wstring);
iar(i_u16string);
iar(i_u32string);
}

BOOST_CHECK_EQUAL(i_string, o_string);
BOOST_CHECK_EQUAL_COLLECTIONS(i_wstring.begin(), i_wstring.end(), o_wstring.begin(), o_wstring.end());
BOOST_CHECK_EQUAL_COLLECTIONS(i_u16string.begin(), i_u16string.end(), o_u16string.begin(), o_u16string.end());
BOOST_CHECK_EQUAL_COLLECTIONS(i_u32string.begin(), i_u32string.end(), o_u32string.begin(), o_u32string.end());
}
}

BOOST_AUTO_TEST_CASE( binary_string )
TEST_CASE("binary_string")
{
test_string_all<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
}

BOOST_AUTO_TEST_CASE( portable_binary_string )
TEST_CASE("portable_binary_string")
{
test_string_all<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
}

BOOST_AUTO_TEST_CASE( xml_string_basic )
TEST_CASE("xml_string_basic")
{
test_string_basic<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
}

BOOST_AUTO_TEST_CASE( json_string_basic )
TEST_CASE("json_string_basic")
{
test_string_basic<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
}
Expand All @@ -148,23 +66,10 @@ void test_ws_in_out(Out const & o_value_with_ws)
iar(i_value_with_ws);
}

BOOST_CHECK_EQUAL(i_value_with_ws, o_value_with_ws);
CHECK(i_value_with_ws == o_value_with_ws);
}

namespace boost
{
void save( cereal::XMLOutputArchive & ar, boost::string_ref const & str )
{
ar.saveValue( str );
}

bool operator==( std::string const & s1, boost::string_ref const & s2 )
{
return s1 == std::string(s2.data(), s2.length());
}
}

BOOST_AUTO_TEST_CASE( xml_string_issue109 )
TEST_CASE("xml_string_issue109")
{
char strings[][20] = {
"some text",
Expand All @@ -185,16 +90,9 @@ BOOST_AUTO_TEST_CASE( xml_string_issue109 )

test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( o_string );
}

for( size_t i=0; i<( sizeof( strings ) / sizeof( strings[0] ) ); ++i )
{
boost::string_ref o_string = strings[i];

test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive, boost::string_ref, std::string>( o_string );
}
}

BOOST_AUTO_TEST_CASE( xml_char_issue109 )
TEST_CASE("xml_char_issue109")
{
uint8_t chars[] = {
' ',
Expand Down Expand Up @@ -251,11 +149,11 @@ void test_ws_in_out_array(Out const (&o_a_value_with_ws)[Nb])

for (size_t uiIndex = 0; uiIndex < Nb; ++uiIndex)
{
BOOST_CHECK_EQUAL(i_a_value_with_ws[uiIndex], o_a_value_with_ws[uiIndex]);
CHECK(i_a_value_with_ws[uiIndex] == o_a_value_with_ws[uiIndex]);
}
}

BOOST_AUTO_TEST_CASE(xml_string_issue_consecutive_calls)
TEST_CASE("xml_string_issue_consecutive_calls")
{
std::string strings[] = {
"some text",
Expand All @@ -269,3 +167,5 @@ BOOST_AUTO_TEST_CASE(xml_string_issue_consecutive_calls)

test_ws_in_out_array<cereal::XMLInputArchive, cereal::XMLOutputArchive>(strings);
}

TEST_SUITE_END();
Loading

0 comments on commit 671999e

Please sign in to comment.