This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new bbc5e06 Supplement TZlibTransport.py testcase Client: py Patch:
zeshuai007 <[email protected]>
bbc5e06 is described below
commit bbc5e06a2e36d788b095fb37a52c90fc4d54b211
Author: zeshuai007 <[email protected]>
AuthorDate: Thu May 7 17:10:32 2020 +0800
Supplement TZlibTransport.py testcase
Client: py
Patch: zeshuai007 <[email protected]>
This closes #2132
---
lib/py/CMakeLists.txt | 3 +-
lib/py/Makefile.am | 2 +
lib/py/test/thrift_TZlibTransport.py | 99 ++++++++++++++++++++++++++++++++++++
3 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/lib/py/CMakeLists.txt b/lib/py/CMakeLists.txt
index 909f61a..18697d0 100644
--- a/lib/py/CMakeLists.txt
+++ b/lib/py/CMakeLists.txt
@@ -29,5 +29,6 @@ if(BUILD_TESTING)
add_test(PythonTestSSLSocket ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test/test_sslsocket.py)
add_test(PythonThriftJson ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_json.py)
add_test(PythonThriftTransport ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_transport.py)
- add_test(PythonThriftJson ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TBinaryProtocol.py)
+ add_test(PythonThriftTBinaryProtocol ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TBinaryProtocol.py)
+ add_test(PythonThriftTZlibTransport ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TZlibTransport.py)
endif()
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index 69aa4e7..9d0b06b 100644
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -27,6 +27,7 @@ py3-test: py3-build
$(PYTHON3) test/thrift_transport.py
$(PYTHON3) test/test_sslsocket.py
$(PYTHON3) test/thrift_TBinaryProtocol.py
+ $(PYTHON3) test/thrift_TZlibTransport.py
else
py3-build:
py3-test:
@@ -47,6 +48,7 @@ check-local: all py3-test
$(PYTHON) test/thrift_transport.py
$(PYTHON) test/test_sslsocket.py
$(PYTHON) test/thrift_TBinaryProtocol.py
+ $(PYTHON) test/thrift_TZlibTransport.py
clean-local:
$(RM) -r build
diff --git a/lib/py/test/thrift_TZlibTransport.py
b/lib/py/test/thrift_TZlibTransport.py
new file mode 100644
index 0000000..ded34b0
--- /dev/null
+++ b/lib/py/test/thrift_TZlibTransport.py
@@ -0,0 +1,99 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+import unittest
+import random
+import string
+
+import _import_local_thrift # noqa
+from thrift.transport import TTransport
+from thrift.transport import TZlibTransport
+
+
+def generate_random_buff():
+ data = []
+ buf_len = 1024 * 32
+ index = 0
+
+ while index < buf_len:
+ run_len = random.randint(1, 64)
+ if index + run_len > buf_len:
+ run_len = buf_len - index
+ for i in range(run_len):
+ data.extend(random.sample(string.printable, 1))
+ index += 1
+
+ new_data = ''.join(data)
+ return new_data
+
+
+class TestTZlibTransport(unittest.TestCase):
+
+ def test_write_then_read(self):
+ buff = TTransport.TMemoryBuffer()
+ trans = TTransport.TBufferedTransportFactory().getTransport(buff)
+ zlib_trans = TZlibTransport.TZlibTransport(trans)
+ data_w = generate_random_buff()
+ zlib_trans.write(data_w.encode('utf-8'))
+ zlib_trans.flush()
+
+ value = buff.getvalue()
+ zlib_trans.close()
+
+ buff = TTransport.TMemoryBuffer(value)
+ trans = TTransport.TBufferedTransportFactory().getTransport(buff)
+ zlib_trans = TZlibTransport.TZlibTransport(trans)
+ data_r = zlib_trans.read(len(data_w))
+ zlib_trans.close()
+
+ try:
+ self.assertEqual(data_w, data_r.decode('utf-8'))
+ self.assertEqual(len(data_w), len(data_r.decode('utf-8')))
+ except AssertionError:
+ raise
+
+ def test_after_flushd_write_then_read(self):
+ buff = TTransport.TMemoryBuffer()
+ trans = TTransport.TBufferedTransportFactory().getTransport(buff)
+ zlib_trans = TZlibTransport.TZlibTransport(trans)
+ data_w_1 = "hello thrift !@#" * 50
+ zlib_trans.write(data_w_1.encode('utf-8'))
+ zlib_trans.flush()
+ data_w_2 = "{'name': 'thrift', 1: ['abcd' , 233, ('a','c')]}" * 20
+ zlib_trans.write(data_w_2.encode('utf-8'))
+ zlib_trans.flush()
+
+ value = buff.getvalue()
+ zlib_trans.close()
+
+ buff = TTransport.TMemoryBuffer(value)
+ trans = TTransport.TBufferedTransportFactory().getTransport(buff)
+ zlib_trans = TZlibTransport.TZlibTransport(trans)
+ data_r = zlib_trans.read(len(data_w_1) + len(data_w_2))
+ zlib_trans.close()
+
+ try:
+ self.assertEqual(data_w_1 + data_w_2, data_r.decode('utf-8'))
+ self.assertEqual(len(data_w_1) + len(data_w_2),
len(data_r.decode('utf-8')))
+ except AssertionError:
+ raise
+
+
+if __name__ == '__main__':
+ unittest.main()
