mirror of
https://github.com/google/googletest.git
synced 2025-11-09 22:53:36 -05:00
Running clang-format over all of GoogleTest
A few tests are examining code locations and looking af the resulting line numbers to verify that GoogleTest shows those to users correctly. Some of those locations change when clang-format is run. For those locations, I've wrapped portions in: // clang-format off ... // clang-format on There may be other locations that are currently not tickled by running clang-format. PiperOrigin-RevId: 434844712 Change-Id: I3a9f0a6f39eff741c576b6de389bef9b1d11139d
This commit is contained in:
committed by
Copybara-Service
parent
8a422b8398
commit
b007c54f29
@@ -27,7 +27,6 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
// Tests that Google Mock constructs can be used in a large number of
|
||||
// threads concurrently.
|
||||
|
||||
@@ -49,7 +48,7 @@ const int kRepeat = 50;
|
||||
|
||||
class MockFoo {
|
||||
public:
|
||||
MOCK_METHOD1(Bar, int(int n)); // NOLINT
|
||||
MOCK_METHOD1(Bar, int(int n)); // NOLINT
|
||||
MOCK_METHOD2(Baz, char(const char* s1, const std::string& s2)); // NOLINT
|
||||
};
|
||||
|
||||
@@ -62,21 +61,16 @@ void JoinAndDelete(ThreadWithParam<T>* t) {
|
||||
|
||||
struct Dummy {};
|
||||
|
||||
|
||||
// Tests that different mock objects can be used in their respective
|
||||
// threads. This should generate no Google Test failure.
|
||||
void TestConcurrentMockObjects(Dummy /* dummy */) {
|
||||
// Creates a mock and does some typical operations on it.
|
||||
MockFoo foo;
|
||||
ON_CALL(foo, Bar(_))
|
||||
.WillByDefault(Return(1));
|
||||
ON_CALL(foo, Baz(_, _))
|
||||
.WillByDefault(Return('b'));
|
||||
ON_CALL(foo, Baz(_, "you"))
|
||||
.WillByDefault(Return('a'));
|
||||
ON_CALL(foo, Bar(_)).WillByDefault(Return(1));
|
||||
ON_CALL(foo, Baz(_, _)).WillByDefault(Return('b'));
|
||||
ON_CALL(foo, Baz(_, "you")).WillByDefault(Return('a'));
|
||||
|
||||
EXPECT_CALL(foo, Bar(0))
|
||||
.Times(AtMost(3));
|
||||
EXPECT_CALL(foo, Bar(0)).Times(AtMost(3));
|
||||
EXPECT_CALL(foo, Baz(_, _));
|
||||
EXPECT_CALL(foo, Baz("hi", "you"))
|
||||
.WillOnce(Return('z'))
|
||||
@@ -119,22 +113,19 @@ void Helper1(Helper1Param param) {
|
||||
void TestConcurrentCallsOnSameObject(Dummy /* dummy */) {
|
||||
MockFoo foo;
|
||||
|
||||
ON_CALL(foo, Bar(_))
|
||||
.WillByDefault(Return(1));
|
||||
EXPECT_CALL(foo, Baz(_, "b"))
|
||||
.Times(kRepeat)
|
||||
.WillRepeatedly(Return('a'));
|
||||
ON_CALL(foo, Bar(_)).WillByDefault(Return(1));
|
||||
EXPECT_CALL(foo, Baz(_, "b")).Times(kRepeat).WillRepeatedly(Return('a'));
|
||||
EXPECT_CALL(foo, Baz(_, "c")); // Expected to be unsatisfied.
|
||||
|
||||
// This chunk of code should generate kRepeat failures about
|
||||
// excessive calls, and 2*kRepeat failures about unexpected calls.
|
||||
int count1 = 0;
|
||||
const Helper1Param param = { &foo, &count1 };
|
||||
const Helper1Param param = {&foo, &count1};
|
||||
ThreadWithParam<Helper1Param>* const t =
|
||||
new ThreadWithParam<Helper1Param>(Helper1, param, nullptr);
|
||||
|
||||
int count2 = 0;
|
||||
const Helper1Param param2 = { &foo, &count2 };
|
||||
const Helper1Param param2 = {&foo, &count2};
|
||||
Helper1(param2);
|
||||
JoinAndDelete(t);
|
||||
|
||||
@@ -162,22 +153,18 @@ void TestPartiallyOrderedExpectationsWithThreads(Dummy /* dummy */) {
|
||||
{
|
||||
InSequence dummy;
|
||||
EXPECT_CALL(foo, Bar(0));
|
||||
EXPECT_CALL(foo, Bar(1))
|
||||
.InSequence(s1, s2);
|
||||
EXPECT_CALL(foo, Bar(1)).InSequence(s1, s2);
|
||||
}
|
||||
|
||||
EXPECT_CALL(foo, Bar(2))
|
||||
.Times(2*kRepeat)
|
||||
.Times(2 * kRepeat)
|
||||
.InSequence(s1)
|
||||
.RetiresOnSaturation();
|
||||
EXPECT_CALL(foo, Bar(3))
|
||||
.Times(2*kRepeat)
|
||||
.InSequence(s2);
|
||||
EXPECT_CALL(foo, Bar(3)).Times(2 * kRepeat).InSequence(s2);
|
||||
|
||||
{
|
||||
InSequence dummy;
|
||||
EXPECT_CALL(foo, Bar(2))
|
||||
.InSequence(s1, s2);
|
||||
EXPECT_CALL(foo, Bar(2)).InSequence(s1, s2);
|
||||
EXPECT_CALL(foo, Bar(4));
|
||||
}
|
||||
|
||||
@@ -196,12 +183,12 @@ void TestPartiallyOrderedExpectationsWithThreads(Dummy /* dummy */) {
|
||||
// Tests using Google Mock constructs in many threads concurrently.
|
||||
TEST(StressTest, CanUseGMockWithThreads) {
|
||||
void (*test_routines[])(Dummy dummy) = {
|
||||
&TestConcurrentMockObjects,
|
||||
&TestConcurrentCallsOnSameObject,
|
||||
&TestPartiallyOrderedExpectationsWithThreads,
|
||||
&TestConcurrentMockObjects,
|
||||
&TestConcurrentCallsOnSameObject,
|
||||
&TestPartiallyOrderedExpectationsWithThreads,
|
||||
};
|
||||
|
||||
const int kRoutines = sizeof(test_routines)/sizeof(test_routines[0]);
|
||||
const int kRoutines = sizeof(test_routines) / sizeof(test_routines[0]);
|
||||
const int kCopiesOfEachRoutine = kMaxTestThreads / kRoutines;
|
||||
const int kTestThreads = kCopiesOfEachRoutine * kRoutines;
|
||||
ThreadWithParam<Dummy>* threads[kTestThreads] = {};
|
||||
@@ -220,7 +207,7 @@ TEST(StressTest, CanUseGMockWithThreads) {
|
||||
// Ensures that the correct number of failures have been reported.
|
||||
const TestInfo* const info = UnitTest::GetInstance()->current_test_info();
|
||||
const TestResult& result = *info->result();
|
||||
const int kExpectedFailures = (3*kRepeat + 1)*kCopiesOfEachRoutine;
|
||||
const int kExpectedFailures = (3 * kRepeat + 1) * kCopiesOfEachRoutine;
|
||||
GTEST_CHECK_(kExpectedFailures == result.total_part_count())
|
||||
<< "Expected " << kExpectedFailures << " failures, but got "
|
||||
<< result.total_part_count();
|
||||
@@ -229,7 +216,7 @@ TEST(StressTest, CanUseGMockWithThreads) {
|
||||
} // namespace
|
||||
} // namespace testing
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
int main(int argc, char** argv) {
|
||||
testing::InitGoogleMock(&argc, argv);
|
||||
|
||||
const int exit_code = RUN_ALL_TESTS(); // Expected to fail.
|
||||
|
||||
Reference in New Issue
Block a user