diff options
Diffstat (limited to 'python/google/protobuf/internal/input_stream_test.py')
-rwxr-xr-x | python/google/protobuf/internal/input_stream_test.py | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/python/google/protobuf/internal/input_stream_test.py b/python/google/protobuf/internal/input_stream_test.py index 2d685545..d96a14c6 100755 --- a/python/google/protobuf/internal/input_stream_test.py +++ b/python/google/protobuf/internal/input_stream_test.py @@ -1,18 +1,32 @@ # Protocol Buffers - Google's data interchange format -# Copyright 2008 Google Inc. +# Copyright 2008 Google Inc. All rights reserved. # http://code.google.com/p/protobuf/ # -# 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 +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: # -# http://www.apache.org/licenses/LICENSE-2.0 +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. # -# 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. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. """Test for google.protobuf.internal.input_stream.""" @@ -29,18 +43,18 @@ class InputStreamTest(unittest.TestCase): def testEndOfStream(self): stream = input_stream.InputStream('abcd') self.assertFalse(stream.EndOfStream()) - self.assertEqual('abcd', stream.ReadString(10)) + self.assertEqual('abcd', stream.ReadBytes(10)) self.assertTrue(stream.EndOfStream()) def testPosition(self): stream = input_stream.InputStream('abcd') self.assertEqual(0, stream.Position()) self.assertEqual(0, stream.Position()) # No side-effects. - stream.ReadString(1) + stream.ReadBytes(1) self.assertEqual(1, stream.Position()) - stream.ReadString(1) + stream.ReadBytes(1) self.assertEqual(2, stream.Position()) - stream.ReadString(10) + stream.ReadBytes(10) self.assertEqual(4, stream.Position()) # Can't go past end of stream. def testGetSubBuffer(self): @@ -84,15 +98,15 @@ class InputStreamTest(unittest.TestCase): stream.SkipBytes(1) self.assertRaises(message.DecodeError, stream.SkipBytes, -1) - def testReadString(self): + def testReadBytes(self): s = 'abcd' # Also test going past the total stream length. for i in range(len(s) + 10): stream = input_stream.InputStream(s) - self.assertEqual(s[:i], stream.ReadString(i)) + self.assertEqual(s[:i], stream.ReadBytes(i)) self.assertEqual(min(i, len(s)), stream.Position()) stream = input_stream.InputStream(s) - self.assertRaises(message.DecodeError, stream.ReadString, -1) + self.assertRaises(message.DecodeError, stream.ReadBytes, -1) def EnsureFailureOnEmptyStream(self, input_stream_method): """Helper for integer-parsing tests below. |