Skip to content

Commit 2ce91b8

Browse files
committed
Pointer tests now need <algorithm> (for std::swap), but no tabs.
1 parent a66cf79 commit 2ce91b8

File tree

1 file changed

+26
-25
lines changed

1 file changed

+26
-25
lines changed

test/unittest/pointertest.cpp

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "rapidjson/pointer.h"
1717
#include "rapidjson/stringbuffer.h"
1818
#include <sstream>
19+
#include <algorithm>
1920

2021
using namespace rapidjson;
2122

@@ -530,33 +531,33 @@ TEST(Pointer, Assignment) {
530531
}
531532

532533
TEST(Pointer, Swap) {
533-
Pointer p("/foo/0");
534-
Pointer q(&p.GetAllocator());
535-
536-
q.Swap(p);
537-
EXPECT_EQ(&q.GetAllocator(), &p.GetAllocator());
538-
EXPECT_TRUE(p.IsValid());
539-
EXPECT_TRUE(q.IsValid());
540-
EXPECT_EQ(0u, p.GetTokenCount());
541-
EXPECT_EQ(2u, q.GetTokenCount());
542-
EXPECT_EQ(3u, q.GetTokens()[0].length);
543-
EXPECT_STREQ("foo", q.GetTokens()[0].name);
544-
EXPECT_EQ(1u, q.GetTokens()[1].length);
545-
EXPECT_STREQ("0", q.GetTokens()[1].name);
546-
EXPECT_EQ(0u, q.GetTokens()[1].index);
534+
Pointer p("/foo/0");
535+
Pointer q(&p.GetAllocator());
536+
537+
q.Swap(p);
538+
EXPECT_EQ(&q.GetAllocator(), &p.GetAllocator());
539+
EXPECT_TRUE(p.IsValid());
540+
EXPECT_TRUE(q.IsValid());
541+
EXPECT_EQ(0u, p.GetTokenCount());
542+
EXPECT_EQ(2u, q.GetTokenCount());
543+
EXPECT_EQ(3u, q.GetTokens()[0].length);
544+
EXPECT_STREQ("foo", q.GetTokens()[0].name);
545+
EXPECT_EQ(1u, q.GetTokens()[1].length);
546+
EXPECT_STREQ("0", q.GetTokens()[1].name);
547+
EXPECT_EQ(0u, q.GetTokens()[1].index);
547548

548549
// std::swap compatibility
549-
std::swap(p, q);
550-
EXPECT_EQ(&p.GetAllocator(), &q.GetAllocator());
551-
EXPECT_TRUE(q.IsValid());
552-
EXPECT_TRUE(p.IsValid());
553-
EXPECT_EQ(0u, q.GetTokenCount());
554-
EXPECT_EQ(2u, p.GetTokenCount());
555-
EXPECT_EQ(3u, p.GetTokens()[0].length);
556-
EXPECT_STREQ("foo", p.GetTokens()[0].name);
557-
EXPECT_EQ(1u, p.GetTokens()[1].length);
558-
EXPECT_STREQ("0", p.GetTokens()[1].name);
559-
EXPECT_EQ(0u, p.GetTokens()[1].index);
550+
std::swap(p, q);
551+
EXPECT_EQ(&p.GetAllocator(), &q.GetAllocator());
552+
EXPECT_TRUE(q.IsValid());
553+
EXPECT_TRUE(p.IsValid());
554+
EXPECT_EQ(0u, q.GetTokenCount());
555+
EXPECT_EQ(2u, p.GetTokenCount());
556+
EXPECT_EQ(3u, p.GetTokens()[0].length);
557+
EXPECT_STREQ("foo", p.GetTokens()[0].name);
558+
EXPECT_EQ(1u, p.GetTokens()[1].length);
559+
EXPECT_STREQ("0", p.GetTokens()[1].name);
560+
EXPECT_EQ(0u, p.GetTokens()[1].index);
560561
}
561562

562563
TEST(Pointer, Append) {

0 commit comments

Comments
 (0)