Merge from core

2025-09-09 04:41:16 +00:00 · 2014-03-23 20:17:34 -05:00
parent ad0a3311a7 06bf012d81
commit 253c80d09e
21 changed files with 577 additions and 683 deletions
--- a/test/integration/encoding_test.cpp
+++ b/test/integration/encoding_test.cpp
@@ -6,6 +6,7 @@
 #include "gtest/gtest.h"

 using ::testing::_;
+using ::testing::InSequence;

 namespace YAML {
 namespace {
@@ -92,6 +93,7 @@ class EncodingTest : public HandlerTest {
  }

  void Run() {
+    InSequence sequence;
    EXPECT_CALL(handler, OnDocumentStart(_));
    EXPECT_CALL(handler, OnSequenceStart(_, "?", 0));
    for (std::size_t i = 0; i < m_entries.size(); i++) {
--- a/test/integration/gen_emitter_test.cpp
+++ b/test/integration/gen_emitter_test.cpp