F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send PacketMetadataTest unit test output to Failure (), not std::cout.

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2007-08-02 14:56:04 +01:00
parent bd1932f12c
commit a905bf35a7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/packet-metadata.cc
View File

@@ -1377,13 +1377,13 @@ PacketMetadataTest::Check (const char *file, int line, std::list<int> expected)
{
if (m_headerError)
{
std::cout << "PacketMetadata header error. file=" << file
Failure () << "PacketMetadata header error. file=" << file
<< ", line=" << line << std::endl;
return false;
}
if (m_trailerError)
{
std::cout << "PacketMetadata trailer error. file=" << file
Failure () << "PacketMetadata trailer error. file=" << file
<< ", line=" << line << std::endl;
return false;
}
@@ -1403,20 +1403,20 @@ PacketMetadataTest::Check (const char *file, int line, std::list<int> expected)
}
return true;
error:
std::cout << "PacketMetadata error. file="<< file
Failure () << "PacketMetadata error. file="<< file
<< ", line=" << line << ", got:\"";
for (std::list<int>::iterator i = m_prints.begin ();
i != m_prints.end (); i++)
{
std::cout << *i << ", ";
Failure () << *i << ", ";
}
std::cout << "\", expected: \"";
Failure () << "\", expected: \"";
for (std::list<int>::iterator j = expected.begin ();
j != expected.end (); j++)
{
std::cout << *j << ", ";
Failure () << *j << ", ";
}
std::cout << "\"" << std::endl;
Failure () << "\"" << std::endl;
return false;
}
@@ -1436,7 +1436,7 @@ PacketMetadataTest::CheckHistory (Packet p, const char *file, int line, uint32_t
va_end (ap);
m_printer.PrintForward ();
p.Print (std::cerr, m_printer);
p.Print (Failure (), m_printer);
bool ok = Check (file, line, expected);
CleanupPrints ();
if (!ok)
@@ -1445,7 +1445,7 @@ PacketMetadataTest::CheckHistory (Packet p, const char *file, int line, uint32_t
}
m_printer.PrintBackward ();
p.Print (std::cerr, m_printer);
p.Print (Failure (), m_printer);
expected.reverse ();
ok = Check (file, line, expected);
CleanupPrints ();