summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/gtest.h3
-rw-r--r--googletest/src/gtest.cc10
-rw-r--r--googletest/test/gtest_xml_outfile2_test_.cc4
3 files changed, 9 insertions, 8 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 7963e8c..55fdc60 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -50,6 +50,7 @@
#define GOOGLETEST_INCLUDE_GTEST_GTEST_H_
#include <cstddef>
+#include <cstdint>
#include <limits>
#include <memory>
#include <ostream>
@@ -296,7 +297,7 @@ class GTEST_API_ Test {
// SetUp/TearDown method of Environment objects registered with Google
// Test) will be output as attributes of the <testsuites> element.
static void RecordProperty(const std::string& key, const std::string& value);
- static void RecordProperty(const std::string& key, int value);
+ static void RecordProperty(const std::string& key, int64_t value);
protected:
// Creates a Test object.
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 3859452..2276d07 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -2444,12 +2444,10 @@ void Test::TearDown() {}
void Test::RecordProperty(const std::string& key, const std::string& value) {
UnitTest::GetInstance()->RecordProperty(key, value);
}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, int value) {
- Message value_message;
- value_message << value;
- RecordProperty(key, value_message.GetString().c_str());
+// We do not define a customary serialization except for integers,
+// but other values could be logged in this way.
+void Test::RecordProperty(const std::string& key, int64_t value) {
+ RecordProperty(key, (Message() << value).GetString());
}
namespace internal {
diff --git a/googletest/test/gtest_xml_outfile2_test_.cc b/googletest/test/gtest_xml_outfile2_test_.cc
index f9a2a6e..f743b31 100644
--- a/googletest/test/gtest_xml_outfile2_test_.cc
+++ b/googletest/test/gtest_xml_outfile2_test_.cc
@@ -39,5 +39,7 @@ class PropertyTwo : public testing::Test {
};
TEST_F(PropertyTwo, TestSomeProperties) {
- RecordProperty("TestSomeProperty", 2);
+ // Validate we can write an unsigned size_t as a property
+ size_t prop_two = 2;
+ RecordProperty("TestSomeProperty", prop_two);
}