External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update the code and test cases

Browse Source
This commit is contained in:
dota17 2020-06-29 10:28:57 +08:00
parent 78392f5b4d
commit 38db3274cb
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/emitter.cpp
View File

@ -775,8 +775,7 @@ const char* Emitter::ComputeFullBoolName(bool b) const {
} }
const char* Emitter::ComputeNullName() const { const char* Emitter::ComputeNullName() const {
const EMITTER_MANIP nullFmt = m_pState->GetNullFormat(); switch (m_pState->GetNullFormat()) {
switch (nullFmt) {
case LowerNull: case LowerNull:
return "null"; return "null";
case UpperNull: case UpperNull:
@ -784,8 +783,9 @@ const char* Emitter::ComputeNullName() const {
case CamelNull: case CamelNull:
return "Null"; return "Null";
case TildeNull: case TildeNull:
default:
return "~"; return "~";
default: // fallthrough
break;
} }
} }
@ -912,8 +912,7 @@ Emitter& Emitter::Write(const _Null& /*null*/) {
PrepareNode(EmitterNodeType::Scalar); PrepareNode(EmitterNodeType::Scalar);
const char* name = ComputeNullName(); m_stream << ComputeNullName();
m_stream << name;
StartedScalar(); StartedScalar();

18
test/integration/emitter_test.cpp
View File

@ -1048,7 +1048,7 @@ TEST_F(EmitterTest, BoolFormatting) {
} }
TEST_F(EmitterTest, GlobalNullFormatting) { TEST_F(EmitterTest, GlobalNullFormatting) {
out << BeginSeq; out << Flow << BeginSeq;
out.SetNullFormat(LowerNull); out.SetNullFormat(LowerNull);
out << Null; out << Null;
out.SetNullFormat(UpperNull); out.SetNullFormat(UpperNull);
@ -1058,24 +1058,32 @@ TEST_F(EmitterTest, GlobalNullFormatting) {
out.SetNullFormat(TildeNull); out.SetNullFormat(TildeNull);
out << Null; out << Null;
out << EndSeq; out << EndSeq;
ExpectEmit("- null\n- NULL\n- Null\n- ~"); ExpectEmit("[null, NULL, Null, ~]");
} }
TEST_F(EmitterTest, NullFormatting) { TEST_F(EmitterTest, NullFormatting) {
out << BeginSeq; out << Flow << BeginSeq;
out << LowerNull << Null; out << LowerNull << Null;
out << UpperNull << Null; out << UpperNull << Null;
out << CamelNull << Null; out << CamelNull << Null;
out << TildeNull << Null; out << TildeNull << Null;
out << EndSeq; out << EndSeq;
ExpectEmit("- null\n- NULL\n- Null\n- ~"); ExpectEmit("[null, NULL, Null, ~]");
} }
TEST_F(EmitterTest, NullFormattingOnNode) { TEST_F(EmitterTest, NullFormattingOnNode) {
Node n(Load("null")); Node n(Load("null"));
out << Flow << BeginSeq;
out.SetNullFormat(LowerNull);
out << n;
out.SetNullFormat(UpperNull); out.SetNullFormat(UpperNull);
out << n; out << n;
ExpectEmit("NULL"); out.SetNullFormat(CamelNull);
out << n;
out.SetNullFormat(TildeNull);
out << n;
out << EndSeq;
ExpectEmit("[null, NULL, Null, ~]");
} }
// TODO: Fix this test. // TODO: Fix this test.