Move detail::base64 helpers to tests

These functions were only used in tests.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
This commit is contained in:
Damian Jarek
2019-06-24 14:41:36 +02:00
committed by Vinnie Falco
parent 1635df0e11
commit 7e8af58307
4 changed files with 31 additions and 39 deletions

View File

@ -5,6 +5,7 @@ Version 260:
* More split compilation in websocket/detail/mask.hpp
* Cleanup transitive includes in beast/core/detail/type_traits.hpp
* Simplify generation of sec-websocket-key
* Move detail::base64 helpers to tests
--------------------------------------------------------------------------------

View File

@ -12,7 +12,6 @@
#include <boost/beast/core/string.hpp>
#include <cctype>
#include <string>
#include <utility>
namespace boost {
@ -78,26 +77,6 @@ decode(void* dest, char const* src, std::size_t len);
} // base64
BOOST_BEAST_DECL
std::string
base64_encode(std::uint8_t const* data, std::size_t len);
BOOST_BEAST_DECL
std::string
base64_encode(string_view s);
template<class = void>
std::string
base64_decode(string_view data)
{
std::string dest;
dest.resize(base64::decoded_size(data.size()));
auto const result = base64::decode(
&dest[0], data.data(), data.size());
dest.resize(result.first);
return dest;
}
} // detail
} // beast
} // boost

View File

@ -195,24 +195,6 @@ decode(void* dest, char const* src, std::size_t len)
} // base64
std::string
base64_encode(
std::uint8_t const* data,
std::size_t len)
{
std::string dest;
dest.resize(base64::encoded_size(len));
dest.resize(base64::encode(&dest[0], data, len));
return dest;
}
std::string
base64_encode(string_view s)
{
return base64_encode (reinterpret_cast <
std::uint8_t const*> (s.data()), s.size());
}
} // detail
} // beast
} // boost

View File

@ -11,6 +11,7 @@
#include <boost/beast/core/detail/base64.hpp>
#include <boost/beast/_experimental/unit_test/suite.hpp>
#include <string>
namespace boost {
namespace beast {
@ -19,6 +20,35 @@ namespace detail {
class base64_test : public beast::unit_test::suite
{
public:
std::string
base64_encode(
std::uint8_t const* data,
std::size_t len)
{
std::string dest;
dest.resize(base64::encoded_size(len));
dest.resize(base64::encode(&dest[0], data, len));
return dest;
}
std::string
base64_encode(string_view s)
{
return base64_encode (reinterpret_cast <
std::uint8_t const*> (s.data()), s.size());
}
std::string
base64_decode(string_view data)
{
std::string dest;
dest.resize(base64::decoded_size(data.size()));
auto const result = base64::decode(
&dest[0], data.data(), data.size());
dest.resize(result.first);
return dest;
}
void
check (std::string const& in, std::string const& out)
{