commit 2f864fdfdf18318ef24b02141733adb356508370
author Hao Nguyen <haon@google.com> Wed Mar 20 11:45:01 2019 -0700
committer Hao Nguyen <haon@google.com> Wed Mar 20 11:45:01 2019 -0700
tree e13b6e37f187bf02e913ecbc12777d5df4f23268
parent 59284450fa2a85f9f355b4de5a733323af094dcf

Down integrate to Github

conformance/conformance_test.h

diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index b64943d..4d741e7 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -224,6 +224,14 @@
 
     string ConformanceLevelToString(ConformanceLevel level) const;
 
+    void SetPrintUnknownFields(bool print_unknown_fields) {
+      request_.set_print_unknown_fields(true);
+    }
+
+    void SetPrototypeMessageForCompare(const Message& message) {
+      prototype_message_for_compare_.reset(message.New());
+    }
+
    protected:
     virtual string InputFormatString(conformance::WireFormat format) const;
     virtual string OutputFormatString(conformance::WireFormat format) const;
@@ -234,6 +242,7 @@
     ::conformance::WireFormat input_format_;
     ::conformance::WireFormat output_format_;
     const Message& prototype_message_;
+    std::unique_ptr<Message> prototype_message_for_compare_;
     string test_name_;
   };