1 files changed, 30 insertions, 14 deletions

diff --git a/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc b/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc
index b30a331c4..c0036aaef 100644
--- a/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc
+++ b/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc
@@ -45,26 +45,43 @@ using ::testing::UnitTest;
 using ::testing::Test;
 using ::testing::Values;
 
-class SuccessfulTest : public Test {};
+class SuccessfulTest : public Test {
+};
 
 TEST_F(SuccessfulTest, Succeeds) {
   SUCCEED() << "This is a success.";
   ASSERT_EQ(1, 1);
 }
 
-class FailedTest : public Test {};
+class FailedTest : public Test {
+};
 
-TEST_F(FailedTest, Fails) { ASSERT_EQ(1, 2); }
+TEST_F(FailedTest, Fails) {
+  ASSERT_EQ(1, 2);
+}
 
-class DisabledTest : public Test {};
+class DisabledTest : public Test {
+};
 
 TEST_F(DisabledTest, DISABLED_test_not_run) {
   FAIL() << "Unexpected failure: Disabled test should not be run";
 }
 
-class SkippedTest : public Test {};
+class SkippedTest : public Test {
+};
+
+TEST_F(SkippedTest, Skipped) {
+  GTEST_SKIP();
+}
 
-TEST_F(SkippedTest, Skipped) { GTEST_SKIP(); }
+TEST_F(SkippedTest, SkippedWithMessage) {
+  GTEST_SKIP() << "It is good practice to tell why you skip a test.";
+}
+
+TEST_F(SkippedTest, SkippedAfterFailure) {
+  EXPECT_EQ(1, 2);
+  GTEST_SKIP() << "It is good practice to tell why you skip a test.";
+}
 
 TEST(MixedResultTest, Succeeds) {
   EXPECT_EQ(1, 1);
@@ -99,7 +116,9 @@ class PropertyRecordingTest : public Test {
   }
 };
 
-TEST_F(PropertyRecordingTest, OneProperty) { RecordProperty("key_1", "1"); }
+TEST_F(PropertyRecordingTest, OneProperty) {
+  RecordProperty("key_1", "1");
+}
 
 TEST_F(PropertyRecordingTest, IntValuedProperty) {
   RecordProperty("key_int", 1);
@@ -116,7 +135,9 @@ TEST_F(PropertyRecordingTest, TwoValuesForOneKeyUsesLastValue) {
   RecordProperty("key_1", "2");
 }
 
-TEST(NoFixtureTest, RecordProperty) { RecordProperty("key", "1"); }
+TEST(NoFixtureTest, RecordProperty) {
+  RecordProperty("key", "1");
+}
 
 void ExternalUtilityThatCallsRecordProperty(const std::string& key, int value) {
   testing::Test::RecordProperty(key, value);
@@ -142,17 +163,13 @@ TEST_P(ValueParamTest, HasValueParamAttribute) {}
 TEST_P(ValueParamTest, AnotherTestThatHasValueParamAttribute) {}
 INSTANTIATE_TEST_SUITE_P(Single, ValueParamTest, Values(33, 42));
 
-#if GTEST_HAS_TYPED_TEST
 // Verifies that the type parameter name is output in the 'type_param'
 // XML attribute for typed tests.
-template <typename T>
-class TypedTest : public Test {};
+template <typename T> class TypedTest : public Test {};
 typedef testing::Types<int, long> TypedTestTypes;
 TYPED_TEST_SUITE(TypedTest, TypedTestTypes);
 TYPED_TEST(TypedTest, HasTypeParamAttribute) {}
-#endif
 
-#if GTEST_HAS_TYPED_TEST_P
 // Verifies that the type parameter name is output in the 'type_param'
 // XML attribute for type-parameterized tests.
 template <typename T>
@@ -163,7 +180,6 @@ REGISTER_TYPED_TEST_SUITE_P(TypeParameterizedTestSuite, HasTypeParamAttribute);
 typedef testing::Types<int, long> TypeParameterizedTestSuiteTypes;  // NOLINT
 INSTANTIATE_TYPED_TEST_SUITE_P(Single, TypeParameterizedTestSuite,
                                TypeParameterizedTestSuiteTypes);
-#endif
 
 int main(int argc, char** argv) {
   InitGoogleTest(&argc, argv);