Skip to content

G
googletest
Commit f43e4ff3 by zhanyong.wan
Options

Renames the methods in the event listener API, and changes the order of *End…

Renames the methods in the event listener API, and changes the order of *End events (by Vlad Losev).
parent 12d740fa
Showing with 269 additions and 133 deletions
include/gtest/gtest.h
...@@ -158,8 +158,7 @@ class TestCase; ...@@ -158,8 +158,7 @@ class TestCase;
class TestInfoImpl; class TestInfoImpl;
class TestResultAccessor; class TestResultAccessor;
class UnitTestAccessor; class UnitTestAccessor;
// TODO(vladl@google.com): Rename to TestEventRepeater. class TestEventRepeater;
class UnitTestEventsRepeater;
class WindowsDeathTest; class WindowsDeathTest;
class UnitTestImpl* GetUnitTestImpl(); class UnitTestImpl* GetUnitTestImpl();
void ReportFailureInUnknownLocation(TestPartResultType result_type, void ReportFailureInUnknownLocation(TestPartResultType result_type,
...@@ -781,86 +780,75 @@ class UnitTestEventListenerInterface { ...@@ -781,86 +780,75 @@ class UnitTestEventListenerInterface {
public: public:
virtual ~UnitTestEventListenerInterface() {} virtual ~UnitTestEventListenerInterface() {}
// TODO(vladl@google.com): Add events for test program start and test program // TODO(vladl@google.com): Add tests for OnTestIterationStart and
// end: OnTestIterationStart(const UnitTest&); // Start of one iteration. // OnTestIterationEnd.
// Add tests, too.
// TODO(vladl@google.com): Rename OnUnitTestStart() and OnUnitTestEnd() to
// OnTestProgramStart() and OnTestProgramEnd().
// Called before any test activity starts.
virtual void OnUnitTestStart(const UnitTest& unit_test) = 0;
// Called after all test activities have ended. // Fired before any test activity starts.
virtual void OnUnitTestEnd(const UnitTest& unit_test) = 0; virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
// Called before the test case starts. // Fired after all test activities have ended.
virtual void OnTestCaseStart(const TestCase& test_case) = 0; virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
// Called after the test case ends. // Fired before each iteration of tests starts. There may be more than
virtual void OnTestCaseEnd(const TestCase& test_case) = 0; // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
// index, starting from 0.
virtual void OnTestIterationStart(const UnitTest& unit_test,
int iteration) = 0;
// Fired after each iteration of tests finishes.
virtual void OnTestIterationEnd(const UnitTest& unit_test,
int iteration) = 0;
// TODO(vladl@google.com): Rename OnGlobalSetUpStart to // Fired before environment set-up for each iteration of tests starts.
// OnEnvironmentsSetUpStart. Make similar changes for the rest of virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
// environment-related events.
// Called before the global set-up starts.
virtual void OnGlobalSetUpStart(const UnitTest& unit_test) = 0;
// Called after the global set-up ends. // Fired after environment set-up for each iteration of tests ends.
virtual void OnGlobalSetUpEnd(const UnitTest& unit_test) = 0; virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
// Called before the global tear-down starts. // Fired before environment tear-down for each iteration of tests starts.
virtual void OnGlobalTearDownStart(const UnitTest& unit_test) = 0; virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
// Called after the global tear-down ends. // Fired after environment tear-down for each iteration of tests ends.
virtual void OnGlobalTearDownEnd(const UnitTest& unit_test) = 0; virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
// Fired before the test case starts.
virtual void OnTestCaseStart(const TestCase& test_case) = 0;
// Called before the test starts. // Fired after the test case ends.
virtual void OnTestCaseEnd(const TestCase& test_case) = 0;
// Fired before the test starts.
virtual void OnTestStart(const TestInfo& test_info) = 0; virtual void OnTestStart(const TestInfo& test_info) = 0;
// Called after the test ends. // Fired after the test ends.
virtual void OnTestEnd(const TestInfo& test_info) = 0; virtual void OnTestEnd(const TestInfo& test_info) = 0;
// Called after a failed assertion or a SUCCESS(). // Fired after a failed assertion or a SUCCESS().
virtual void OnNewTestPartResult(const TestPartResult& test_part_result) = 0; virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
}; };
// The convenience class for users who need to override just one or two // The convenience class for users who need to override just one or two
// methods and are not concerned that a possible change to a signature of // methods and are not concerned that a possible change to a signature of
// the methods they override will not be caught during the build. // the methods they override will not be caught during the build.
// For comments about each method please see the definition of
// UnitTestEventListenerInterface above.
class EmptyTestEventListener : public UnitTestEventListenerInterface { class EmptyTestEventListener : public UnitTestEventListenerInterface {
public: public:
// Called before the unit test starts. virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {}
virtual void OnUnitTestStart(const UnitTest& /*unit_test*/) {} virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {}
virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
// Called after the unit test ends. int /*iteration*/) {}
virtual void OnUnitTestEnd(const UnitTest& /*unit_test*/) {} virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
int /*iteration*/) {}
// Called before the test case starts. virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {}
virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {}
virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {}
virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {}
virtual void OnTestCaseStart(const TestCase& /*test_case*/) {} virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
// Called after the test case ends.
virtual void OnTestCaseEnd(const TestCase& /*test_case&*/) {}
// Called before the global set-up starts.
virtual void OnGlobalSetUpStart(const UnitTest& /*unit_test*/) {}
// Called after the global set-up ends.
virtual void OnGlobalSetUpEnd(const UnitTest& /*unit_test*/) {}
// Called before the global tear-down starts.
virtual void OnGlobalTearDownStart(const UnitTest& /*unit_test*/) {}
// Called after the global tear-down ends.
virtual void OnGlobalTearDownEnd(const UnitTest& /*unit_test*/) {}
// Called before the test starts.
virtual void OnTestStart(const TestInfo& /*test_info*/) {} virtual void OnTestStart(const TestInfo& /*test_info*/) {}
// Called after the test ends.
virtual void OnTestEnd(const TestInfo& /*test_info*/) {} virtual void OnTestEnd(const TestInfo& /*test_info*/) {}
virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {}
// Called after a failed assertion or a SUCCESS().
virtual void OnNewTestPartResult(const TestPartResult& /*test_part_result*/) {
}
}; };
// EventListeners lets users add listeners to track events in Google Test. // EventListeners lets users add listeners to track events in Google Test.
...@@ -932,7 +920,7 @@ class EventListeners { ...@@ -932,7 +920,7 @@ class EventListeners {
void SuppressEventForwarding(); void SuppressEventForwarding();
// The actual list of listeners. // The actual list of listeners.
internal::UnitTestEventsRepeater* repeater_; internal::TestEventRepeater* repeater_;
// Listener responsible for the standard result output. // Listener responsible for the standard result output.
UnitTestEventListenerInterface* default_result_printer_; UnitTestEventListenerInterface* default_result_printer_;
// Listener responsible for the creation of the XML output file. // Listener responsible for the creation of the XML output file.
......
samples/sample9_unittest.cc
...@@ -105,7 +105,7 @@ class TersePrinter : public EmptyTestEventListener { ...@@ -105,7 +105,7 @@ class TersePrinter : public EmptyTestEventListener {
} }
// Called after a failed assertion or a SUCCESS(). // Called after a failed assertion or a SUCCESS().
virtual void OnNewTestPartResult(const TestPartResult& test_part_result) { virtual void OnTestPartResult(const TestPartResult& test_part_result) {
fprintf(stdout, fprintf(stdout,
"%s in %s:%d\n%s\n", "%s in %s:%d\n%s\n",
test_part_result.failed() ? "*** Failure" : "Success", test_part_result.failed() ? "*** Failure" : "Success",
......
test/gtest-listener_test.cc
...@@ -73,50 +73,78 @@ class UnitTestAccessor { ...@@ -73,50 +73,78 @@ class UnitTestAccessor {
}; };
class EventRecordingListener : public UnitTestEventListenerInterface { class EventRecordingListener : public UnitTestEventListenerInterface {
public:
EventRecordingListener(const char* name) : name_(name) {}
protected: protected:
virtual void OnUnitTestStart(const UnitTest& /*unit_test*/) { virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnUnitTestStart")); g_events->PushBack(GetFullMethodName("OnTestProgramStart"));
}
virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
int iteration) {
Message message;
message << GetFullMethodName("OnTestIterationStart")
<< "(" << iteration << ")";
g_events->PushBack(message.GetString());
} }
virtual void OnGlobalSetUpStart(const UnitTest& /*unit_test*/) { virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalSetUpStart")); g_events->PushBack(GetFullMethodName("OnEnvironmentsSetUpStart"));
} }
virtual void OnGlobalSetUpEnd(const UnitTest& /*unit_test*/) { virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalSetUpEnd")); g_events->PushBack(GetFullMethodName("OnEnvironmentsSetUpEnd"));
} }
virtual void OnTestCaseStart(const TestCase& /*test_case*/) { virtual void OnTestCaseStart(const TestCase& /*test_case*/) {
g_events->PushBack(String("TestEventListener::OnTestCaseStart")); g_events->PushBack(GetFullMethodName("OnTestCaseStart"));
} }
virtual void OnTestStart(const TestInfo& /*test_info*/) { virtual void OnTestStart(const TestInfo& /*test_info*/) {
g_events->PushBack(String("TestEventListener::OnTestStart")); g_events->PushBack(GetFullMethodName("OnTestStart"));
} }
virtual void OnNewTestPartResult(const TestPartResult& /*test_part_result*/) { virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {
g_events->PushBack(String("TestEventListener::OnNewTestPartResult")); g_events->PushBack(GetFullMethodName("OnTestPartResult"));
} }
virtual void OnTestEnd(const TestInfo& /*test_info*/) { virtual void OnTestEnd(const TestInfo& /*test_info*/) {
g_events->PushBack(String("TestEventListener::OnTestEnd")); g_events->PushBack(GetFullMethodName("OnTestEnd"));
} }
virtual void OnTestCaseEnd(const TestCase& /*test_case*/) { virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {
g_events->PushBack(String("TestEventListener::OnTestCaseEnd")); g_events->PushBack(GetFullMethodName("OnTestCaseEnd"));
} }
virtual void OnGlobalTearDownStart(const UnitTest& /*unit_test*/) { virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalTearDownStart")); g_events->PushBack(GetFullMethodName("OnEnvironmentsTearDownStart"));
} }
virtual void OnGlobalTearDownEnd(const UnitTest& /*unit_test*/) { virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalTearDownEnd")); g_events->PushBack(GetFullMethodName("OnEnvironmentsTearDownEnd"));
} }
virtual void OnUnitTestEnd(const UnitTest& /*unit_test*/) { virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
g_events->PushBack(String("TestEventListener::OnUnitTestEnd")); int iteration) {
Message message;
message << GetFullMethodName("OnTestIterationEnd")
<< "(" << iteration << ")";
g_events->PushBack(message.GetString());
} }
virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {
g_events->PushBack(GetFullMethodName("OnTestProgramEnd"));
}
private:
String GetFullMethodName(const char* name) {
Message message;
message << name_ << "." << name;
return message.GetString();
}
String name_;
}; };
class EnvironmentInvocationCatcher : public Environment { class EnvironmentInvocationCatcher : public Environment {
...@@ -169,57 +197,132 @@ using ::testing::internal::EnvironmentInvocationCatcher; ...@@ -169,57 +197,132 @@ using ::testing::internal::EnvironmentInvocationCatcher;
using ::testing::internal::EventRecordingListener; using ::testing::internal::EventRecordingListener;
using ::testing::internal::UnitTestAccessor; using ::testing::internal::UnitTestAccessor;
void VerifyResults(const Vector<String>& data,
const char* const* expected_data,
int expected_data_size) {
const int actual_size = data.size();
// If the following assertion fails, a new entry will be appended to
// data. Hence we save data.size() first.
EXPECT_EQ(expected_data_size, actual_size);
// Compares the common prefix.
const int shorter_size = expected_data_size <= actual_size ?
expected_data_size : actual_size;
int i = 0;
for (; i < shorter_size; ++i) {
ASSERT_STREQ(expected_data[i], data.GetElement(i).c_str())
<< "at position " << i;
}
// Prints extra elements in the actual data.
for (; i < actual_size; ++i) {
printf(" Actual event #%d: %s\n", i, data.GetElement(i).c_str());
}
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
Vector<String> events; Vector<String> events;
g_events = &events; g_events = &events;
InitGoogleTest(&argc, argv); InitGoogleTest(&argc, argv);
UnitTestEventListenerInterface* listener = new EventRecordingListener; UnitTestAccessor::GetEventListeners().Append(
UnitTestAccessor::GetEventListeners().Append(listener); new EventRecordingListener("1st"));
UnitTestAccessor::GetEventListeners().Append(
new EventRecordingListener("2nd"));
AddGlobalTestEnvironment(new EnvironmentInvocationCatcher); AddGlobalTestEnvironment(new EnvironmentInvocationCatcher);
GTEST_CHECK_(events.size() == 0) GTEST_CHECK_(events.size() == 0)
<< "AddGlobalTestEnvironment should not generate any events itself."; << "AddGlobalTestEnvironment should not generate any events itself.";
::testing::GTEST_FLAG(repeat) = 2;
int ret_val = RUN_ALL_TESTS(); int ret_val = RUN_ALL_TESTS();
const char* const expected_events[] = { const char* const expected_events[] = {
"TestEventListener::OnUnitTestStart", "1st.OnTestProgramStart",
"TestEventListener::OnGlobalSetUpStart", "2nd.OnTestProgramStart",
"1st.OnTestIterationStart(0)",
"2nd.OnTestIterationStart(0)",
"1st.OnEnvironmentsSetUpStart",
"2nd.OnEnvironmentsSetUpStart",
"Environment::SetUp", "Environment::SetUp",
"TestEventListener::OnGlobalSetUpEnd", "2nd.OnEnvironmentsSetUpEnd",
"TestEventListener::OnTestCaseStart", "1st.OnEnvironmentsSetUpEnd",
"1st.OnTestCaseStart",
"2nd.OnTestCaseStart",
"ListenerTest::SetUpTestCase", "ListenerTest::SetUpTestCase",
"TestEventListener::OnTestStart", "1st.OnTestStart",
"2nd.OnTestStart",
"ListenerTest::SetUp", "ListenerTest::SetUp",
"ListenerTest::* Test Body", "ListenerTest::* Test Body",
"TestEventListener::OnNewTestPartResult", "1st.OnTestPartResult",
"2nd.OnTestPartResult",
"ListenerTest::TearDown", "ListenerTest::TearDown",
"TestEventListener::OnTestEnd", "2nd.OnTestEnd",
"TestEventListener::OnTestStart", "1st.OnTestEnd",
"1st.OnTestStart",
"2nd.OnTestStart",
"ListenerTest::SetUp", "ListenerTest::SetUp",
"ListenerTest::* Test Body", "ListenerTest::* Test Body",
"TestEventListener::OnNewTestPartResult", "1st.OnTestPartResult",
"2nd.OnTestPartResult",
"ListenerTest::TearDown", "ListenerTest::TearDown",
"TestEventListener::OnTestEnd", "2nd.OnTestEnd",
"1st.OnTestEnd",
"ListenerTest::TearDownTestCase", "ListenerTest::TearDownTestCase",
"TestEventListener::OnTestCaseEnd", "2nd.OnTestCaseEnd",
"TestEventListener::OnGlobalTearDownStart", "1st.OnTestCaseEnd",
"1st.OnEnvironmentsTearDownStart",
"2nd.OnEnvironmentsTearDownStart",
"Environment::TearDown", "Environment::TearDown",
"TestEventListener::OnGlobalTearDownEnd", "2nd.OnEnvironmentsTearDownEnd",
"TestEventListener::OnUnitTestEnd" "1st.OnEnvironmentsTearDownEnd",
"2nd.OnTestIterationEnd(0)",
"1st.OnTestIterationEnd(0)",
"1st.OnTestIterationStart(1)",
"2nd.OnTestIterationStart(1)",
"1st.OnEnvironmentsSetUpStart",
"2nd.OnEnvironmentsSetUpStart",
"Environment::SetUp",
"2nd.OnEnvironmentsSetUpEnd",
"1st.OnEnvironmentsSetUpEnd",
"1st.OnTestCaseStart",
"2nd.OnTestCaseStart",
"ListenerTest::SetUpTestCase",
"1st.OnTestStart",
"2nd.OnTestStart",
"ListenerTest::SetUp",
"ListenerTest::* Test Body",
"1st.OnTestPartResult",
"2nd.OnTestPartResult",
"ListenerTest::TearDown",
"2nd.OnTestEnd",
"1st.OnTestEnd",
"1st.OnTestStart",
"2nd.OnTestStart",
"ListenerTest::SetUp",
"ListenerTest::* Test Body",
"1st.OnTestPartResult",
"2nd.OnTestPartResult",
"ListenerTest::TearDown",
"2nd.OnTestEnd",
"1st.OnTestEnd",
"ListenerTest::TearDownTestCase",
"2nd.OnTestCaseEnd",
"1st.OnTestCaseEnd",
"1st.OnEnvironmentsTearDownStart",
"2nd.OnEnvironmentsTearDownStart",
"Environment::TearDown",
"2nd.OnEnvironmentsTearDownEnd",
"1st.OnEnvironmentsTearDownEnd",
"2nd.OnTestIterationEnd(1)",
"1st.OnTestIterationEnd(1)",
"2nd.OnTestProgramEnd",
"1st.OnTestProgramEnd"
}; };
const int kExpectedEventsSize = VerifyResults(events,
sizeof(expected_events)/sizeof(expected_events[0]); expected_events,
sizeof(expected_events)/sizeof(expected_events[0]));
// Cannot use ASSERT_EQ() here because it requires the scoping function to
// return void.
GTEST_CHECK_(events.size() == kExpectedEventsSize);
for (int i = 0; i < events.size(); ++i)
GTEST_CHECK_(String(events.GetElement(i)) == expected_events[i])
<< "At position " << i;
// We need to check manually for ad hoc test failures that happen after // We need to check manually for ad hoc test failures that happen after
// RUN_ALL_TESTS finishes. // RUN_ALL_TESTS finishes.
......
test/gtest_unittest.cc
...@@ -6215,7 +6215,7 @@ class TestListener : public EmptyTestEventListener { ...@@ -6215,7 +6215,7 @@ class TestListener : public EmptyTestEventListener {
} }
protected: protected:
virtual void OnUnitTestStart(const UnitTest& /*unit_test*/) { virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
if (on_start_counter_ != NULL) if (on_start_counter_ != NULL)
(*on_start_counter_)++; (*on_start_counter_)++;
} }
...@@ -6269,43 +6269,88 @@ TEST(EventListenersTest, Append) { ...@@ -6269,43 +6269,88 @@ TEST(EventListenersTest, Append) {
{ {
EventListeners listeners; EventListeners listeners;
listeners.Append(listener); listeners.Append(listener);
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(1, on_start_counter); EXPECT_EQ(1, on_start_counter);
} }
EXPECT_TRUE(is_destroyed); EXPECT_TRUE(is_destroyed);
} }
// Tests that listeners receive requests in the order they were appended to // Tests that listeners receive events in the order they were appended to
// the list. // the list, except for *End requests, which must be received in the reverse
// order.
class SequenceTestingListener : public EmptyTestEventListener { class SequenceTestingListener : public EmptyTestEventListener {
public: public:
SequenceTestingListener(Vector<const char*>* vector, const char* signature) SequenceTestingListener(Vector<String>* vector, const char* id)
: vector_(vector), signature_(signature) {} : vector_(vector), id_(id) {}
protected: protected:
virtual void OnUnitTestStart(const UnitTest& /*unit_test*/) { virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
if (vector_ != NULL) vector_->PushBack(GetEventDescription("OnTestProgramStart"));
vector_->PushBack(signature_); }
virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {
vector_->PushBack(GetEventDescription("OnTestProgramEnd"));
}
virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
int /*iteration*/) {
vector_->PushBack(GetEventDescription("OnTestIterationStart"));
}
virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
int /*iteration*/) {
vector_->PushBack(GetEventDescription("OnTestIterationEnd"));
} }
private: private:
Vector<const char*>* vector_; String GetEventDescription(const char* method) {
const char* const signature_; Message message;
message << id_ << "." << method;
return message.GetString();
}
Vector<String>* vector_;
const char* const id_;
}; };
TEST(EventListenerTest, AppendKeepsOrder) { TEST(EventListenerTest, AppendKeepsOrder) {
Vector<const char*> vec; Vector<String> vec;
EventListeners listeners; EventListeners listeners;
listeners.Append(new SequenceTestingListener(&vec, "0")); listeners.Append(new SequenceTestingListener(&vec, "1st"));
listeners.Append(new SequenceTestingListener(&vec, "1")); listeners.Append(new SequenceTestingListener(&vec, "2nd"));
listeners.Append(new SequenceTestingListener(&vec, "2")); listeners.Append(new SequenceTestingListener(&vec, "3rd"));
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart(
EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance());
ASSERT_EQ(3, vec.size());
EXPECT_STREQ("1st.OnTestProgramStart", vec.GetElement(0).c_str());
EXPECT_STREQ("2nd.OnTestProgramStart", vec.GetElement(1).c_str());
EXPECT_STREQ("3rd.OnTestProgramStart", vec.GetElement(2).c_str());
vec.Clear();
EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramEnd(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
ASSERT_EQ(3, vec.size()); ASSERT_EQ(3, vec.size());
ASSERT_STREQ("0", vec.GetElement(0)); EXPECT_STREQ("3rd.OnTestProgramEnd", vec.GetElement(0).c_str());
ASSERT_STREQ("1", vec.GetElement(1)); EXPECT_STREQ("2nd.OnTestProgramEnd", vec.GetElement(1).c_str());
ASSERT_STREQ("2", vec.GetElement(2)); EXPECT_STREQ("1st.OnTestProgramEnd", vec.GetElement(2).c_str());
vec.Clear();
EventListenersAccessor::GetRepeater(&listeners)->OnTestIterationStart(
*UnitTest::GetInstance(), 0);
ASSERT_EQ(3, vec.size());
EXPECT_STREQ("1st.OnTestIterationStart", vec.GetElement(0).c_str());
EXPECT_STREQ("2nd.OnTestIterationStart", vec.GetElement(1).c_str());
EXPECT_STREQ("3rd.OnTestIterationStart", vec.GetElement(2).c_str());
vec.Clear();
EventListenersAccessor::GetRepeater(&listeners)->OnTestIterationEnd(
*UnitTest::GetInstance(), 0);
ASSERT_EQ(3, vec.size());
EXPECT_STREQ("3rd.OnTestIterationEnd", vec.GetElement(0).c_str());
EXPECT_STREQ("2nd.OnTestIterationEnd", vec.GetElement(1).c_str());
EXPECT_STREQ("1st.OnTestIterationEnd", vec.GetElement(2).c_str());
} }
// Tests that a listener removed from an EventListeners list stops receiving // Tests that a listener removed from an EventListeners list stops receiving
...@@ -6321,7 +6366,7 @@ TEST(EventListenersTest, Release) { ...@@ -6321,7 +6366,7 @@ TEST(EventListenersTest, Release) {
EventListeners listeners; EventListeners listeners;
listeners.Append(listener); listeners.Append(listener);
EXPECT_EQ(listener, listeners.Release(listener)); EXPECT_EQ(listener, listeners.Release(listener));
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_TRUE(listeners.Release(listener) == NULL); EXPECT_TRUE(listeners.Release(listener) == NULL);
} }
...@@ -6340,7 +6385,7 @@ TEST(EventListenerTest, SuppressEventForwarding) { ...@@ -6340,7 +6385,7 @@ TEST(EventListenerTest, SuppressEventForwarding) {
ASSERT_TRUE(EventListenersAccessor::EventForwardingEnabled(listeners)); ASSERT_TRUE(EventListenersAccessor::EventForwardingEnabled(listeners));
EventListenersAccessor::SuppressEventForwarding(&listeners); EventListenersAccessor::SuppressEventForwarding(&listeners);
ASSERT_FALSE(EventListenersAccessor::EventForwardingEnabled(listeners)); ASSERT_FALSE(EventListenersAccessor::EventForwardingEnabled(listeners));
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(0, on_start_counter); EXPECT_EQ(0, on_start_counter);
} }
...@@ -6367,7 +6412,7 @@ TEST(EventListenerTest, default_result_printer) { ...@@ -6367,7 +6412,7 @@ TEST(EventListenerTest, default_result_printer) {
EXPECT_EQ(listener, listeners.default_result_printer()); EXPECT_EQ(listener, listeners.default_result_printer());
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(1, on_start_counter); EXPECT_EQ(1, on_start_counter);
...@@ -6381,7 +6426,7 @@ TEST(EventListenerTest, default_result_printer) { ...@@ -6381,7 +6426,7 @@ TEST(EventListenerTest, default_result_printer) {
// After broadcasting an event the counter is still the same, indicating // After broadcasting an event the counter is still the same, indicating
// the listener is not in the list anymore. // the listener is not in the list anymore.
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(1, on_start_counter); EXPECT_EQ(1, on_start_counter);
} }
...@@ -6404,7 +6449,7 @@ TEST(EventListenerTest, RemovingDefaultResultPrinterWorks) { ...@@ -6404,7 +6449,7 @@ TEST(EventListenerTest, RemovingDefaultResultPrinterWorks) {
EXPECT_FALSE(is_destroyed); EXPECT_FALSE(is_destroyed);
// Broadcasting events now should not affect default_result_printer. // Broadcasting events now should not affect default_result_printer.
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(0, on_start_counter); EXPECT_EQ(0, on_start_counter);
} }
...@@ -6426,7 +6471,7 @@ TEST(EventListenerTest, default_xml_generator) { ...@@ -6426,7 +6471,7 @@ TEST(EventListenerTest, default_xml_generator) {
EXPECT_EQ(listener, listeners.default_xml_generator()); EXPECT_EQ(listener, listeners.default_xml_generator());
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(1, on_start_counter); EXPECT_EQ(1, on_start_counter);
...@@ -6440,7 +6485,7 @@ TEST(EventListenerTest, default_xml_generator) { ...@@ -6440,7 +6485,7 @@ TEST(EventListenerTest, default_xml_generator) {
// After broadcasting an event the counter is still the same, indicating // After broadcasting an event the counter is still the same, indicating
// the listener is not in the list anymore. // the listener is not in the list anymore.
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(1, on_start_counter); EXPECT_EQ(1, on_start_counter);
} }
...@@ -6463,7 +6508,7 @@ TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) { ...@@ -6463,7 +6508,7 @@ TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) {
EXPECT_FALSE(is_destroyed); EXPECT_FALSE(is_destroyed);
// Broadcasting events now should not affect default_xml_generator. // Broadcasting events now should not affect default_xml_generator.
EventListenersAccessor::GetRepeater(&listeners)->OnUnitTestStart( EventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
*UnitTest::GetInstance()); *UnitTest::GetInstance());
EXPECT_EQ(0, on_start_counter); EXPECT_EQ(0, on_start_counter);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment