Fixed formatting for spec tests

This commit is contained in:
Jesse Beder
2012-05-20 01:19:27 -05:00
parent 030f48583a
commit 16fd111a6b

View File

@@ -7,6 +7,12 @@
#define YAML_ASSERT(cond) do { if(!(cond)) return " Assert failed: " #cond; } while(false) #define YAML_ASSERT(cond) do { if(!(cond)) return " Assert failed: " #cond; } while(false)
namespace Test { namespace Test {
std::string Quote(const std::string& text) {
YAML::Emitter out;
out << YAML::DoubleQuoted << text;
return out.c_str();
}
struct Event { struct Event {
enum Type { DocStart, DocEnd, Null, Alias, Scalar, SeqStart, SeqEnd, MapStart, MapEnd }; enum Type { DocStart, DocEnd, Null, Alias, Scalar, SeqStart, SeqEnd, MapStart, MapEnd };
@@ -31,13 +37,13 @@ namespace Test {
case Alias: case Alias:
return out << "Alias(" << anchor << ")"; return out << "Alias(" << anchor << ")";
case Scalar: case Scalar:
return out << "Scalar(" << tag << ", " << anchor << ", " << scalar << ")"; return out << "Scalar(" << Quote(tag) << ", " << anchor << ", " << Quote(scalar) << ")";
case SeqStart: case SeqStart:
return out << "SeqStart(" << tag << ", " << anchor << ")"; return out << "SeqStart(" << Quote(tag) << ", " << anchor << ")";
case SeqEnd: case SeqEnd:
return out << "SeqEnd"; return out << "SeqEnd";
case MapStart: case MapStart:
return out << "MapStart(" << tag << ", " << anchor << ")"; return out << "MapStart(" << Quote(tag) << ", " << anchor << ")";
case MapEnd: case MapEnd:
return out << "MapEnd"; return out << "MapEnd";
} }
@@ -110,7 +116,7 @@ namespace Test {
if(i >= m_expectedEvents.size()) { if(i >= m_expectedEvents.size()) {
std::stringstream out; std::stringstream out;
for(std::size_t j=0;j<i;j++) { for(std::size_t j=0;j<i;j++) {
out << m_expectedEvents[j] << "\n"; out << " " << m_expectedEvents[j] << "\n";
} }
out << " EXPECTED: (no event expected)\n"; out << " EXPECTED: (no event expected)\n";
out << " ACTUAL : " << m_actualEvents[i] << "\n"; out << " ACTUAL : " << m_actualEvents[i] << "\n";
@@ -120,7 +126,7 @@ namespace Test {
if(i >= m_actualEvents.size()) { if(i >= m_actualEvents.size()) {
std::stringstream out; std::stringstream out;
for(std::size_t j=0;j<i;j++) { for(std::size_t j=0;j<i;j++) {
out << m_expectedEvents[j] << "\n"; out << " " << m_expectedEvents[j] << "\n";
} }
out << " EXPECTED: " << m_expectedEvents[i] << "\n"; out << " EXPECTED: " << m_expectedEvents[i] << "\n";
out << " ACTUAL : (no event recorded)\n"; out << " ACTUAL : (no event recorded)\n";
@@ -130,7 +136,7 @@ namespace Test {
if(m_expectedEvents[i] != m_actualEvents[i]) { if(m_expectedEvents[i] != m_actualEvents[i]) {
std::stringstream out; std::stringstream out;
for(std::size_t j=0;j<i;j++) { for(std::size_t j=0;j<i;j++) {
out << m_expectedEvents[j] << "\n"; out << " " << m_expectedEvents[j] << "\n";
} }
out << " EXPECTED: " << m_expectedEvents[i] << "\n"; out << " EXPECTED: " << m_expectedEvents[i] << "\n";
out << " ACTUAL : " << m_actualEvents[i] << "\n"; out << " ACTUAL : " << m_actualEvents[i] << "\n";