From b55a20fa2c669b181f47ea9219b8e74d1263da19 Mon Sep 17 00:00:00 2001
From: "xiaofeng@google.com"
 <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Sat, 22 Sep 2012 02:40:50 +0000
Subject: Down-integrate from internal branch

---
 src/google/protobuf/test_util.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/test_util.h')

diff --git a/src/google/protobuf/test_util.h b/src/google/protobuf/test_util.h
index 25165f3a..45519573 100644
--- a/src/google/protobuf/test_util.h
+++ b/src/google/protobuf/test_util.h
@@ -43,13 +43,17 @@
 namespace google {
 namespace protobuf {
 
-namespace unittest = protobuf_unittest;
+namespace unittest = ::protobuf_unittest;
 namespace unittest_import = protobuf_unittest_import;
 
 class TestUtil {
  public:
   // Set every field in the message to a unique value.
   static void SetAllFields(unittest::TestAllTypes* message);
+  static void SetOptionalFields(unittest::TestAllTypes* message);
+  static void AddRepeatedFields1(unittest::TestAllTypes* message);
+  static void AddRepeatedFields2(unittest::TestAllTypes* message);
+  static void SetDefaultFields(unittest::TestAllTypes* message);
   static void SetAllExtensions(unittest::TestAllExtensions* message);
   static void SetAllFieldsAndExtensions(unittest::TestFieldOrderings* message);
   static void SetPackedFields(unittest::TestPackedTypes* message);
@@ -104,6 +108,10 @@ class TestUtil {
       const unittest::TestAllTypes& message);
   static void ExpectLastRepeatedExtensionsRemoved(
       const unittest::TestAllExtensions& message);
+  static void ExpectLastRepeatedsReleased(
+      const unittest::TestAllTypes& message);
+  static void ExpectLastRepeatedExtensionsReleased(
+      const unittest::TestAllExtensions& message);
 
   // Check that all repeated fields have had their first and last elements
   // swapped.
@@ -132,8 +140,18 @@ class TestUtil {
     void ExpectPackedClearViaReflection(const Message& message);
 
     void RemoveLastRepeatedsViaReflection(Message* message);
+    void ReleaseLastRepeatedsViaReflection(
+        Message* message, bool expect_extensions_notnull);
     void SwapRepeatedsViaReflection(Message* message);
 
+    enum MessageReleaseState {
+      IS_NULL,
+      CAN_BE_NULL,
+      NOT_NULL,
+    };
+    void ExpectMessagesReleasedViaReflection(
+        Message* message, MessageReleaseState expected_release_state);
+
    private:
     const FieldDescriptor* F(const string& name);
 
@@ -144,6 +162,7 @@ class TestUtil {
     const FieldDescriptor* nested_b_;
     const FieldDescriptor* foreign_c_;
     const FieldDescriptor* import_d_;
+    const FieldDescriptor* import_e_;
 
     const EnumValueDescriptor* nested_foo_;
     const EnumValueDescriptor* nested_bar_;
-- 
cgit v1.2.3