Lots of changes:

* changes the XML report format to match JUnit/Ant's.
* improves file path handling.
* allows the user to disable RTTI using the GTEST_HAS_RTTI macro.
* makes the code compile with -Wswitch-enum.

1 files changed, 24 insertions, 0 deletions

diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc
index abc337f3..a9281cec 100644
--- a/test/gtest_unittest.cc
+++ b/test/gtest_unittest.cc
@@ -58,10 +58,12 @@
 
 namespace testing {
 namespace internal {
+const char* FormatTimeInMillisAsSeconds(TimeInMillis ms);
 bool ParseInt32Flag(const char* str, const char* flag, Int32* value);
 }  // namespace internal
 }  // namespace testing
 
+using testing::internal::FormatTimeInMillisAsSeconds;
 using testing::internal::ParseInt32Flag;
 
 namespace testing {
@@ -118,6 +120,28 @@ using testing::internal::WideStringToUtf8;
 // This line tests that we can define tests in an unnamed namespace.
 namespace {
 
+// Tests FormatTimeInMillisAsSeconds().
+
+TEST(FormatTimeInMillisAsSecondsTest, FormatsZero) {
+  EXPECT_STREQ("0", FormatTimeInMillisAsSeconds(0));
+}
+
+TEST(FormatTimeInMillisAsSecondsTest, FormatsPositiveNumber) {
+  EXPECT_STREQ("0.003", FormatTimeInMillisAsSeconds(3));
+  EXPECT_STREQ("0.01", FormatTimeInMillisAsSeconds(10));
+  EXPECT_STREQ("0.2", FormatTimeInMillisAsSeconds(200));
+  EXPECT_STREQ("1.2", FormatTimeInMillisAsSeconds(1200));
+  EXPECT_STREQ("3", FormatTimeInMillisAsSeconds(3000));
+}
+
+TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) {
+  EXPECT_STREQ("-0.003", FormatTimeInMillisAsSeconds(-3));
+  EXPECT_STREQ("-0.01", FormatTimeInMillisAsSeconds(-10));
+  EXPECT_STREQ("-0.2", FormatTimeInMillisAsSeconds(-200));
+  EXPECT_STREQ("-1.2", FormatTimeInMillisAsSeconds(-1200));
+  EXPECT_STREQ("-3", FormatTimeInMillisAsSeconds(-3000));
+}
+
 #ifndef __SYMBIAN32__
 // NULL testing does not work with Symbian compilers.