8000 Compare char* with char* to fix OS X build with clang. · unittest-cpp/unittest-cpp@aeaae3e · GitHub
[go: up one dir, main page]
Skip to content

Commit aeaae3e

Browse files
Pete Johnspjohnmeyer
Pete Johns
authored and
pjohnmeyer
committed
Compare char* with char* to fix OS X build with clang.
1 parent 7e99532 commit aeaae3e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎src/tests/TestDeferredTestReporter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ TEST_FIXTURE(DeferredTestReporterFixture, ReportTestStartCapturesTestNameAndSuit
5757
reporter.ReportTestStart(details);
5858

5959
DeferredTestResult const& result = reporter.GetResults().at(0);
60-
CHECK_EQUAL(testName.c_str(), result.testName);
61-
CHECK_EQUAL(testSuite.c_str(), result.suiteName);
60+
CHECK_EQUAL(testName.c_str(), result.testName.c_str());
61+
CHECK_EQUAL(testSuite.c_str(), result.suiteName.c_str());
6262
}
6363

6464
TEST_FIXTURE(DeferredTestReporterFixture, ReportTestEndCapturesTestTime)
@@ -80,7 +80,7 @@ TEST_FIXTURE(DeferredTestReporterFixture, ReportFailureSavesFailureDetails)
8080

8181
DeferredTestResult const& result = reporter.GetResults().at(0);
8282
CHECK(result.failed == true);
83-
CHECK_EQUAL(fileName.c_str(), result.failureFile);
83+
CHECK_EQUAL(fileName.c_str(), result.failureFile.c_str());
8484
}
8585

8686
TEST_FIXTURE(DeferredTestReporterFixture, ReportFailureSavesFailureDetailsForMultipleFailures)

‎src/tests/TestXmlTestReporter.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TEST_FIXTURE(XmlTestReporterFixture, MultipleCharactersAreEscaped)
5252
"</test>"
5353
"</unittest-results>";
5454

55-
CHECK_EQUAL(expected, output.str());
55+
CHECK_EQUAL(expected, output.str().c_str());
5656
}
5757

5858
TEST_FIXTURE(XmlTestReporterFixture, OutputIsCachedUntilReportSummaryIsCalled)
@@ -77,7 +77,7 @@ TEST_FIXTURE(XmlTestReporterFixture, EmptyReportSummaryFormat)
7777
"<unittest-results tests=\"0\" failedtests=\"0\" failures=\"0\" time=\"0.1\">"
7878
"</unittest-results>";
7979

80-
CHECK_EQUAL(expected, output.str());
80+
CHECK_EQUAL(expected, output.str().c_str());
8181
}
8282

8383
TEST_FIXTURE(XmlTestReporterFixture, SingleSuccessfulTestReportSummaryFormat)
@@ -93,7 +93,7 @@ TEST_FIXTURE(XmlTestReporterFixture, SingleSuccessfulTestReportSummaryFormat)
9393
"<test suite=\"DefaultSuite\" name=\"TestName\" time=\"0\"/>"
9494
"</unittest-results>";
9595

96-
CHECK_EQUAL(expected, output.str());
96+
CHECK_EQUAL(expected, output.str().c_str());
9797
}
9898

9999
TEST_FIXTURE(XmlTestReporterFixture, SingleFailedTestReportSummaryFormat)
@@ -112,7 +112,7 @@ TEST_FIXTURE(XmlTestReporterFixture, SingleFailedTestReportSummaryFormat)
112112
"</test>"
113113
"</unittest-results>";
114114

115-
CHECK_EQUAL(expected, output.str());
115+
CHECK_EQUAL(expected, output.str().c_str());
116116
}
117117

118118
TEST_FIXTURE(XmlTestReporterFixture, FailureMessageIsXMLEscaped)
@@ -132,7 +132,7 @@ TEST_FIXTURE(XmlTestReporterFixture, FailureMessageIsXMLEscaped)
132132
"</test>"
133133
"</unittest-results>";
134134

135-
CHECK_EQUAL(expected, output.str());
135+
CHECK_EQUAL(expected, output.str().c_str());
136136
}
137137

138138
TEST_FIXTURE(XmlTestReporterFixture, OneFailureAndOneSuccess)
@@ -156,7 +156,7 @@ TEST_FIXTURE(XmlTestReporterFixture, OneFailureAndOneSuccess)
156156
"<test suite=\"suite\" name=\"SucceededTest\" time=\"1\"/>"
157157
"</unittest-results>";
158158

159-
CHECK_EQUAL(expected, output.str());
159+
CHECK_EQUAL(expected, output.str().c_str());
160160
}
161161

162162
TEST_FIXTURE(XmlTestReporterFixture, MultipleFailures)
@@ -180,7 +180,7 @@ TEST_FIXTURE(XmlTestReporterFixture, MultipleFailures)
180180
"</test>"
181181
"</unittest-results>";
182182

183-
CHECK_EQUAL(expected, output.str());
183+
CHECK_EQUAL(expected, output.str().c_str());
184184
}
185185

186186
}

0 commit comments

Comments
 (0)
0