peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ostream_wrapper fix from core

Browse Source
This commit is contained in:
Jesse Beder
2014-03-22 19:27:54 -05:00
parent 9583d1ab07 0fbeac8f4f
commit d98ab9f342
4 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/ostream_wrapper.h
View File

@@ -41,7 +41,7 @@ class ostream_wrapper {
private: private:
mutable std::vector<char> m_buffer; mutable std::vector<char> m_buffer;
std::ostream* m_pStream; std::ostream* const m_pStream;
std::size_t m_pos; std::size_t m_pos;
std::size_t m_row, m_col; std::size_t m_row, m_col;

8
src/ostream_wrapper.cpp
View File

@@ -4,7 +4,7 @@
namespace YAML { namespace YAML {
ostream_wrapper::ostream_wrapper() ostream_wrapper::ostream_wrapper()
: m_buffer(1), : m_buffer(1, '\0'),
m_pStream(0), m_pStream(0),
m_pos(0), m_pos(0),
m_row(0), m_row(0),
@@ -24,9 +24,10 @@ void ostream_wrapper::write(const std::string& str) {
std::copy(str.begin(), str.end(), &m_buffer[m_pos]); std::copy(str.begin(), str.end(), &m_buffer[m_pos]);
} }
for (std::size_t i = 0; i < str.size(); i++) for (std::size_t i = 0; i < str.size(); i++) {
update_pos(str[i]); update_pos(str[i]);
} }
}
void ostream_wrapper::write(const char* str, std::size_t size) { void ostream_wrapper::write(const char* str, std::size_t size) {
if (m_pStream) { if (m_pStream) {
@@ -36,9 +37,10 @@ void ostream_wrapper::write(const char* str, std::size_t size) {
std::copy(str, str + size, &m_buffer[m_pos]); std::copy(str, str + size, &m_buffer[m_pos]);
} }
for (std::size_t i = 0; i < size; i++) for (std::size_t i = 0; i < size; i++) {
update_pos(str[i]); update_pos(str[i]);
} }
}
void ostream_wrapper::update_pos(char ch) { void ostream_wrapper::update_pos(char ch) {
m_pos++; m_pos++;

4
test/CMakeLists.txt
View File

@@ -1,8 +1,8 @@
add_subdirectory(gtest-1.7.0) add_subdirectory(gtest-1.7.0)
include_directories(gtest-1.7.0/include) include_directories(gtest-1.7.0/include)
file(GLOB test_headers [a-z]*.h) file(GLOB test_headers [a-z_]*.h)
file(GLOB test_sources [a-z]*.cpp) file(GLOB test_sources [a-z_]*.cpp)
file(GLOB test_new_api_sources new-api/[a-z]*.cpp) file(GLOB test_new_api_sources new-api/[a-z]*.cpp)
list(APPEND test_sources ${test_new_api_sources}) list(APPEND test_sources ${test_new_api_sources})

66
test/ostream_wrapper_test.cpp Normal file
View File

@@ -0,0 +1,66 @@
#include "yaml-cpp/ostream_wrapper.h"
#include <sstream>
#include "gtest/gtest.h"
namespace {
TEST(OstreamWrapperTest, BufferNoWrite) {
YAML::ostream_wrapper wrapper;
EXPECT_STREQ("", wrapper.str());
}
TEST(OstreamWrapperTest, BufferWriteStr) {
YAML::ostream_wrapper wrapper;
wrapper.write(std::string("Hello, world"));
EXPECT_STREQ("Hello, world", wrapper.str());
}
TEST(OstreamWrapperTest, BufferWriteCStr) {
YAML::ostream_wrapper wrapper;
wrapper.write("Hello, world");
EXPECT_STREQ("Hello, world", wrapper.str());
}
TEST(OstreamWrapperTest, StreamNoWrite) {
std::stringstream stream;
YAML::ostream_wrapper wrapper(stream);
EXPECT_STREQ(NULL, wrapper.str());
EXPECT_EQ("", stream.str());
}
TEST(OstreamWrapperTest, StreamWriteStr) {
std::stringstream stream;
YAML::ostream_wrapper wrapper(stream);
wrapper.write(std::string("Hello, world"));
EXPECT_STREQ(NULL, wrapper.str());
EXPECT_EQ("Hello, world", stream.str());
}
TEST(OstreamWrapperTest, StreamWriteCStr) {
std::stringstream stream;
YAML::ostream_wrapper wrapper(stream);
wrapper.write("Hello, world");
EXPECT_STREQ(NULL, wrapper.str());
EXPECT_EQ("Hello, world", stream.str());
}
TEST(OstreamWrapperTest, Position) {
YAML::ostream_wrapper wrapper;
wrapper.write("Hello, world\n");
EXPECT_EQ(1, wrapper.row());
EXPECT_EQ(0, wrapper.col());
EXPECT_EQ(13, wrapper.pos());
}
TEST(OstreamWrapperTest, Comment) {
YAML::ostream_wrapper wrapper;
wrapper.write("Hello, world ");
wrapper.set_comment();
EXPECT_TRUE(wrapper.comment());
wrapper.write("foo");
EXPECT_TRUE(wrapper.comment());
wrapper.write("\n");
EXPECT_FALSE(wrapper.comment());
}
}