Skip to content

Commit e69a2cd

Browse files
satylogincopybara-github
satylogin
authored and
copybara-github
committed
Add the {{..}} scope for expect_ family since they need use syntax
PiperOrigin-RevId: 651498178
1 parent 6f4f5ab commit e69a2cd

File tree

2 files changed

+68
-32
lines changed

2 files changed

+68
-32
lines changed

‎googletest/src/assertions.rs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -733,36 +733,36 @@ macro_rules! assert_eq {
733733
/// ```
734734
#[macro_export]
735735
macro_rules! expect_eq {
736-
($actual:expr, [$($expected:expr),+ $(,)?] $(,)?) => {
736+
($actual:expr, [$($expected:expr),+ $(,)?] $(,)?) => {{
737737
use $crate::GoogleTestSupport;
738738
verify_eq!($actual, [$($expected),*]).and_log_failure();
739-
};
740-
($actual:expr, [$($expected:expr),+ $(,)?], $($format_args:expr),* $(,)?) => {
739+
}};
740+
($actual:expr, [$($expected:expr),+ $(,)?], $($format_args:expr),* $(,)?) => {{
741741
use $crate::GoogleTestSupport;
742742
verify_eq!($actual, [$($expected),*])
743743
.with_failure_message(|| format!($($format_args),*))
744744
.and_log_failure();
745-
};
746-
($actual:expr, {$($expected:expr),+ $(,)?} $(,)?) => {
745+
}};
746+
($actual:expr, {$($expected:expr),+ $(,)?} $(,)?) => {{
747747
use $crate::GoogleTestSupport;
748748
verify_eq!($actual, {$($expected),*}).and_log_failure();
749-
};
750-
($actual:expr, {$($expected:expr),+ $(,)?}, $($format_args:expr),* $(,)?) => {
749+
}};
750+
($actual:expr, {$($expected:expr),+ $(,)?}, $($format_args:expr),* $(,)?) => {{
751751
use $crate::GoogleTestSupport;
752752
verify_eq!($actual, {$($expected),*})
753753
.with_failure_message(|| format!($($format_args),*))
754754
.and_log_failure();
755-
};
756-
($actual:expr, $expected:expr $(,)?) => {
755+
}};
756+
($actual:expr, $expected:expr $(,)?) => {{
757757
use $crate::GoogleTestSupport;
758758
verify_eq!($actual, $expected).and_log_failure();
759-
};
760-
($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
759+
}};
760+
($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {{
761761
use $crate::GoogleTestSupport;
762762
verify_eq!($actual, $expected)
763763
.with_failure_message(|| format!($($format_args),*))
764764
.and_log_failure();
765-
};
765+
}};
766766
}
767767

768768
/// Checks whether the second argument is not equal to the first argument.
@@ -831,16 +831,16 @@ macro_rules! verify_ne {
831831
/// ```
832832
#[macro_export]
833833
macro_rules! expect_ne {
834-
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {
834+
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
835835
use $crate::GoogleTestSupport;
836836
verify_ne!($actual, $expected)
837837
.with_failure_message(|| format!($($format_args),*))
838838
.and_log_failure();
839-
};
840-
($actual:expr, $expected:expr $(,)?) => {
839+
}};
840+
($actual:expr, $expected:expr $(,)?) => {{
841841
use $crate::GoogleTestSupport;
842842
verify_ne!($actual, $expected).and_log_failure();
843-
};
843+
}};
844844
}
845845

846846
/// Checks whether the first argument is less than second argument.
@@ -909,16 +909,16 @@ macro_rules! verify_lt {
909909
/// ```
910910
#[macro_export]
911911
macro_rules! expect_lt {
912-
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {
912+
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
913913
use $crate::GoogleTestSupport;
914914
verify_lt!($actual, $expected)
915915
.with_failure_message(|| format!($($format_args),*))
916916
.and_log_failure();
917-
};
918-
($actual:expr, $expected:expr $(,)?) => {
917+
}};
918+
($actual:expr, $expected:expr $(,)?) => {{
919919
use $crate::GoogleTestSupport;
920920
verify_lt!($actual, $expected).and_log_failure();
921-
};
921+
}};
922922
}
923923

924924
/// Checks whether the first argument is less than or equal to the second
@@ -988,16 +988,16 @@ macro_rules! verify_le {
988988
/// ```
989989
#[macro_export]
990990
macro_rules! expect_le {
991-
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {
991+
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
992992
use $crate::GoogleTestSupport;
993993
verify_le!($actual, $expected)
994994
.with_failure_message(|| format!($($format_args),*))
995995
.and_log_failure();
996-
};
997-
($actual:expr, $expected:expr $(,)?) => {
996+
}};
997+
($actual:expr, $expected:expr $(,)?) => {{
998998
use $crate::GoogleTestSupport;
999999
verify_le!($actual, $expected).and_log_failure();
1000-
};
1000+
}};
10011001
}
10021002

