@@ -143,11 +143,11 @@ EXPECT_TRUE(u.GetFragStringLength() == len);
143
143
}
144
144
145
145
TEST (Uri, Parse_UTF16) {
146
- typedef GenericValue<UTF16<> > Value ;
147
- typedef GenericUri<Value , MemoryPoolAllocator<> > UriType;
146
+ typedef GenericValue<UTF16<> > Value16 ;
147
+ typedef GenericUri<Value16 , MemoryPoolAllocator<> > UriType;
148
148
MemoryPoolAllocator<CrtAllocator> allocator;
149
- Value v;
150
- Value w;
149
+ Value16 v;
150
+ Value16 w;
151
151
152
152
v.SetString (L" http://auth/path/xxx?query#frag" , allocator);
153
153
UriType u = UriType (v, &allocator);
@@ -161,7 +161,7 @@ u.Get(w, allocator);
161
161
EXPECT_TRUE (*w.GetString () == *v.GetString ());
162
162
163
163
#if RAPIDJSON_HAS_STDSTRING
164
- typedef std::basic_string<Value ::Ch> String;
164
+ typedef std::basic_string<Value16 ::Ch> String;
165
165
String str = L" http://auth/path/xxx?query#frag" ;
166
166
const UriType uri = UriType (str);
167
167
EXPECT_TRUE (UriType::GetScheme (uri) == L" http:" );
@@ -237,8 +237,8 @@ EXPECT_TRUE(u.GetQueryStringLength() == 0);
237
237
EXPECT_TRUE (StrCmp (u.GetFragString (), L" #frag/stuff" ) == 0 );
238
238
EXPECT_TRUE (StrCmp (u.GetString (), L" http://auth#frag/stuff" ) == 0 );
239
239
240
- const Value ::Ch c[] = { ' #' , ' f' , ' r' , ' a' , ' g' , ' /' , ' s' , ' t' , ' u' , ' f' , ' f' , ' \0 ' };
241
- SizeType len = internal::StrLen<Value ::Ch>(c);
240
+ const Value16 ::Ch c[] = { ' #' , ' f' , ' r' , ' a' , ' g' , ' /' , ' s' , ' t' , ' u' , ' f' , ' f' , ' \0 ' };
241
+ SizeType len = internal::StrLen<Value16 ::Ch>(c);
242
242
u = UriType (c, len);
243
243
EXPECT_TRUE (StrCmp (u.GetString (), L" #frag/stuff" ) == 0 );
244
244
EXPECT_TRUE (u.GetStringLength () == len);
@@ -438,8 +438,8 @@ EXPECT_TRUE(StrCmp(res.GetString(), "http://a/b/c/g#s/../x") == 0);
438
438
}
439
439
440
440
TEST (Uri, Resolve_UTF16) {
441
- typedef GenericValue<UTF16<> > Value ;
442
- typedef GenericUri<Value > UriType;
441
+ typedef GenericValue<UTF16<> > Value16 ;
442
+ typedef GenericUri<Value16 > UriType;
443
443
CrtAllocator allocator;
444
444
445
445
// ref is full uri
0 commit comments