From f07bc467a39950fcbd547330a960de346354c96b Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 23 Aug 2017 09:14:54 +0200 Subject: [PATCH] Clang: Tests: Improve DocumentSuspenderResumer * Use IsEmpty() * Set up proper error printer Change-Id: I9d4750f8e69e0660ece33015d439c796077d1727 Reviewed-by: Marco Bubke --- .../clangbackend/ipcsource/clangjobrequest.cpp | 10 ++++++++++ .../clangbackend/ipcsource/clangjobrequest.h | 3 +++ .../clangdocumentsuspenderresumer-test.cpp | 17 ++++++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/tools/clangbackend/ipcsource/clangjobrequest.cpp b/src/tools/clangbackend/ipcsource/clangjobrequest.cpp index 1f6bf17ee87..65f6cc14001 100644 --- a/src/tools/clangbackend/ipcsource/clangjobrequest.cpp +++ b/src/tools/clangbackend/ipcsource/clangjobrequest.cpp @@ -68,6 +68,16 @@ QDebug operator<<(QDebug debug, JobRequest::Type type) return debug; } +std::ostream &operator<<(std::ostream &os, JobRequest::Type type) +{ + return os << JobRequestTypeToText(type); +} + +std::ostream &operator<<(std::ostream &os, PreferredTranslationUnit preferredTranslationUnit) +{ + return os << preferredTranslationUnitToText(preferredTranslationUnit); +} + QDebug operator<<(QDebug debug, const JobRequest &jobRequest) { debug.nospace() << "Job<" diff --git a/src/tools/clangbackend/ipcsource/clangjobrequest.h b/src/tools/clangbackend/ipcsource/clangjobrequest.h index b9bbf0a3beb..33b68cb60f3 100644 --- a/src/tools/clangbackend/ipcsource/clangjobrequest.h +++ b/src/tools/clangbackend/ipcsource/clangjobrequest.h @@ -114,5 +114,8 @@ public: using JobRequests = QVector; QDebug operator<<(QDebug debug, const JobRequest &jobRequest); +std::ostream &operator<<(std::ostream &os, JobRequest::Type type); +std::ostream &operator<<(std::ostream &os, PreferredTranslationUnit preferredTranslationUnit); + } // namespace ClangBackEnd diff --git a/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp b/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp index 823a84482ca..8c1954410fb 100644 --- a/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp +++ b/tests/unit/unittest/clangdocumentsuspenderresumer-test.cpp @@ -62,6 +62,17 @@ bool operator==(const SuspendResumeJobsEntry &a, const SuspendResumeJobsEntry &b && a.preferredTranslationUnit == b.preferredTranslationUnit; } +std::ostream &operator<<(std::ostream &os, const SuspendResumeJobsEntry &entry) +{ + os << "SuspendResumeJobsEntry(" + << entry.document.filePath() << ", " + << entry.jobRequestType << ", " + << entry.preferredTranslationUnit + << ")"; + + return os; +} + } // ClangBackEnd namespace { @@ -196,7 +207,7 @@ TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForVisible) const SuspendResumeJobs jobs = createSuspendResumeJobs(/*hotDocumentsSize=*/ 0); - ASSERT_THAT(jobs, ContainerEq(SuspendResumeJobs())); + ASSERT_THAT(jobs, IsEmpty()); } TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForUnparsed) @@ -207,7 +218,7 @@ TEST_F(DocumentSuspenderResumer, DoNotCreateSuspendJobForUnparsed) const SuspendResumeJobs jobs = createSuspendResumeJobs(/*hotDocumentsSize=*/ 0); - ASSERT_THAT(jobs, ContainerEq(SuspendResumeJobs())); + ASSERT_THAT(jobs, IsEmpty()); } TEST_F(DocumentSuspenderResumer, CreateSuspendJobsForDocumentWithSupportiveTranslationUnit) @@ -249,7 +260,7 @@ TEST_F(DocumentSuspenderResumer, DoNotCreateResumeJobForInvisible) const SuspendResumeJobs jobs = createSuspendResumeJobs(/*hotDocumentsSize=*/ 0); - ASSERT_THAT(jobs, ContainerEq(SuspendResumeJobs())); + ASSERT_THAT(jobs, IsEmpty()); } TEST_F(DocumentSuspenderResumer, CreateResumeJobsForDocumentWithSupportiveTranslationUnit)