ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 02:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly compare default-constructed Slice instances

Browse Source
This commit is contained in:
Nik Bougalis
2016-12-25 15:47:49 -08:00
parent b6126f219f
commit c7de7950c4
5 changed files with 139 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -4296,6 +4296,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\test\basics\Slice_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\test\basics\StringUtilities_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>

3
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -5034,6 +5034,9 @@
<ClCompile Include="..\..\src\test\basics\RangeSet_test.cpp">
<Filter>test\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\src\test\basics\Slice_test.cpp">
<Filter>test\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\src\test\basics\StringUtilities_test.cpp">
<Filter>test\basics</Filter>
</ClCompile>

23
src/ripple/basics/Slice.h
View File

@@ -43,20 +43,19 @@ namespace ripple {
class Slice
{
private:
std::uint8_t const* data_;
std::uint8_t const* data_ = nullptr;
std::size_t size_ = 0;
public:
/** Default constructed Slice has length 0. */
Slice() = default;
Slice() noexcept = default;
Slice (Slice const&) = default;
Slice& operator= (Slice const&) = default;
Slice (Slice const&) noexcept = default;
Slice& operator= (Slice const&) noexcept = default;
/** Create a slice pointing to existing memory. */
Slice (void const* data, std::size_t size)
: data_ (reinterpret_cast<
std::uint8_t const*>(data))
Slice (void const* data, std::size_t size) noexcept
: data_ (reinterpret_cast<std::uint8_t const*>(data))
, size_ (size)
{
}
@@ -131,9 +130,13 @@ inline
bool
operator== (Slice const& lhs, Slice const& rhs) noexcept
{
return lhs.size() == rhs.size() &&
std::memcmp(
lhs.data(), rhs.data(), lhs.size()) == 0;
if (lhs.size() != rhs.size())
return false;
if (lhs.size() == 0)
return true;
return std::memcmp(lhs.data(), rhs.data(), lhs.size()) == 0;
}
inline

118
src/test/basics/Slice_test.cpp Normal file
View File

@@ -0,0 +1,118 @@
//------------------------------------------------------------------------------
/*
This file is part of rippled: https://github0.com/ripple/rippled
Copyright (c) 2012-2016 Ripple Labs Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
#include <BeastConfig.h>
#include <ripple/basics/Slice.h>
#include <ripple/beast/unit_test.h>
#include <array>
#include <cstdint>
namespace ripple {
namespace test {
struct Slice_test : beast::unit_test::suite
{
void run()
{
std::uint8_t const data[] =
{
0xa8, 0xa1, 0x38, 0x45, 0x23, 0xec, 0xe4, 0x23,
0x71, 0x6d, 0x2a, 0x18, 0xb4, 0x70, 0xcb, 0xf5,
0xac, 0x2d, 0x89, 0x4d, 0x19, 0x9c, 0xf0, 0x2c,
0x15, 0xd1, 0xf9, 0x9b, 0x66, 0xd2, 0x30, 0xd3
};
{
testcase ("Equality & Inequality");
Slice const s0{};
BEAST_EXPECT (s0.size() == 0);
BEAST_EXPECT (s0.data() == nullptr);
BEAST_EXPECT (s0 == s0);
// Test slices of equal and unequal size pointing to same data:
for (std::size_t i = 0; i != sizeof(data); ++i)
{
Slice const s1 { data, i };
BEAST_EXPECT (s1.size() == i);
BEAST_EXPECT (s1.data() != nullptr);
if (i == 0)
BEAST_EXPECT (s1 == s0);
else
BEAST_EXPECT (s1 != s0);
for (std::size_t j = 0; j != sizeof(data); ++j)
{
Slice const s2 { data, j };
if (i == j)
BEAST_EXPECT (s1 == s2);
else
BEAST_EXPECT (s1 != s2);
}
}
// Test slices of equal size but pointing to different data:
std::array<std::uint8_t, sizeof(data)> a;
std::array<std::uint8_t, sizeof(data)> b;
for (std::size_t i = 0; i != sizeof(data); ++i)
a[i] = b[i] = data[i];
BEAST_EXPECT (makeSlice(a) == makeSlice(b));
b[7]++;
BEAST_EXPECT (makeSlice(a) != makeSlice(b));
a[7]++;
BEAST_EXPECT (makeSlice(a) == makeSlice(b));
}
{
testcase ("Indexing");
Slice const s { data, sizeof(data) };
for (std::size_t i = 0; i != sizeof(data); ++i)
BEAST_EXPECT (s[i] == data[i]);
}
{
testcase ("Advancing");
for (std::size_t i = 0; i < sizeof(data); ++i)
{
for (std::size_t j = 0; i + j < sizeof(data); ++j)
{
Slice s (data + i, sizeof(data) - i);
s += j;
BEAST_EXPECT (s.data() == data + i + j);
BEAST_EXPECT (s.size() == sizeof(data) - i - j);
}
}
}
}
};
BEAST_DEFINE_TESTSUITE(Slice, ripple_basics, ripple);
} // namespace test
} // namespace ripple

1
src/test/unity/basics_test_unity.cpp
View File

@@ -26,5 +26,6 @@
#include <test/basics/KeyCache_test.cpp>
#include <test/basics/mulDiv_test.cpp>
#include <test/basics/RangeSet_test.cpp>
#include <test/basics/Slice_test.cpp>
#include <test/basics/StringUtilities_test.cpp>
#include <test/basics/TaggedCache_test.cpp>