generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes uses of deprecated AssertionFailure() API (by Vlad Losev).

Browse Source
This commit is contained in:
zhanyong.wan
2010-09-27 22:09:42 +00:00
parent b5d3a17805
commit 2d1835b086
5 changed files with 82 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/gtest_pred_impl_unittest.cc
View File

@@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// This file is AUTOMATICALLY GENERATED on 10/02/2008 by command
// This file is AUTOMATICALLY GENERATED on 09/24/2010 by command
// 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND!
// Regression test for gtest_pred_impl.h
@@ -103,11 +103,10 @@ testing::AssertionResult PredFormatFunction1(const char* e1,
if (PredFunction1(v1))
return testing::AssertionSuccess();
testing::Message msg;
msg << e1
return testing::AssertionFailure()
<< e1
<< " is expected to be positive, but evaluates to "
<< v1 << ".";
return testing::AssertionFailure(msg);
}
// A unary predicate-formatter functor.
@@ -494,11 +493,10 @@ testing::AssertionResult PredFormatFunction2(const char* e1,
if (PredFunction2(v1, v2))
return testing::AssertionSuccess();
testing::Message msg;
msg << e1 << " + " << e2
return testing::AssertionFailure()
<< e1 << " + " << e2
<< " is expected to be positive, but evaluates to "
<< v1 + v2 << ".";
return testing::AssertionFailure(msg);
}
// A binary predicate-formatter functor.
@@ -927,11 +925,10 @@ testing::AssertionResult PredFormatFunction3(const char* e1,
if (PredFunction3(v1, v2, v3))
return testing::AssertionSuccess();
testing::Message msg;
msg << e1 << " + " << e2 << " + " << e3
return testing::AssertionFailure()
<< e1 << " + " << e2 << " + " << e3
<< " is expected to be positive, but evaluates to "
<< v1 + v2 + v3 << ".";
return testing::AssertionFailure(msg);
}
// A ternary predicate-formatter functor.
@@ -1402,11 +1399,10 @@ testing::AssertionResult PredFormatFunction4(const char* e1,
if (PredFunction4(v1, v2, v3, v4))
return testing::AssertionSuccess();
testing::Message msg;
msg << e1 << " + " << e2 << " + " << e3 << " + " << e4
return testing::AssertionFailure()
<< e1 << " + " << e2 << " + " << e3 << " + " << e4
<< " is expected to be positive, but evaluates to "
<< v1 + v2 + v3 + v4 << ".";
return testing::AssertionFailure(msg);
}
// A 4-ary predicate-formatter functor.
@@ -1919,11 +1915,10 @@ testing::AssertionResult PredFormatFunction5(const char* e1,
if (PredFunction5(v1, v2, v3, v4, v5))
return testing::AssertionSuccess();
testing::Message msg;
msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
return testing::AssertionFailure()
<< e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
<< " is expected to be positive, but evaluates to "
<< v1 + v2 + v3 + v4 + v5 << ".";
return testing::AssertionFailure(msg);
}
// A 5-ary predicate-formatter functor.