From 10c1d8c4faed0b90670a4971cf80a75d552d6f22 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Mon, 7 Oct 2019 14:30:10 -0500 Subject: Use the verbatim noexcept spec in MOCKED_METHOD --- googlemock/test/gmock-function-mocker_test.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'googlemock/test/gmock-function-mocker_test.cc') diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc index fbc5d5b2..4b41437e 100644 --- a/googlemock/test/gmock-function-mocker_test.cc +++ b/googlemock/test/gmock-function-mocker_test.cc @@ -656,5 +656,26 @@ TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) { EXPECT_EQ(sizeof(MockMethodSizes0), sizeof(MockMethodSizes4)); } +struct MockMethodNoexceptSpecifier { + MOCK_METHOD(void, func1, (), (noexcept)); + MOCK_METHOD(void, func2, (), (noexcept(true))); + MOCK_METHOD(void, func3, (), (noexcept(false))); + MOCK_METHOD(void, func4, (), (noexcept(noexcept(1+1)))); + MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1)))); + MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const)); + // Put commas in the noexcept expression + MOCK_METHOD(void, func7, (), (noexcept(noexcept(1,2,3)), const)); +}; + +TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { + EXPECT_TRUE(noexcept(MockMethodNoexceptSpecifier{}.func1())); + EXPECT_TRUE(noexcept(MockMethodNoexceptSpecifier{}.func2())); + EXPECT_FALSE(noexcept(MockMethodNoexceptSpecifier{}.func3())); + EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1)); + EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1)); + EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func6()), noexcept(1+1)); + EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(1,2,3)); +} + } // namespace gmock_function_mocker_test } // namespace testing -- cgit v1.2.3 From 872b9ceb6045949a5e8ab22221301e65fea3fe29 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Mon, 7 Oct 2019 15:12:51 -0500 Subject: Avoid comma operator --- googlemock/test/gmock-function-mocker_test.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'googlemock/test/gmock-function-mocker_test.cc') diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc index 4b41437e..efd2499d 100644 --- a/googlemock/test/gmock-function-mocker_test.cc +++ b/googlemock/test/gmock-function-mocker_test.cc @@ -664,7 +664,8 @@ struct MockMethodNoexceptSpecifier { MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1)))); MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const)); // Put commas in the noexcept expression - MOCK_METHOD(void, func7, (), (noexcept(noexcept(1,2,3)), const)); + void other_func(int, int) noexcept; + MOCK_METHOD(void, func7, (), (noexcept(noexcept(other_func(1,2))), const)); }; TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { @@ -674,7 +675,7 @@ TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1)); EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1)); EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func6()), noexcept(1+1)); - EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(1,2,3)); + EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(MockMethodNoexceptSpecifier{}.other_func(1,2))); } } // namespace gmock_function_mocker_test -- cgit v1.2.3 From 7f8617a7c53275654531e3c75fe11bc9b1b7e1a1 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Mon, 7 Oct 2019 15:49:52 -0500 Subject: Switch to free function to avoid GCC bug --- googlemock/test/gmock-function-mocker_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'googlemock/test/gmock-function-mocker_test.cc') diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc index efd2499d..94f01fe2 100644 --- a/googlemock/test/gmock-function-mocker_test.cc +++ b/googlemock/test/gmock-function-mocker_test.cc @@ -656,6 +656,7 @@ TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) { EXPECT_EQ(sizeof(MockMethodSizes0), sizeof(MockMethodSizes4)); } +void hasTwoParams(int, int); struct MockMethodNoexceptSpecifier { MOCK_METHOD(void, func1, (), (noexcept)); MOCK_METHOD(void, func2, (), (noexcept(true))); @@ -664,8 +665,7 @@ struct MockMethodNoexceptSpecifier { MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1)))); MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const)); // Put commas in the noexcept expression - void other_func(int, int) noexcept; - MOCK_METHOD(void, func7, (), (noexcept(noexcept(other_func(1,2))), const)); + MOCK_METHOD(void, func7, (), (noexcept(noexcept(hasTwoParams(1,2))), const)); }; TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { @@ -675,7 +675,7 @@ TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1)); EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1)); EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func6()), noexcept(1+1)); - EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(MockMethodNoexceptSpecifier{}.other_func(1,2))); + EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(hasTwoParams(1,2))); } } // namespace gmock_function_mocker_test -- cgit v1.2.3 From 20255e6f40995f03c808a0589ea92c52a26552cd Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Mon, 7 Oct 2019 16:27:11 -0500 Subject: Use declval in noexcept expression --- googlemock/test/gmock-function-mocker_test.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'googlemock/test/gmock-function-mocker_test.cc') diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc index 94f01fe2..f493c72f 100644 --- a/googlemock/test/gmock-function-mocker_test.cc +++ b/googlemock/test/gmock-function-mocker_test.cc @@ -42,6 +42,7 @@ #include #include +#include #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -669,13 +670,13 @@ struct MockMethodNoexceptSpecifier { }; TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { - EXPECT_TRUE(noexcept(MockMethodNoexceptSpecifier{}.func1())); - EXPECT_TRUE(noexcept(MockMethodNoexceptSpecifier{}.func2())); - EXPECT_FALSE(noexcept(MockMethodNoexceptSpecifier{}.func3())); - EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1)); - EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1)); - EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func6()), noexcept(1+1)); - EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(hasTwoParams(1,2))); + EXPECT_TRUE(noexcept(std::declval().func1())); + EXPECT_TRUE(noexcept(std::declval().func2())); + EXPECT_FALSE(noexcept(std::declval().func3())); + EXPECT_EQ(noexcept(std::declval().func4()), noexcept(1+1)); + EXPECT_EQ(noexcept(std::declval().func5()), noexcept(1+1)); + EXPECT_EQ(noexcept(std::declval().func6()), noexcept(1+1)); + EXPECT_EQ(noexcept(std::declval().func7()), noexcept(hasTwoParams(1,2))); } } // namespace gmock_function_mocker_test -- cgit v1.2.3 From bc996e0817d85c9dcfbf031480d22743aba697b2 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Thu, 10 Oct 2019 08:52:27 -0500 Subject: Made noexcept condition more exciting --- googlemock/test/gmock-function-mocker_test.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'googlemock/test/gmock-function-mocker_test.cc') diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc index f493c72f..4889d681 100644 --- a/googlemock/test/gmock-function-mocker_test.cc +++ b/googlemock/test/gmock-function-mocker_test.cc @@ -658,25 +658,29 @@ TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) { } void hasTwoParams(int, int); +void MaybeThrows(); +void DoesntThrow() noexcept; struct MockMethodNoexceptSpecifier { MOCK_METHOD(void, func1, (), (noexcept)); MOCK_METHOD(void, func2, (), (noexcept(true))); MOCK_METHOD(void, func3, (), (noexcept(false))); - MOCK_METHOD(void, func4, (), (noexcept(noexcept(1+1)))); - MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1)))); - MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const)); + MOCK_METHOD(void, func4, (), (noexcept(noexcept(MaybeThrows())))); + MOCK_METHOD(void, func5, (), (noexcept(noexcept(DoesntThrow())))); + MOCK_METHOD(void, func6, (), (noexcept(noexcept(DoesntThrow())), const)); + MOCK_METHOD(void, func7, (), (const, noexcept(noexcept(DoesntThrow())))); // Put commas in the noexcept expression - MOCK_METHOD(void, func7, (), (noexcept(noexcept(hasTwoParams(1,2))), const)); + MOCK_METHOD(void, func8, (), (noexcept(noexcept(hasTwoParams(1,2))), const)); }; TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { EXPECT_TRUE(noexcept(std::declval().func1())); EXPECT_TRUE(noexcept(std::declval().func2())); EXPECT_FALSE(noexcept(std::declval().func3())); - EXPECT_EQ(noexcept(std::declval().func4()), noexcept(1+1)); - EXPECT_EQ(noexcept(std::declval().func5()), noexcept(1+1)); - EXPECT_EQ(noexcept(std::declval().func6()), noexcept(1+1)); - EXPECT_EQ(noexcept(std::declval().func7()), noexcept(hasTwoParams(1,2))); + EXPECT_FALSE(noexcept(std::declval().func4())); + EXPECT_TRUE(noexcept(std::declval().func5())); + EXPECT_TRUE(noexcept(std::declval().func6())); + EXPECT_TRUE(noexcept(std::declval().func7())); + EXPECT_EQ(noexcept(std::declval().func8()), noexcept(hasTwoParams(1,2))); } } // namespace gmock_function_mocker_test -- cgit v1.2.3