Merge from core

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++) {

test/mock_event_handler.h

@@ -21,5 +21,4 @@ class MockEventHandler : public EventHandler {
   MOCK_METHOD3(OnMapStart, void(const Mark&, const std::string&, anchor_t));
   MOCK_METHOD0(OnMapEnd, void());
 };
-
 }