Adds type_param and value_param as <testcase> attributes to the XML

report; also removes the comment() and test_case_comment() fields of
TestInfo.  Proposed and initally implemented by Joey Oravec.
Re-implemented by Vlad Losev.

1 files changed, 34 insertions, 35 deletions

diff --git a/test/gtest-unittest-api_test.cc b/test/gtest-unittest-api_test.cc
index ed5dea83..f53e2744 100644
--- a/test/gtest-unittest-api_test.cc
+++ b/test/gtest-unittest-api_test.cc
@@ -37,6 +37,7 @@
 
 #include <string.h>  // For strcmp.
 #include <algorithm>
+#include <sstream>
 
 using ::testing::InitGoogleTest;
 
@@ -103,12 +104,6 @@ TYPED_TEST(TestCaseWithCommentTest, Dummy) {}
 
 const int kTypedTestCases = 1;
 const int kTypedTests = 1;
-
-String GetExpectedTestCaseComment() {
-  Message comment;
-  comment << "TypeParam = " << GetTypeName<int>().c_str();
-  return comment.GetString();
-}
 #else
 const int kTypedTestCases = 0;
 const int kTypedTests = 0;
@@ -143,12 +138,19 @@ TEST(ApiTest, UnitTestImmutableAccessorsWork) {
   RecordProperty("key", "value");
 }
 
+AssertionResult IsNull(const char* str) {
+  if (str != NULL) {
+    return testing::AssertionFailure() << "argument is " << str;
+  }
+  return AssertionSuccess();
+}
+
 TEST(ApiTest, TestCaseImmutableAccessorsWork) {
   const TestCase* test_case = UnitTestHelper::FindTestCase("ApiTest");
   ASSERT_TRUE(test_case != NULL);
 
   EXPECT_STREQ("ApiTest", test_case->name());
-  EXPECT_STREQ("", test_case->comment());
+  EXPECT_TRUE(IsNull(test_case->type_param()));
   EXPECT_TRUE(test_case->should_run());
   EXPECT_EQ(1, test_case->disabled_test_count());
   EXPECT_EQ(3, test_case->test_to_run_count());
@@ -158,26 +160,26 @@ TEST(ApiTest, TestCaseImmutableAccessorsWork) {
 
   EXPECT_STREQ("DISABLED_Dummy1", tests[0]->name());
   EXPECT_STREQ("ApiTest", tests[0]->test_case_name());
-  EXPECT_STREQ("", tests[0]->comment());
-  EXPECT_STREQ("", tests[0]->test_case_comment());
+  EXPECT_TRUE(IsNull(tests[0]->value_param()));
+  EXPECT_TRUE(IsNull(tests[0]->type_param()));
   EXPECT_FALSE(tests[0]->should_run());
 
   EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name());
   EXPECT_STREQ("ApiTest", tests[1]->test_case_name());
-  EXPECT_STREQ("", tests[1]->comment());
-  EXPECT_STREQ("", tests[1]->test_case_comment());
+  EXPECT_TRUE(IsNull(tests[1]->value_param()));
+  EXPECT_TRUE(IsNull(tests[1]->type_param()));
   EXPECT_TRUE(tests[1]->should_run());
 
   EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name());
   EXPECT_STREQ("ApiTest", tests[2]->test_case_name());
-  EXPECT_STREQ("", tests[2]->comment());
-  EXPECT_STREQ("", tests[2]->test_case_comment());
+  EXPECT_TRUE(IsNull(tests[2]->value_param()));
+  EXPECT_TRUE(IsNull(tests[2]->type_param()));
   EXPECT_TRUE(tests[2]->should_run());
 
   EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name());
   EXPECT_STREQ("ApiTest", tests[3]->test_case_name());
-  EXPECT_STREQ("", tests[3]->comment());
-  EXPECT_STREQ("", tests[3]->test_case_comment());
+  EXPECT_TRUE(IsNull(tests[3]->value_param()));
+  EXPECT_TRUE(IsNull(tests[3]->type_param()));
   EXPECT_TRUE(tests[3]->should_run());
 
   delete[] tests;
