generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-10-27 11:06:53 +01:00
Code Issues Projects Releases Wiki Activity

Add equality/inequality operator, URI fragment stringify and UTF-8 Percent Encoding/Decoding

Browse Source
This commit is contained in:
miloyip
2015-05-03 14:14:05 +08:00
parent 28f14bd68f
commit 0eb6cb8e5f
2 changed files with 207 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
test/unittest/pointertest.cpp
View File

@@ -277,6 +277,46 @@ TEST(Pointer, Parse_URIFragment) {
EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
}
{
// Decode UTF-8 perecent encoding to UTF-8
Pointer p("#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
EXPECT_STREQ("\xC2\xA2", p.GetTokens()[0].name);
}
{
// Decode UTF-8 perecent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
EXPECT_STREQ(L"\xA2", p.GetTokens()[0].name);
}
{
// Decode UTF-8 perecent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
EXPECT_STREQ(L"\xA2", p.GetTokens()[0].name);
}
{
// Decode UTF-8 perecent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
EXPECT_STREQ(L"\x00A2", p.GetTokens()[0].name);
}
{
// Decode UTF-8 perecent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%E2%82%AC");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
EXPECT_STREQ(L"\x20AC", p.GetTokens()[0].name);
}
{
// kPointerParseErrorTokenMustBeginWithSolidus
Pointer p("# ");
@@ -306,7 +346,7 @@ TEST(Pointer, Parse_URIFragment) {
Pointer p("#/%");
EXPECT_FALSE(p.IsValid());
EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
EXPECT_EQ(3u, p.GetParseErrorOffset());
EXPECT_EQ(2u, p.GetParseErrorOffset());
}
{
@@ -314,7 +354,7 @@ TEST(Pointer, Parse_URIFragment) {
Pointer p("#/%g0");
EXPECT_FALSE(p.IsValid());
EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
EXPECT_EQ(3u, p.GetParseErrorOffset());
EXPECT_EQ(2u, p.GetParseErrorOffset());
}
{
@@ -322,7 +362,7 @@ TEST(Pointer, Parse_URIFragment) {
Pointer p("#/%0g");
EXPECT_FALSE(p.IsValid());
EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
EXPECT_EQ(4u, p.GetParseErrorOffset());
EXPECT_EQ(2u, p.GetParseErrorOffset());
}
{
@@ -335,12 +375,11 @@ TEST(Pointer, Parse_URIFragment) {
{
// kPointerParseErrorCharacterMustPercentEncode
Pointer p("#/\\");
Pointer p("#/\n");
EXPECT_FALSE(p.IsValid());
EXPECT_EQ(kPointerParseErrorCharacterMustPercentEncode, p.GetParseErrorCode());
EXPECT_EQ(2u, p.GetParseErrorOffset());
}
}
TEST(Pointer, Stringify) {
@@ -357,7 +396,10 @@ TEST(Pointer, Stringify) {
"/i\\j",
"/k\"l",
"/ ",
"/m~0n"
"/m~0n",
"/\xC2\xA2",
"/\xE2\x82\xAC",
"/\xF0\x9D\x84\x9E"
};
for (size_t i = 0; i < sizeof(sources) / sizeof(sources[0]); i++) {
@@ -365,6 +407,13 @@ TEST(Pointer, Stringify) {
StringBuffer s;
p.Stringify(s);
EXPECT_STREQ(sources[i], s.GetString());
// Stringify to URI fragment
StringBuffer s2;
p.StringifyUriFragment(s2);
Pointer p2(s2.GetString(), s2.GetSize());
EXPECT_TRUE(p2.IsValid());
EXPECT_TRUE(p == p2);
}
}
@@ -444,6 +493,22 @@ TEST(Pointer, Assignment) {
}
}
TEST(Pointer, Equality) {
EXPECT_TRUE(Pointer("/foo/0") == Pointer("/foo/0"));
EXPECT_FALSE(Pointer("/foo/0") == Pointer("/foo/1"));
EXPECT_FALSE(Pointer("/foo/0") == Pointer("/foo/0/1"));
EXPECT_FALSE(Pointer("/foo/0") == Pointer("a"));
EXPECT_FALSE(Pointer("a") == Pointer("a")); // Invalid always not equal
}
TEST(Pointer, Inequality) {
EXPECT_FALSE(Pointer("/foo/0") != Pointer("/foo/0"));
EXPECT_TRUE(Pointer("/foo/0") != Pointer("/foo/1"));
EXPECT_TRUE(Pointer("/foo/0") != Pointer("/foo/0/1"));
EXPECT_TRUE(Pointer("/foo/0") != Pointer("a"));
EXPECT_TRUE(Pointer("a") != Pointer("a")); // Invalid always not equal
}
TEST(Pointer, Create) {
Document d;
{