Simplify showing colour values in failing unit tests
Use wxColour::GetAsString() instead of reimplementing it in the test.
This commit is contained in:
parent
02eb3a26b6
commit
5b9b817aaa
2 changed files with 1 additions and 42 deletions
|
|
@ -11,35 +11,9 @@
|
||||||
|
|
||||||
#include "asserthelper.h"
|
#include "asserthelper.h"
|
||||||
|
|
||||||
namespace wxTestPrivate
|
|
||||||
{
|
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& os, const ColourChannel& cc)
|
|
||||||
{
|
|
||||||
os.width(2);
|
|
||||||
os.fill('0');
|
|
||||||
os << static_cast<int>(cc.m_value);
|
|
||||||
return os;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& os, const wxColour& c)
|
std::ostream& operator<<(std::ostream& os, const wxColour& c)
|
||||||
{
|
{
|
||||||
using wxTestPrivate::ColourChannel;
|
os << c.GetAsString(wxC2S_HTML_SYNTAX);
|
||||||
|
|
||||||
os << std::hex << std::noshowbase
|
|
||||||
<< "("
|
|
||||||
<< ColourChannel(c.Red()) << ", "
|
|
||||||
<< ColourChannel(c.Green()) << ", "
|
|
||||||
<< ColourChannel(c.Blue());
|
|
||||||
|
|
||||||
if ( const unsigned char a = c.Alpha() )
|
|
||||||
{
|
|
||||||
os << ", " << ColourChannel(a);
|
|
||||||
}
|
|
||||||
|
|
||||||
os << ")";
|
|
||||||
|
|
||||||
return os;
|
return os;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,21 +14,6 @@
|
||||||
#include "wx/gdicmn.h"
|
#include "wx/gdicmn.h"
|
||||||
#include "wx/font.h"
|
#include "wx/font.h"
|
||||||
|
|
||||||
namespace wxTestPrivate
|
|
||||||
{
|
|
||||||
// by default colour components values are output incorrectly because they
|
|
||||||
// are unsigned chars, define a small helper struct which formats them in
|
|
||||||
// a more useful way
|
|
||||||
struct ColourChannel
|
|
||||||
{
|
|
||||||
ColourChannel(unsigned char value) : m_value(value) { }
|
|
||||||
|
|
||||||
unsigned char m_value;
|
|
||||||
};
|
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& os, const ColourChannel& cc);
|
|
||||||
} // wxTestPrivate namespace
|
|
||||||
|
|
||||||
// Operators used to show the values of the corresponding types when comparing
|
// Operators used to show the values of the corresponding types when comparing
|
||||||
// them in the unit tests fails.
|
// them in the unit tests fails.
|
||||||
std::ostream& operator<<(std::ostream& os, const wxColour& c);
|
std::ostream& operator<<(std::ostream& os, const wxColour& c);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue