TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2016 Edward d'Auvergne
|
|
|
|
*
|
|
|
|
* This file is part of the program FlightGear.
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef _FG_COMPILER_OUTPUTTER_HXX
|
|
|
|
#define _FG_COMPILER_OUTPUTTER_HXX
|
|
|
|
|
|
|
|
|
|
|
|
#include <cppunit/CompilerOutputter.h>
|
|
|
|
#include <cppunit/TestFailure.h>
|
|
|
|
|
|
|
|
#include "fgTestListener.hxx"
|
|
|
|
|
|
|
|
|
|
|
|
// The custom outputter for the FlightGear test suite.
|
|
|
|
class fgCompilerOutputter : public CppUnit::CompilerOutputter
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Constructor.
|
|
|
|
fgCompilerOutputter(CppUnit::TestResultCollector *result,
|
|
|
|
std::vector<TestIOCapt> *capt,
|
|
|
|
const clock_t *clock,
|
|
|
|
CppUnit::OStream &stream,
|
2018-03-12 10:43:24 +00:00
|
|
|
bool ctest = false,
|
2018-03-12 15:43:24 +00:00
|
|
|
bool debug = false,
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
const std::string &locationFormat = CPPUNIT_COMPILER_LOCATION_FORMAT)
|
|
|
|
: CppUnit::CompilerOutputter(result, stream, locationFormat)
|
|
|
|
, io_capt(capt)
|
|
|
|
, fg_result(result)
|
|
|
|
, fg_stream(stream)
|
|
|
|
, suite_timer(clock)
|
2018-03-12 10:43:24 +00:00
|
|
|
, ctest_output(ctest)
|
2018-03-12 15:43:24 +00:00
|
|
|
, debug(debug)
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a new class instance.
|
|
|
|
static fgCompilerOutputter *defaultOutputter(CppUnit::TestResultCollector *result, std::vector<TestIOCapt> *capt, const clock_t *clock, CppUnit::OStream &stream);
|
|
|
|
|
|
|
|
// Print a summary after a successful run of the test suite.
|
|
|
|
void printSuccess();
|
|
|
|
|
|
|
|
// Detailed printout after a failed run of the test suite.
|
|
|
|
void printFailureReport();
|
|
|
|
|
|
|
|
// Printout for each failed test.
|
|
|
|
void printFailureDetail(CppUnit::TestFailure *failure);
|
|
|
|
|
|
|
|
// Printout of the test suite stats.
|
|
|
|
void printSuiteStats();
|
|
|
|
|
|
|
|
// The captured IO for each failed test.
|
|
|
|
std::vector<TestIOCapt> *io_capt;
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Store copies of the base class objects.
|
|
|
|
CppUnit::TestResultCollector *fg_result;
|
|
|
|
CppUnit::OStream &fg_stream;
|
|
|
|
|
|
|
|
// The test suite time, in clock ticks.
|
|
|
|
const clock_t *suite_timer;
|
2016-02-12 18:42:20 +00:00
|
|
|
|
2018-03-12 10:43:24 +00:00
|
|
|
// Output control.
|
|
|
|
bool ctest_output;
|
2018-03-12 15:43:24 +00:00
|
|
|
bool debug;
|
2018-03-12 10:43:24 +00:00
|
|
|
|
2016-02-12 18:42:20 +00:00
|
|
|
// Simgear logstream IO printout.
|
|
|
|
void printIOStreamMessages(const char *heading, std::string messages, bool empty);
|
|
|
|
void printIOStreamMessages(const char *heading, std::string messages) {printIOStreamMessages(heading, messages, false);}
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _FG_COMPILER_OUTPUTTER_HXX
|