From 87fe9ed8772fafcf76fff0bcddc09c8cf81d2f98 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 2 Aug 2013 08:35:39 -0700 Subject: [PATCH] Add default to UnitTest::fail() and tidy up --- .../beast/modules/beast_core/diagnostic/beast_UnitTest.cpp | 6 ++---- .../beast/modules/beast_core/diagnostic/beast_UnitTest.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp index 96db552226..603e005472 100644 --- a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp +++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp @@ -135,9 +135,7 @@ void UnitTest::pass () // If this goes off it means you forgot to call beginTestCase()! bassert (m_case != nullptr); - Item item (true); - - m_case->items.add (item); + m_case->items.add (Item (true)); } void UnitTest::fail (String const& failureMessage) @@ -148,7 +146,7 @@ void UnitTest::fail (String const& failureMessage) Item item (false, failureMessage); m_case->failures++; - int const caseNumber = m_case->items.add (item); + int const caseNumber = m_case->items.add (Item (false, failureMessage)); String s; s << "#" << String (caseNumber) << " failed: " << failureMessage; diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h index abf654c3e2..2c67a5e6b9 100644 --- a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h +++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.h @@ -295,7 +295,7 @@ public: void pass (); /** Causes the test item to fail. */ - void fail (String const& failureMessage); + void fail (String const& failureMessage = String::empty); /** Records an exception in the test item. */ void failException ();