From dc67f8afc1feb2abf60f14bdce41d437946d9a5c Mon Sep 17 00:00:00 2001 From: Hong Shin Date: Wed, 18 Oct 2023 08:40:45 -0700 Subject: [PATCH] Perform preliminary migration of accessors_proto3_test to googletest-rust PiperOrigin-RevId: 574486887 --- rust/test/shared/BUILD | 6 ++ rust/test/shared/accessors_proto3_test.rs | 118 +++++++++++----------- 2 files changed, 66 insertions(+), 58 deletions(-) diff --git a/rust/test/shared/BUILD b/rust/test/shared/BUILD index 79d43ddd4e..b2c4aaf164 100644 --- a/rust/test/shared/BUILD +++ b/rust/test/shared/BUILD @@ -193,15 +193,18 @@ rust_test( srcs = ["accessors_proto3_test.rs"], aliases = { "//rust:protobuf_cpp": "protobuf", + "//rust/test/shared:matchers_cpp": "matchers", }, tags = [ # TODO: Enable testing on arm once we support sanitizers for Rust on Arm. "not_build:arm", ], deps = [ + "//third_party/gtest_rust/googletest", "//rust:protobuf_cpp", "//rust/test:unittest_proto3_cc_rust_proto", "//rust/test:unittest_proto3_optional_cc_rust_proto", + "//rust/test/shared:matchers_cpp", ], ) @@ -210,15 +213,18 @@ rust_test( srcs = ["accessors_proto3_test.rs"], aliases = { "//rust:protobuf_upb": "protobuf", + "//rust/test/shared:matchers_upb": "matchers", }, tags = [ # TODO: Enable testing on arm once we support sanitizers for Rust on Arm. "not_build:arm", ], deps = [ + "//third_party/gtest_rust/googletest", "//rust:protobuf_upb", "//rust/test:unittest_proto3_optional_upb_rust_proto", "//rust/test:unittest_proto3_upb_rust_proto", + "//rust/test/shared:matchers_upb", ], ) diff --git a/rust/test/shared/accessors_proto3_test.rs b/rust/test/shared/accessors_proto3_test.rs index 84d58a9e9c..3260c0d11d 100644 --- a/rust/test/shared/accessors_proto3_test.rs +++ b/rust/test/shared/accessors_proto3_test.rs @@ -7,6 +7,8 @@ /// Tests covering accessors for singular bool, int32, int64, and bytes fields /// on proto3. +use googletest::prelude::*; +use matchers::{is_set, is_unset}; use protobuf::Optional; use unittest_proto3::proto3_unittest::{TestAllTypes, TestAllTypes_}; use unittest_proto3_optional::proto2_unittest::TestProto3Optional; @@ -14,31 +16,31 @@ use unittest_proto3_optional::proto2_unittest::TestProto3Optional; #[test] fn test_fixed32_accessors() { let mut msg = TestAllTypes::new(); - assert_eq!(msg.optional_fixed32(), 0); - assert_eq!(msg.optional_fixed32_mut().get(), 0); + assert_that!(msg.optional_fixed32(), eq(0)); + assert_that!(msg.optional_fixed32_mut().get(), eq(0)); msg.optional_fixed32_mut().set(42); - assert_eq!(msg.optional_fixed32_mut().get(), 42); - assert_eq!(msg.optional_fixed32(), 42); + assert_that!(msg.optional_fixed32_mut().get(), eq(42)); + assert_that!(msg.optional_fixed32(), eq(42)); msg.optional_fixed32_mut().clear(); - assert_eq!(msg.optional_fixed32(), 0); - assert_eq!(msg.optional_fixed32_mut().get(), 0); + assert_that!(msg.optional_fixed32(), eq(0)); + assert_that!(msg.optional_fixed32_mut().get(), eq(0)); } #[test] fn test_bool_accessors() { let mut msg = TestAllTypes::new(); - assert!(!msg.optional_bool()); - assert!(!msg.optional_bool_mut().get()); + assert_that!(msg.optional_bool(), eq(false)); + assert_that!(msg.optional_bool_mut().get(), eq(false)); msg.optional_bool_mut().set(true); - assert!(msg.optional_bool()); - assert!(msg.optional_bool_mut().get()); + assert_that!(msg.optional_bool(), eq(true)); + assert_that!(msg.optional_bool_mut().get(), eq(true)); msg.optional_bool_mut().clear(); - assert!(!msg.optional_bool()); - assert!(!msg.optional_bool_mut().get()); + assert_that!(msg.optional_bool(), eq(false)); + assert_that!(msg.optional_bool_mut().get(), eq(false)); } #[test] @@ -46,73 +48,73 @@ fn test_bytes_accessors() { let mut msg = TestAllTypes::new(); // Note: even though it's named 'optional_bytes', the field is actually not // proto3 optional, so it does not support presence. - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_mut().get(), b""); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(*msg.optional_bytes_mut().get(), empty()); msg.optional_bytes_mut().set(b"accessors_test"); - assert_eq!(msg.optional_bytes(), b"accessors_test"); - assert_eq!(msg.optional_bytes_mut().get(), b"accessors_test"); + assert_that!(msg.optional_bytes(), eq(b"accessors_test")); + assert_that!(msg.optional_bytes_mut().get(), eq(b"accessors_test")); { let s = Vec::from(&b"hello world"[..]); msg.optional_bytes_mut().set(&s[..]); } - assert_eq!(msg.optional_bytes(), b"hello world"); - assert_eq!(msg.optional_bytes_mut().get(), b"hello world"); + assert_that!(msg.optional_bytes(), eq(b"hello world")); + assert_that!(msg.optional_bytes_mut().get(), eq(b"hello world")); msg.optional_bytes_mut().clear(); - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_mut().get(), b""); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(*msg.optional_bytes_mut().get(), empty()); msg.optional_bytes_mut().set(b""); - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_mut().get(), b""); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(*msg.optional_bytes_mut().get(), empty()); } #[test] fn test_optional_bytes_accessors() { let mut msg = TestProto3Optional::new(); - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_opt(), Optional::Unset(&b""[..])); - assert_eq!(msg.optional_bytes_mut().get(), b""); - assert!(msg.optional_bytes_mut().is_unset()); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Unset(&b""[..]))); + assert_that!(*msg.optional_bytes_mut().get(), empty()); + assert_that!(msg.optional_bytes_mut(), is_unset()); { let s = Vec::from(&b"hello world"[..]); msg.optional_bytes_mut().set(&s[..]); } - assert_eq!(msg.optional_bytes(), b"hello world"); - assert_eq!(msg.optional_bytes_opt(), Optional::Set(&b"hello world"[..])); - assert!(msg.optional_bytes_mut().is_set()); - assert_eq!(msg.optional_bytes_mut().get(), b"hello world"); + assert_that!(msg.optional_bytes(), eq(b"hello world")); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Set(&b"hello world"[..]))); + assert_that!(msg.optional_bytes_mut(), is_set()); + assert_that!(msg.optional_bytes_mut().get(), eq(b"hello world")); msg.optional_bytes_mut().or_default().set(b"accessors_test"); - assert_eq!(msg.optional_bytes(), b"accessors_test"); - assert_eq!(msg.optional_bytes_opt(), Optional::Set(&b"accessors_test"[..])); - assert!(msg.optional_bytes_mut().is_set()); - assert_eq!(msg.optional_bytes_mut().get(), b"accessors_test"); - assert_eq!(msg.optional_bytes_mut().or_default().get(), b"accessors_test"); + assert_that!(msg.optional_bytes(), eq(b"accessors_test")); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Set(&b"accessors_test"[..]))); + assert_that!(msg.optional_bytes_mut(), is_set()); + assert_that!(msg.optional_bytes_mut().get(), eq(b"accessors_test")); + assert_that!(msg.optional_bytes_mut().or_default().get(), eq(b"accessors_test")); msg.optional_bytes_mut().clear(); - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_opt(), Optional::Unset(&b""[..])); - assert!(msg.optional_bytes_mut().is_unset()); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Unset(&b""[..]))); + assert_that!(msg.optional_bytes_mut(), is_unset()); msg.optional_bytes_mut().set(b""); - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_opt(), Optional::Set(&b""[..])); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Set(&b""[..]))); msg.optional_bytes_mut().clear(); msg.optional_bytes_mut().or_default(); - assert_eq!(msg.optional_bytes(), b""); - assert_eq!(msg.optional_bytes_opt(), Optional::Set(&b""[..])); + assert_that!(*msg.optional_bytes(), empty()); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Set(&b""[..]))); msg.optional_bytes_mut().or_default().set(b"\xffbinary\x85non-utf8"); - assert_eq!(msg.optional_bytes(), b"\xffbinary\x85non-utf8"); - assert_eq!(msg.optional_bytes_opt(), Optional::Set(&b"\xffbinary\x85non-utf8"[..])); - assert!(msg.optional_bytes_mut().is_set()); - assert_eq!(msg.optional_bytes_mut().get(), b"\xffbinary\x85non-utf8"); - assert_eq!(msg.optional_bytes_mut().or_default().get(), b"\xffbinary\x85non-utf8"); + assert_that!(msg.optional_bytes(), eq(b"\xffbinary\x85non-utf8")); + assert_that!(msg.optional_bytes_opt(), eq(Optional::Set(&b"\xffbinary\x85non-utf8"[..]))); + assert_that!(msg.optional_bytes_mut(), is_set()); + assert_that!(msg.optional_bytes_mut().get(), eq(b"\xffbinary\x85non-utf8")); + assert_that!(msg.optional_bytes_mut().or_default().get(), eq(b"\xffbinary\x85non-utf8")); } #[test] @@ -149,7 +151,7 @@ fn test_optional_string_accessors() { assert_eq!(msg.optional_string(), ""); assert_eq!(msg.optional_string_opt(), Optional::Unset("".into())); assert_eq!(msg.optional_string_mut().get(), ""); - assert!(msg.optional_string_mut().is_unset()); + assert_that!(msg.optional_string_mut(), is_unset()); { let s = String::from("hello world"); @@ -157,20 +159,20 @@ fn test_optional_string_accessors() { } assert_eq!(msg.optional_string(), "hello world"); assert_eq!(msg.optional_string_opt(), Optional::Set("hello world".into())); - assert!(msg.optional_string_mut().is_set()); + assert_that!(msg.optional_string_mut(), is_set()); assert_eq!(msg.optional_string_mut().get(), "hello world"); msg.optional_string_mut().or_default().set("accessors_test"); assert_eq!(msg.optional_string(), "accessors_test"); assert_eq!(msg.optional_string_opt(), Optional::Set("accessors_test".into())); - assert!(msg.optional_string_mut().is_set()); + assert_that!(msg.optional_string_mut(), is_set()); assert_eq!(msg.optional_string_mut().get(), "accessors_test"); assert_eq!(msg.optional_string_mut().or_default().get(), "accessors_test"); msg.optional_string_mut().clear(); assert_eq!(msg.optional_string(), ""); assert_eq!(msg.optional_string_opt(), Optional::Unset("".into())); - assert!(msg.optional_string_mut().is_unset()); + assert_that!(msg.optional_string_mut(), is_unset()); msg.optional_string_mut().set(""); assert_eq!(msg.optional_string(), ""); @@ -187,20 +189,20 @@ fn test_oneof_accessors() { use TestAllTypes_::OneofField::*; let mut msg = TestAllTypes::new(); - assert!(matches!(msg.oneof_field(), not_set(_))); + assert_that!(msg.oneof_field(), matches_pattern!(not_set(_))); msg.oneof_uint32_set(Some(7)); - assert_eq!(msg.oneof_uint32_opt(), Optional::Set(7)); - assert!(matches!(msg.oneof_field(), OneofUint32(7))); + assert_that!(msg.oneof_uint32_opt(), eq(Optional::Set(7))); + assert_that!(msg.oneof_field(), matches_pattern!(OneofUint32(eq(7)))); msg.oneof_uint32_set(None); - assert_eq!(msg.oneof_uint32_opt(), Optional::Unset(0)); - assert!(matches!(msg.oneof_field(), not_set(_))); + assert_that!(msg.oneof_uint32_opt(), eq(Optional::Unset(0))); + assert_that!(msg.oneof_field(), matches_pattern!(not_set(_))); msg.oneof_uint32_set(Some(7)); msg.oneof_bytes_mut().set(b""); - assert_eq!(msg.oneof_uint32_opt(), Optional::Unset(0)); + assert_that!(msg.oneof_uint32_opt(), eq(Optional::Unset(0))); // This should show it set to the OneofBytes but its not supported yet. - assert!(matches!(msg.oneof_field(), not_set(_))); + assert_that!(msg.oneof_field(), matches_pattern!(not_set(_))); }