using ::testing::TestInfo;
using ::testing::TestPartResult;
using ::testing::UnitTest;
-using ::testing::internal::String;
// Used by tests to register their events.
-std::vector<String>* g_events = NULL;
+std::vector<std::string>* g_events = NULL;
namespace testing {
namespace internal {
class EventRecordingListener : public TestEventListener {
public:
- EventRecordingListener(const char* name) : name_(name) {}
+ explicit EventRecordingListener(const char* name) : name_(name) {}
protected:
virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
}
private:
- String GetFullMethodName(const char* name) {
- Message message;
- message << name_ << "." << name;
- return message.GetString();
+ std::string GetFullMethodName(const char* name) {
+ return name_ + "." + name;
}
- String name_;
+ std::string name_;
};
class EnvironmentInvocationCatcher : public Environment {
protected:
virtual void SetUp() {
- g_events->push_back(String("Environment::SetUp"));
+ g_events->push_back("Environment::SetUp");
}
virtual void TearDown() {
- g_events->push_back(String("Environment::TearDown"));
+ g_events->push_back("Environment::TearDown");
}
};
class ListenerTest : public Test {
protected:
static void SetUpTestCase() {
- g_events->push_back(String("ListenerTest::SetUpTestCase"));
+ g_events->push_back("ListenerTest::SetUpTestCase");
}
static void TearDownTestCase() {
- g_events->push_back(String("ListenerTest::TearDownTestCase"));
+ g_events->push_back("ListenerTest::TearDownTestCase");
}
virtual void SetUp() {
- g_events->push_back(String("ListenerTest::SetUp"));
+ g_events->push_back("ListenerTest::SetUp");
}
virtual void TearDown() {
- g_events->push_back(String("ListenerTest::TearDown"));
+ g_events->push_back("ListenerTest::TearDown");
}
};
TEST_F(ListenerTest, DoesFoo) {
// Test execution order within a test case is not guaranteed so we are not
// recording the test name.
- g_events->push_back(String("ListenerTest::* Test Body"));
+ g_events->push_back("ListenerTest::* Test Body");
SUCCEED(); // Triggers OnTestPartResult.
}
TEST_F(ListenerTest, DoesBar) {
- g_events->push_back(String("ListenerTest::* Test Body"));
+ g_events->push_back("ListenerTest::* Test Body");
SUCCEED(); // Triggers OnTestPartResult.
}
using ::testing::internal::EnvironmentInvocationCatcher;
using ::testing::internal::EventRecordingListener;
-void VerifyResults(const std::vector<String>& data,
+void VerifyResults(const std::vector<std::string>& data,
const char* const* expected_data,
- int expected_data_size) {
- const int actual_size = data.size();
+ size_t expected_data_size) {
+ const size_t 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 ?
+ const size_t shorter_size = expected_data_size <= actual_size ?
expected_data_size : actual_size;
- int i = 0;
+ size_t i = 0;
for (; i < shorter_size; ++i) {
ASSERT_STREQ(expected_data[i], data[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[i].c_str());
+ printf(" Actual event #%lu: %s\n",
+ static_cast<unsigned long>(i), data[i].c_str());
}
}
int main(int argc, char **argv) {
- std::vector<String> events;
+ std::vector<std::string> events;
g_events = &events;
InitGoogleTest(&argc, argv);