Merge changes I37209275,I83affd3c

* changes:
  add missing test/iobuf.proto test/iobuf_unittest.cpp
  Patch svn r35211 r35214 & add UT of iobuf

src/base/iobuf.cpp

 // iobuf - A non-continuous zero-copied buffer
-// Copyright (c) 2012 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2012 baidu-rpc authors.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // Author: Ge,Jun (gejun@baidu.com)
 // Date: Thu Nov 22 13:57:56 CST 2012

src/base/iobuf.h

 // iobuf - A non-continuous zero-copied buffer
-// Copyright (c) 2012 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2012 baidu-rpc authors.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // Author: Ge,Jun (gejun@baidu.com)
 // Date: Thu Nov 22 13:57:56 CST 2012

src/base/iobuf_inl.h

 // iobuf - A non-continuous zero-copied buffer
-// Copyright (c) 2012 Baidu.com, Inc. All Rights Reserved
+// Copyright (c) 2012 baidu-rpc authors.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // Author: Ge,Jun (gejun@baidu.com)
 // Date: Thu Nov 22 13:57:56 CST 2012

test/Makefile

@@ -123,6 +123,7 @@ TEST_BASE_SOURCES = \
     baidu_time_unittest.cpp \
     flat_map_unittest.cpp \
     crc32c_unittest.cc \
+    iobuf_unittest.cc \
     multiprocess_func_list.cc \
     test_switches.cc \
     test_timeouts.cc \
@@ -133,7 +134,7 @@ TEST_BASE_SOURCES = \
     base_unittest_main.cpp
 
 
-TEST_BASE_OBJS = $(addsuffix .o, $(basename $(TEST_BASE_SOURCES))) 
+TEST_BASE_OBJS = iobuf.pb.o $(addsuffix .o, $(basename $(TEST_BASE_SOURCES))) 
 
 TEST_BVAR_SOURCES = $(wildcard bvar_*_unittest.cpp)
 TEST_BVAR_OBJS = $(addsuffix .o, $(basename $(TEST_BVAR_SOURCES))) 

test/iobuf.proto

+package proto;
+
+enum CompressType {
+    CompressTypeNone = 0;
+    CompressTypeGzip = 1;
+    CompressTypeZlib = 2;
+    CompressTypeSnappy = 3;
+    CompressTypeLZ4 = 4;
+}
+
+message Misc {
+  required CompressType required_enum = 1;
+  optional CompressType optional_enum = 2;
+  repeated CompressType repeated_enum = 3;
+  required uint64 required_uint64 = 4;
+  optional uint64 optional_uint64 = 5;
+  repeated uint64 repeated_uint64 = 6;
+  required string required_string = 7;
+  optional string optional_string = 8;
+  repeated string repeated_string = 9;
+  required bool required_bool = 10;
+  optional bool optional_bool = 11;
+  repeated bool repeated_bool = 12;
+  required int32 required_int32 = 13;
+  optional int32 optional_int32 = 14;
+  repeated int32 repeated_int32 = 15;
+}