10031003
/// Checks whether the first argument is greater than the second argument.
@@ -1066,16 +1066,16 @@ macro_rules! verify_gt {
10661066
/// ```
10671067
#[macro_export]
10681068
macro_rules! expect_gt {
1069-
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {
1069+
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
10701070
use $crate::GoogleTestSupport;
10711071
verify_gt!($actual, $expected)
10721072
.with_failure_message(|| format!($($format_args),*))
10731073
.and_log_failure();
1074-
};
1075-
($actual:expr, $expected:expr $(,)?) => {
1074+
}};
1075+
($actual:expr, $expected:expr $(,)?) => {{
10761076
use $crate::GoogleTestSupport;
10771077
verify_gt!($actual, $expected).and_log_failure();
1078-
};
1078+
}};
10791079
}
10801080

10811081
/// Checks whether the first argument is greater than or equal to the second
@@ -1146,16 +1146,16 @@ macro_rules! verify_ge {
11461146
/// ```
11471147
#[macro_export]
11481148
macro_rules! expect_ge {
1149-
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {
1149+
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
11501150
use $crate::GoogleTestSupport;
11511151
verify_ge!($actual, $expected)
11521152
.with_failure_message(|| format!($($format_args),*))
11531153
.and_log_failure();
1154-
};
1155-
($actual:expr, $expected:expr $(,)?) => {
1154+
}};
1155+
($actual:expr, $expected:expr $(,)?) => {{
11561156
use $crate::GoogleTestSupport;
11571157
verify_ge!($actual, $expected).and_log_failure();
1158-
};
1158+
}};
11591159
}
11601160

11611161
/// Matches the given value against the given matcher, panicking if it does not

‎integration_tests/src/integration_tests.rs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,6 +1120,12 @@ mod tests {
11201120
expect_eq!(value, 2);
11211121
}
11221122

1123+
#[googletest::test]
1124+
fn expect_eq_should_allow_multiple_calls() {
1125+
expect_eq!(1, 1);
1126+
expect_eq!(2, 2);
1127+
}
1128+
11231129
#[googletest::test]
11241130
fn expect_eq_supports_trailing_comma() {
11251131
let value = 2;
@@ -1304,6 +1310,12 @@ mod tests {
13041310
expect_ne!(1, 2);
13051311
}
13061312

1313+
#[googletest::test]
1314+
fn expect_ne_should_allow_multiple_calls() {
1315+
expect_ne!(1, 2);
1316+
expect_ne!(1, 3);
1317+
}
1318+
13071319
#[googletest::test]
13081320
fn expect_ne_supports_trailing_comma() {
13091321
expect_ne!(1, 2,);
@@ -1375,6 +1387,12 @@ mod tests {
13751387
expect_lt!(1, 2);
13761388
}
13771389

1390+
#[googletest::test]
1391+
fn expect_lt_should_allow_multuple_calls() {
1392+
expect_lt!(1, 2);
1393+
expect_lt!(1, 3);
1394+
}
1395+
13781396
#[googletest::test]
13791397
fn expect_lt_supports_trailing_comma() {
13801398
expect_lt!(1, 2,);
@@ -1445,6 +1463,12 @@ mod tests {
14451463
expect_le!(1, 1);
14461464
}
14471465

1466+
#[googletest::test]
1467+
fn expect_le_should_allow_multiple_calls() {
1468+
expect_le!(1, 1);
1469+
expect_le!(1, 2);
1470+
}
1471+
14481472
#[googletest::test]
14491473
fn expect_le_supports_trailing_comma() {
14501474
expect_le!(1, 2,);
@@ -1515,6 +1539,12 @@ mod tests {
15151539
expect_gt!(2, 1);
15161540
}
15171541

1542+
#[googletest::test]
1543+
fn expect_gt_should_allow_multiple_calls() {
1544+
expect_gt!(2, 1);
1545+
expect_gt!(3, 1);
1546+
}
1547+
15181548
#[googletest::test]
15191549
fn expect_gt_supports_trailing_comma() {
15201550
expect_gt!(2, 1,);
@@ -1584,6 +1614,12 @@ mod tests {
15841614
expect_ge!(1, 1);
15851615
}
15861616

1617+
#[googletest::test]
1618+
fn expect_ge_should_allow_multiple_calls() {
1619+
expect_ge!(1, 1);
1620+
expect_ge!(2, 1);
1621+
}
1622+
15871623
#[googletest::test]
15881624
fn expect_ge_supports_trailing_comma() {
15891625
expect_ge!(2, 1,);

0 commit comments

Comments
 (0)