Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Addressed PR comments.

Browse Source
pull/13171/head
Joshua Haberman 3 years ago
parent 3921e02990
commit da71fdeeb2
2 changed files with 221 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      python/descriptor_containers.c
  2. 238
      python/pb_unit_tests/BUILD

4
python/descriptor_containers.c
Unescape View File

@ -167,10 +167,9 @@ static int PyUpb_GenericSequence_IsEqual(PyUpb_GenericSequence *self,
} }
PyObject *item1; PyObject *item1;
PyObject *item2;
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
item1 = PyUpb_GenericSequence_GetItem((PyObject*)self, i); item1 = PyUpb_GenericSequence_GetItem((PyObject*)self, i);
item2 = PyList_GetItem(other, i); PyObject* item2 = PyList_GetItem(other, i);
if (!item1 || !item2) goto error; if (!item1 || !item2) goto error;
int cmp = PyObject_RichCompareBool(item1, item2, Py_EQ); int cmp = PyObject_RichCompareBool(item1, item2, Py_EQ);
Py_DECREF(item1); Py_DECREF(item1);
@ -181,7 +180,6 @@ static int PyUpb_GenericSequence_IsEqual(PyUpb_GenericSequence *self,
error: error:
Py_XDECREF(item1); Py_XDECREF(item1);
Py_XDECREF(item2);
return -1; return -1;
} }

238
python/pb_unit_tests/BUILD
Unescape View File

@ -23,33 +23,218 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
TESTS = [ py_test(
"descriptor_database_test", name = "descriptor_database_test",
"descriptor_pool_test", main = "descriptor_database_test_wrapper.py",
"descriptor_test", srcs = ["descriptor_database_test_wrapper.py"],
"generator_test", deps = [
"json_format_test", "//python:message_ext",
"keywords_test", "@com_google_protobuf//:python_srcs",
"message_factory_test", "@com_google_protobuf//:python_common_test_protos",
"message_test", "@com_google_protobuf//:python_specific_test_protos",
"proto_builder_test", ],
"reflection_test", legacy_create_init = False,
"service_reflection_test", )
"symbol_database_test",
"text_encoding_test", py_test(
"text_format_test", name = "descriptor_pool_test",
"unknown_fields_test", main = "descriptor_pool_test_wrapper.py",
"well_known_types_test", srcs = ["descriptor_pool_test_wrapper.py"],
"wire_format_test", deps = [
] "//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "descriptor_test",
main = "descriptor_test_wrapper.py",
srcs = ["descriptor_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "generator_test",
main = "generator_test_wrapper.py",
srcs = ["generator_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "json_format_test",
main = "json_format_test_wrapper.py",
srcs = ["json_format_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "keywords_test",
main = "keywords_test_wrapper.py",
srcs = ["keywords_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "message_factory_test",
main = "message_factory_test_wrapper.py",
srcs = ["message_factory_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "message_test",
main = "message_test_wrapper.py",
srcs = ["message_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
[ py_test(
py_test( name = "proto_builder_test",
name = test, main = "proto_builder_test_wrapper.py",
main = test + "_wrapper.py", srcs = ["proto_builder_test_wrapper.py"],
srcs = [ deps = [
test + "_wrapper.py", "//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "reflection_test",
main = "reflection_test_wrapper.py",
srcs = ["reflection_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "service_reflection_test",
main = "service_reflection_test_wrapper.py",
srcs = ["service_reflection_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "symbol_database_test",
main = "symbol_database_test_wrapper.py",
srcs = ["symbol_database_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
], ],
legacy_create_init = False,
)
py_test(
name = "text_encoding_test",
main = "text_encoding_test_wrapper.py",
srcs = ["text_encoding_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "text_format_test",
main = "text_format_test_wrapper.py",
srcs = ["text_format_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "unknown_fields_test",
main = "unknown_fields_test_wrapper.py",
srcs = ["unknown_fields_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "well_known_types_test",
main = "well_known_types_test_wrapper.py",
srcs = ["well_known_types_test_wrapper.py"],
deps = [
"//python:message_ext",
"@com_google_protobuf//:python_srcs",
"@com_google_protobuf//:python_common_test_protos",
"@com_google_protobuf//:python_specific_test_protos",
],
legacy_create_init = False,
)
py_test(
name = "wire_format_test",
main = "wire_format_test_wrapper.py",
srcs = ["wire_format_test_wrapper.py"],
deps = [ deps = [
"//python:message_ext", "//python:message_ext",
"@com_google_protobuf//:python_srcs", "@com_google_protobuf//:python_srcs",
@ -57,5 +242,4 @@ TESTS = [
"@com_google_protobuf//:python_specific_test_protos", "@com_google_protobuf//:python_specific_test_protos",
], ],
legacy_create_init = False, legacy_create_init = False,
) for test in TESTS )
]

Write Preview
Loading…
Cancel
Save