diff options
| author | Dean Michael Berris <dberris@google.com> | 2018-08-31 18:56:42 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2018-08-31 18:56:42 +0000 |
| commit | 7975e274da4a2f9fd2591a44ae9f3791eab0a821 (patch) | |
| tree | 00da8007b111764292d5d50d2fd356ce69ba316d /llvm/unittests/XRay/FDRTraceWriterTest.cpp | |
| parent | 3fc4cbfe1060c9e12183ac67cd426760c4436291 (diff) | |
| download | bcm5719-llvm-7975e274da4a2f9fd2591a44ae9f3791eab0a821.tar.gz bcm5719-llvm-7975e274da4a2f9fd2591a44ae9f3791eab0a821.zip | |
[XRay] Improve test matching granularity (NFC)
Simplify matchers for unittest to better isolate which differences there
are that we're finding in failures.
llvm-svn: 341237
Diffstat (limited to 'llvm/unittests/XRay/FDRTraceWriterTest.cpp')
| -rw-r--r-- | llvm/unittests/XRay/FDRTraceWriterTest.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/llvm/unittests/XRay/FDRTraceWriterTest.cpp b/llvm/unittests/XRay/FDRTraceWriterTest.cpp index cbe6346eaf5..215a2d21d11 100644 --- a/llvm/unittests/XRay/FDRTraceWriterTest.cpp +++ b/llvm/unittests/XRay/FDRTraceWriterTest.cpp @@ -63,16 +63,17 @@ TEST(FDRTraceWriterTest, WriteToStringBufferVersion3) { auto &Trace = TraceOrErr.get(); ASSERT_THAT(Trace, Not(IsEmpty())); - ASSERT_THAT( - Trace, - ElementsAre(AllOf(Field(&XRayRecord::FuncId, Eq(1)), - Field(&XRayRecord::TId, Eq(1u)), - Field(&XRayRecord::CPU, Eq(1u)), - Field(&XRayRecord::Type, Eq(RecordTypes::ENTER))), - AllOf(Field(&XRayRecord::FuncId, Eq(1)), - Field(&XRayRecord::TId, Eq(1u)), - Field(&XRayRecord::CPU, Eq(1u)), - Field(&XRayRecord::Type, Eq(RecordTypes::EXIT))))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::FuncId, Eq(1)), + Field(&XRayRecord::FuncId, Eq(1)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::TId, Eq(1u)), + Field(&XRayRecord::TId, Eq(1u)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::PId, Eq(1u)), + Field(&XRayRecord::PId, Eq(1u)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::CPU, Eq(1u)), + Field(&XRayRecord::CPU, Eq(1u)))); + ASSERT_THAT(Trace, + ElementsAre(Field(&XRayRecord::Type, Eq(RecordTypes::ENTER)), + Field(&XRayRecord::Type, Eq(RecordTypes::EXIT)))); } // This version is almost exactly the same as above, except writing version 2 @@ -107,16 +108,15 @@ TEST(FDRTraceWriterTest, WriteToStringBufferVersion2) { auto &Trace = TraceOrErr.get(); ASSERT_THAT(Trace, Not(IsEmpty())); - ASSERT_THAT( - Trace, - ElementsAre(AllOf(Field(&XRayRecord::FuncId, Eq(1)), - Field(&XRayRecord::TId, Eq(1u)), - Field(&XRayRecord::CPU, Eq(1u)), - Field(&XRayRecord::Type, Eq(RecordTypes::ENTER))), - AllOf(Field(&XRayRecord::FuncId, Eq(1)), - Field(&XRayRecord::TId, Eq(1u)), - Field(&XRayRecord::CPU, Eq(1u)), - Field(&XRayRecord::Type, Eq(RecordTypes::EXIT))))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::FuncId, Eq(1)), + Field(&XRayRecord::FuncId, Eq(1)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::TId, Eq(1u)), + Field(&XRayRecord::TId, Eq(1u)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::CPU, Eq(1u)), + Field(&XRayRecord::CPU, Eq(1u)))); + ASSERT_THAT(Trace, + ElementsAre(Field(&XRayRecord::Type, Eq(RecordTypes::ENTER)), + Field(&XRayRecord::Type, Eq(RecordTypes::EXIT)))); } // This covers version 1 of the log, without a BufferExtents record but has an @@ -167,16 +167,16 @@ TEST(FDRTraceWriterTest, WriteToStringBufferVersion1) { auto &Trace = TraceOrErr.get(); ASSERT_THAT(Trace, Not(IsEmpty())); - ASSERT_THAT( - Trace, - ElementsAre(AllOf(Field(&XRayRecord::FuncId, Eq(1)), - Field(&XRayRecord::TId, Eq(1u)), - Field(&XRayRecord::CPU, Eq(1u)), - Field(&XRayRecord::Type, Eq(RecordTypes::ENTER))), - AllOf(Field(&XRayRecord::FuncId, Eq(1)), - Field(&XRayRecord::TId, Eq(1u)), - Field(&XRayRecord::CPU, Eq(1u)), - Field(&XRayRecord::Type, Eq(RecordTypes::EXIT))))); + ASSERT_THAT(Trace, Not(IsEmpty())); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::FuncId, Eq(1)), + Field(&XRayRecord::FuncId, Eq(1)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::TId, Eq(1u)), + Field(&XRayRecord::TId, Eq(1u)))); + ASSERT_THAT(Trace, ElementsAre(Field(&XRayRecord::CPU, Eq(1u)), + Field(&XRayRecord::CPU, Eq(1u)))); + ASSERT_THAT(Trace, + ElementsAre(Field(&XRayRecord::Type, Eq(RecordTypes::ENTER)), + Field(&XRayRecord::Type, Eq(RecordTypes::EXIT)))); } } // namespace |
