fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make error message for dangling names consistent. (#501)

Browse Source
This commit is contained in:
Eric Cochran
2018-04-15 19:48:32 -07:00
committed by GitHub
parent 3a2367036c
commit b860b6da4f
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
moshi/src/main/java/com/squareup/moshi/JsonValueWriter.java
View File

@@ -76,9 +76,12 @@ final class JsonValueWriter extends JsonWriter {
} }
@Override public JsonWriter endObject() throws IOException { @Override public JsonWriter endObject() throws IOException {
if (peekScope() != EMPTY_OBJECT || deferredName != null) { if (peekScope() != EMPTY_OBJECT) {
throw new IllegalStateException("Nesting problem."); throw new IllegalStateException("Nesting problem.");
} }
if (deferredName != null) {
throw new IllegalStateException("Dangling name: " + deferredName);
}
promoteValueToName = false; promoteValueToName = false;
stackSize--; stackSize--;
stack[stackSize] = null; stack[stackSize] = null;

12
moshi/src/test/java/com/squareup/moshi/JsonWriterTest.java
View File

@@ -604,4 +604,16 @@ public final class JsonWriterTest {
assertThat(expected).hasMessage("Nesting problem."); assertThat(expected).hasMessage("Nesting problem.");
} }
} }
@Test public void danglingNameFails() throws IOException {
JsonWriter writer = factory.newWriter();
writer.beginObject();
writer.name("a");
try {
writer.endObject();
fail();
} catch (IllegalStateException expected) {
assertThat(expected).hasMessage("Dangling name: a");
}
}
} }