replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Dean Michael Berris 2018-08-31 18:56:42 +00:00
parent 3fc4cbfe10
commit 7975e274da
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
llvm/unittests/XRay/FDRTraceWriterTest.cpp
View File

@ -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