|
20 | 20 | #include "gmock/gmock.h"
|
21 | 21 | #include "gtest/gtest.h"
|
22 | 22 |
|
| 23 | +#define EXPECT_SYSTEM_ERROR(statement, error_code) \ |
| 24 | + EXPECT_THROW({\ |
| 25 | + try { \ |
| 26 | + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ |
| 27 | + } \ |
| 28 | + catch(const std::system_error &exception) {\ |
| 29 | + EXPECT_EQ(error_code, exception.code());\ |
| 30 | + throw;\ |
| 31 | + }\ |
| 32 | + }, std::system_error) |
| 33 | + |
23 | 34 | namespace {
|
24 | 35 |
|
25 | 36 | using ::testing::Eq;
|
@@ -107,66 +118,66 @@ TEST(ThreadDeathTest, MovingIntoRunningThreadShouldAbort) {
|
107 | 118 | }
|
108 | 119 |
|
109 | 120 | TEST(ThreadDeathTest, JoinEmptyThreadShouldAbort) {
|
110 |
| - ASSERT_DEATH( |
| 121 | + EXPECT_SYSTEM_ERROR( |
111 | 122 | {
|
112 | 123 | firebase::Thread thread;
|
113 | 124 | thread.Join();
|
114 | 125 | },
|
115 |
| - ""); |
| 126 | + std::errc::invalid_argument); |
116 | 127 | }
|
117 | 128 |
|
118 | 129 | TEST(ThreadDeathTest, JoinThreadMultipleTimesShouldAbort) {
|
119 |
| - ASSERT_DEATH( |
| 130 | + EXPECT_SYSTEM_ERROR( |
120 | 131 | {
|
121 | 132 | firebase::Thread thread([] {});
|
122 | 133 |
|
123 | 134 | thread.Join();
|
124 | 135 | thread.Join();
|
125 | 136 | },
|
126 |
| - ""); |
| 137 | + std::errc::invalid_argument); |
127 | 138 | }
|
128 | 139 |
|
129 | 140 | TEST(ThreadDeathTest, JoinDetachedThreadShouldAbort) {
|
130 |
| - ASSERT_DEATH( |
| 141 | + EXPECT_SYSTEM_ERROR( |
131 | 142 | {
|
132 | 143 | firebase::Thread thread([] {});
|
133 | 144 |
|
134 | 145 | thread.Detach();
|
135 | 146 | thread.Join();
|
136 | 147 | },
|
137 |
| - ""); |
| 148 | + std::errc::invalid_argument); |
138 | 149 | }
|
139 | 150 |
|
140 | 151 | TEST(ThreadDeathTest, DetachJoinedThreadShouldAbort) {
|
141 |
| - ASSERT_DEATH( |
| 152 | + EXPECT_SYSTEM_ERROR( |
142 | 153 | {
|
143 | 154 | firebase::Thread thread([] {});
|
144 | 155 |
|
145 | 156 | thread.Join();
|
146 | 157 | thread.Detach();
|
147 | 158 | },
|
148 |
| - ""); |
| 159 | + std::errc::invalid_argument); |
149 | 160 | }
|
150 | 161 |
|
151 | 162 | TEST(ThreadDeathTest, DetachEmptyThreadShouldAbort) {
|
152 |
| - ASSERT_DEATH( |
| 163 | + EXPECT_SYSTEM_ERROR( |
153 | 164 | {
|
154 | 165 | firebase::Thread thread;
|
155 | 166 |
|
156 | 167 | thread.Detach();
|
157 | 168 | },
|
158 |
| - ""); |
| 169 | + std::errc::invalid_argument); |
159 | 170 | }
|
160 | 171 |
|
161 | 172 | TEST(ThreadDeathTest, DetachThreadMultipleTimesShouldAbort) {
|
162 |
| - ASSERT_DEATH( |
| 173 | + EXPECT_SYSTEM_ERROR( |
163 | 174 | {
|
164 | 175 | firebase::Thread thread([] {});
|
165 | 176 |
|
166 | 177 | thread.Detach();
|
167 | 178 | thread.Detach();
|
168 | 179 | },
|
169 |
| - ""); |
| 180 | + std::errc::invalid_argument); |
170 | 181 | }
|
171 | 182 |
|
172 | 183 | TEST(ThreadDeathTest, WhenJoinableThreadIsDestructedShouldAbort) {
|
|
0 commit comments