Commit f516a017 authored by miloyip@gmail.com's avatar miloyip@gmail.com

Fixed an unit test issue due to without renaming the EncodedStreamTest class.

git-svn-id: https://rapidjson.googlecode.com/svn/trunk@48 c5894555-1306-4e8d-425f-1f6f381ee07c
parent 55587d6f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
using namespace rapidjson; using namespace rapidjson;
class EncodingsTest : public ::testing::Test { class EncodedStreamTest : public ::testing::Test {
public: public:
virtual void SetUp() { virtual void SetUp() {
json_ = ReadFile("utf8.json", true, &length_); json_ = ReadFile("utf8.json", true, &length_);
...@@ -136,7 +136,7 @@ protected: ...@@ -136,7 +136,7 @@ protected:
size_t length_; size_t length_;
}; };
TEST_F(EncodingsTest, EncodedInputStream) { TEST_F(EncodedStreamTest, EncodedInputStream) {
TestEncodedInputStream<UTF8<>, UTF8<> >("utf8.json"); TestEncodedInputStream<UTF8<>, UTF8<> >("utf8.json");
TestEncodedInputStream<UTF8<>, UTF8<> >("utf8bom.json"); TestEncodedInputStream<UTF8<>, UTF8<> >("utf8bom.json");
TestEncodedInputStream<UTF16LE<>, UTF16<> >("utf16le.json"); TestEncodedInputStream<UTF16LE<>, UTF16<> >("utf16le.json");
...@@ -149,7 +149,7 @@ TEST_F(EncodingsTest, EncodedInputStream) { ...@@ -149,7 +149,7 @@ TEST_F(EncodingsTest, EncodedInputStream) {
TestEncodedInputStream<UTF32BE<>, UTF32<> >("utf32bebom.json"); TestEncodedInputStream<UTF32BE<>, UTF32<> >("utf32bebom.json");
} }
TEST_F(EncodingsTest, AutoUTFInputStream) { TEST_F(EncodedStreamTest, AutoUTFInputStream) {
TestAutoUTFInputStream("utf8.json"); TestAutoUTFInputStream("utf8.json");
TestAutoUTFInputStream("utf8bom.json"); TestAutoUTFInputStream("utf8bom.json");
TestAutoUTFInputStream("utf16le.json"); TestAutoUTFInputStream("utf16le.json");
...@@ -162,7 +162,7 @@ TEST_F(EncodingsTest, AutoUTFInputStream) { ...@@ -162,7 +162,7 @@ TEST_F(EncodingsTest, AutoUTFInputStream) {
TestAutoUTFInputStream("utf32bebom.json"); TestAutoUTFInputStream("utf32bebom.json");
} }
TEST_F(EncodingsTest, EncodedOutputStream) { TEST_F(EncodedStreamTest, EncodedOutputStream) {
TestEncodedOutputStream<UTF8<>, UTF8<> >("utf8.json", false); TestEncodedOutputStream<UTF8<>, UTF8<> >("utf8.json", false);
TestEncodedOutputStream<UTF8<>, UTF8<> >("utf8bom.json", true); TestEncodedOutputStream<UTF8<>, UTF8<> >("utf8bom.json", true);
TestEncodedOutputStream<UTF16LE<>, UTF16<> >("utf16le.json", false); TestEncodedOutputStream<UTF16LE<>, UTF16<> >("utf16le.json", false);
...@@ -175,7 +175,7 @@ TEST_F(EncodingsTest, EncodedOutputStream) { ...@@ -175,7 +175,7 @@ TEST_F(EncodingsTest, EncodedOutputStream) {
TestEncodedOutputStream<UTF32BE<>, UTF32<> >("utf32bebom.json",true); TestEncodedOutputStream<UTF32BE<>, UTF32<> >("utf32bebom.json",true);
} }
TEST_F(EncodingsTest, AutoUTFOutputStream) { TEST_F(EncodedStreamTest, AutoUTFOutputStream) {
TestAutoUTFOutputStream(kUTF8, false, "utf8.json"); TestAutoUTFOutputStream(kUTF8, false, "utf8.json");
TestAutoUTFOutputStream(kUTF8, true, "utf8bom.json"); TestAutoUTFOutputStream(kUTF8, true, "utf8bom.json");
TestAutoUTFOutputStream(kUTF16LE, false, "utf16le.json"); TestAutoUTFOutputStream(kUTF16LE, false, "utf16le.json");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment