Skip to content

Commit

Permalink
Merge pull request cpputest#1760 from viordash/very-verbose
Browse files Browse the repository at this point in the history
support very verbose in CompositeTestOutput
  • Loading branch information
basvodde authored Oct 13, 2023
2 parents 484e098 + 5e2b1bd commit eccbc21
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
2 changes: 2 additions & 0 deletions include/CppUTest/TestOutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ class CompositeTestOutput : public TestOutput
virtual void printFailure(const TestFailure& failure) _override;
virtual void setProgressIndicator(const char*) _override;

virtual void printVeryVerbose(const char*) _override;

virtual void flush() _override;

protected:
Expand Down
2 changes: 1 addition & 1 deletion src/CppUTest/CommandLineTestRunner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ bool CommandLineTestRunner::parseArguments(TestPlugin* plugin)

if (arguments_->isJUnitOutput()) {
output_= createJUnitOutput(arguments_->getPackageName());
if (arguments_->isVerbose())
if (arguments_->isVerbose() || arguments_->isVeryVerbose())
output_ = createCompositeOutput(output_, createConsoleOutput());
} else if (arguments_->isTeamCityOutput()) {
output_ = createTeamCityOutput();
Expand Down
6 changes: 6 additions & 0 deletions src/CppUTest/TestOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,12 @@ void CompositeTestOutput::setProgressIndicator(const char* indicator)
if (outputTwo_) outputTwo_->setProgressIndicator(indicator);
}

void CompositeTestOutput::printVeryVerbose(const char* str)
{
if (outputOne_) outputOne_->printVeryVerbose(str);
if (outputTwo_) outputTwo_->printVeryVerbose(str);
}

void CompositeTestOutput::flush()
{
if (outputOne_) outputOne_->flush();
Expand Down
8 changes: 8 additions & 0 deletions tests/CppUTest/TestOutputTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,3 +470,11 @@ TEST(CompositeTestOutput, deletePreviousInstanceWhenSettingNew)

// CHECK NO MEMORY LEAKS
}

TEST(CompositeTestOutput, printVeryVerbose)
{
compositeOutput.verbose(TestOutput::level_veryVerbose);
compositeOutput.printVeryVerbose("very-verbose");
STRCMP_EQUAL("very-verbose", output1->getOutput().asCharString());
STRCMP_EQUAL("very-verbose", output2->getOutput().asCharString());
}

0 comments on commit eccbc21

Please sign in to comment.