@@ -188,7 +190,7 @@ TEST(ApiTest, TestCaseImmutableAccessorsWork) {
   ASSERT_TRUE(test_case != NULL);
 
   EXPECT_STREQ("TestCaseWithCommentTest/0", test_case->name());
-  EXPECT_STREQ(GetExpectedTestCaseComment().c_str(), test_case->comment());
+  EXPECT_STREQ(GetTypeName<int>().c_str(), test_case->type_param());
   EXPECT_TRUE(test_case->should_run());
   EXPECT_EQ(0, test_case->disabled_test_count());
   EXPECT_EQ(1, test_case->test_to_run_count());
@@ -198,9 +200,8 @@ TEST(ApiTest, TestCaseImmutableAccessorsWork) {
 
   EXPECT_STREQ("Dummy", tests[0]->name());
   EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name());
-  EXPECT_STREQ("", tests[0]->comment());
-  EXPECT_STREQ(GetExpectedTestCaseComment().c_str(),
-               tests[0]->test_case_comment());
+  EXPECT_TRUE(IsNull(tests[0]->value_param()));
+  EXPECT_STREQ(GetTypeName<int>().c_str(), tests[0]->type_param());
   EXPECT_TRUE(tests[0]->should_run());
 
   delete[] tests;
@@ -212,7 +213,7 @@ TEST(ApiTest, TestCaseDisabledAccessorsWork) {
   ASSERT_TRUE(test_case != NULL);
 
   EXPECT_STREQ("DISABLED_Test", test_case->name());
-  EXPECT_STREQ("", test_case->comment());
+  EXPECT_TRUE(IsNull(test_case->type_param()));
   EXPECT_FALSE(test_case->should_run());
   EXPECT_EQ(1, test_case->disabled_test_count());
   EXPECT_EQ(0, test_case->test_to_run_count());
@@ -221,8 +222,8 @@ TEST(ApiTest, TestCaseDisabledAccessorsWork) {
   const TestInfo* const test_info = test_case->GetTestInfo(0);
   EXPECT_STREQ("Dummy2", test_info->name());
   EXPECT_STREQ("DISABLED_Test", test_info->test_case_name());
-  EXPECT_STREQ("", test_info->comment());
-  EXPECT_STREQ("", test_info->test_case_comment());
+  EXPECT_TRUE(IsNull(test_info->value_param()));
+  EXPECT_TRUE(IsNull(test_info->type_param()));
   EXPECT_FALSE(test_info->should_run());
 }
 
@@ -247,7 +248,7 @@ class FinalSuccessChecker : public Environment {
     const TestCase** const test_cases = UnitTestHelper::GetSortedTestCases();
 
     EXPECT_STREQ("ApiTest", test_cases[0]->name());
-    EXPECT_STREQ("", test_cases[0]->comment());
+    EXPECT_TRUE(IsNull(test_cases[0]->type_param()));
     EXPECT_TRUE(test_cases[0]->should_run());
     EXPECT_EQ(1, test_cases[0]->disabled_test_count());
     ASSERT_EQ(4, test_cases[0]->total_test_count());
@@ -257,7 +258,7 @@ class FinalSuccessChecker : public Environment {
     EXPECT_FALSE(test_cases[0]->Failed());
 
     EXPECT_STREQ("DISABLED_Test", test_cases[1]->name());
-    EXPECT_STREQ("", test_cases[1]->comment());
+    EXPECT_TRUE(IsNull(test_cases[1]->type_param()));
     EXPECT_FALSE(test_cases[1]->should_run());
     EXPECT_EQ(1, test_cases[1]->disabled_test_count());
     ASSERT_EQ(1, test_cases[1]->total_test_count());
@@ -266,8 +267,7 @@ class FinalSuccessChecker : public Environment {
 
 #if GTEST_HAS_TYPED_TEST
     EXPECT_STREQ("TestCaseWithCommentTest/0", test_cases[2]->name());
-    EXPECT_STREQ(GetExpectedTestCaseComment().c_str(),
-                 test_cases[2]->comment());
+    EXPECT_STREQ(GetTypeName<int>().c_str(), test_cases[2]->type_param());
     EXPECT_TRUE(test_cases[2]->should_run());
     EXPECT_EQ(0, test_cases[2]->disabled_test_count());
     ASSERT_EQ(1, test_cases[2]->total_test_count());
@@ -285,24 +285,24 @@ class FinalSuccessChecker : public Environment {
 
     EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name());
     EXPECT_STREQ("ApiTest", tests[1]->test_case_name());
-    EXPECT_STREQ("", tests[1]->comment());
-    EXPECT_STREQ("", tests[1]->test_case_comment());
+    EXPECT_TRUE(IsNull(tests[1]->value_param()));
+    EXPECT_TRUE(IsNull(tests[1]->type_param()));
     EXPECT_TRUE(tests[1]->should_run());
     EXPECT_TRUE(tests[1]->result()->Passed());
     EXPECT_EQ(0, tests[1]->result()->test_property_count());
 
     EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name());
     EXPECT_STREQ("ApiTest", tests[2]->test_case_name());
-    EXPECT_STREQ("", tests[2]->comment());
-    EXPECT_STREQ("", tests[2]->test_case_comment());
+    EXPECT_TRUE(IsNull(tests[2]->value_param()));
+    EXPECT_TRUE(IsNull(tests[2]->type_param()));
     EXPECT_TRUE(tests[2]->should_run());
     EXPECT_TRUE(tests[2]->result()->Passed());
     EXPECT_EQ(0, tests[2]->result()->test_property_count());
 
     EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name());
     EXPECT_STREQ("ApiTest", tests[3]->test_case_name());
-    EXPECT_STREQ("", tests[3]->comment());
-    EXPECT_STREQ("", tests[3]->test_case_comment());
+    EXPECT_TRUE(IsNull(tests[3]->value_param()));
+    EXPECT_TRUE(IsNull(tests[3]->type_param()));
     EXPECT_TRUE(tests[3]->should_run());
     EXPECT_TRUE(tests[3]->result()->Passed());
     EXPECT_EQ(1, tests[3]->result()->test_property_count());
@@ -318,9 +318,8 @@ class FinalSuccessChecker : public Environment {
 
     EXPECT_STREQ("Dummy", tests[0]->name());
     EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name());
-    EXPECT_STREQ("", tests[0]->comment());
-    EXPECT_STREQ(GetExpectedTestCaseComment().c_str(),
-                 tests[0]->test_case_comment());
+    EXPECT_TRUE(IsNull(tests[0]->value_param()));
+    EXPECT_STREQ(GetTypeName<int>().c_str(), tests[0]->type_param());
     EXPECT_TRUE(tests[0]->should_run());
     EXPECT_TRUE(tests[0]->result()->Passed());
     EXPECT_EQ(0, tests[0]->result()->test_property_count());