diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/gen_gtest_pred_impl.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/gen_gtest_pred_impl.py b/scripts/gen_gtest_pred_impl.py index 39bb6cf7..d35b4f00 100755 --- a/scripts/gen_gtest_pred_impl.py +++ b/scripts/gen_gtest_pred_impl.py @@ -238,21 +238,19 @@ AssertionResult AssertPred%(n)sHelper(const char* pred_text""" % DEFS impl += """) { if (pred(%(vs)s)) return AssertionSuccess(); - Message msg; """ % DEFS - impl += ' msg << pred_text << "("' + impl += ' return AssertionFailure() << pred_text << "("' impl += Iter(n, """ - << e%s""", sep=' << ", "') + << e%s""", sep=' << ", "') impl += ' << ") evaluates to false, where"' impl += Iter(n, """ - << "\\n" << e%s << " evaluates to " << v%s""") + << "\\n" << e%s << " evaluates to " << v%s""") impl += """; - return AssertionFailure(msg); } // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT%(n)s. @@ -478,15 +476,14 @@ testing::AssertionResult PredFormatFunction%(n)s(""" % DEFS if (PredFunction%(n)s(%(vs)s)) return testing::AssertionSuccess(); - testing::Message msg; - msg << """ % DEFS + return testing::AssertionFailure() + << """ % DEFS tests += Iter(n, 'e%s', sep=' << " + " << ') tests += """ << " is expected to be positive, but evaluates to " << %(v_sum)s << "."; - return testing::AssertionFailure(msg); } """ % DEFS |