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

Merge pull request #17 from square/jw/path-bugs

Browse Source 
Fix bugs in getPath() with arrays of objects and arrays of arrays.
This commit is contained in:
Jesse Wilson
2014-12-22 16:10:02 -05:00
parent 67b3160d27 963e5939e9
commit b106c8610d
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
moshi/src/main/java/com/squareup/moshi/JsonReader.java
View File

@@ -353,6 +353,7 @@ public class JsonReader implements Closeable {
} }
if (p == PEEKED_END_ARRAY) { if (p == PEEKED_END_ARRAY) {
stackSize--; stackSize--;
pathIndices[stackSize - 1]++;
peeked = PEEKED_NONE; peeked = PEEKED_NONE;
} else { } else {
throw new IllegalStateException("Expected END_ARRAY but was " + peek() throw new IllegalStateException("Expected END_ARRAY but was " + peek()
@@ -390,6 +391,7 @@ public class JsonReader implements Closeable {
if (p == PEEKED_END_OBJECT) { if (p == PEEKED_END_OBJECT) {
stackSize--; stackSize--;
pathNames[stackSize] = null; // Free the last path name so that it can be garbage collected! pathNames[stackSize] = null; // Free the last path name so that it can be garbage collected!
pathIndices[stackSize - 1]++;
peeked = PEEKED_NONE; peeked = PEEKED_NONE;
} else { } else {
throw new IllegalStateException("Expected END_OBJECT but was " + peek() throw new IllegalStateException("Expected END_OBJECT but was " + peek()

48
moshi/src/test/java/com/squareup/moshi/JsonReaderPathTest.java
View File

@@ -47,19 +47,59 @@ public class JsonReaderPathTest {
reader.nextString(); reader.nextString();
assertEquals("$.a[5].c", reader.getPath()); assertEquals("$.a[5].c", reader.getPath());
reader.endObject(); reader.endObject();
assertEquals("$.a[5]", reader.getPath()); assertEquals("$.a[6]", reader.getPath());
reader.beginArray(); reader.beginArray();
assertEquals("$.a[5][0]", reader.getPath()); assertEquals("$.a[6][0]", reader.getPath());
reader.nextInt(); reader.nextInt();
assertEquals("$.a[5][1]", reader.getPath()); assertEquals("$.a[6][1]", reader.getPath());
reader.endArray(); reader.endArray();
assertEquals("$.a[5]", reader.getPath()); assertEquals("$.a[7]", reader.getPath());
reader.endArray(); reader.endArray();
assertEquals("$.a", reader.getPath()); assertEquals("$.a", reader.getPath());
reader.endObject(); reader.endObject();
assertEquals("$", reader.getPath()); assertEquals("$", reader.getPath());
} }
@Test public void arrayOfObjects() throws IOException {
JsonReader reader = new JsonReader("[{},{},{}]");
reader.beginArray();
assertEquals("$[0]", reader.getPath());
reader.beginObject();
assertEquals("$[0].", reader.getPath());
reader.endObject();
assertEquals("$[1]", reader.getPath());
reader.beginObject();
assertEquals("$[1].", reader.getPath());
reader.endObject();
assertEquals("$[2]", reader.getPath());
reader.beginObject();
assertEquals("$[2].", reader.getPath());
reader.endObject();
assertEquals("$[3]", reader.getPath());
reader.endArray();
assertEquals("$", reader.getPath());
}
@Test public void arrayOfArrays() throws IOException {
JsonReader reader = new JsonReader("[[],[],[]]");
reader.beginArray();
assertEquals("$[0]", reader.getPath());
reader.beginArray();
assertEquals("$[0][0]", reader.getPath());
reader.endArray();
assertEquals("$[1]", reader.getPath());
reader.beginArray();
assertEquals("$[1][0]", reader.getPath());
reader.endArray();
assertEquals("$[2]", reader.getPath());
reader.beginArray();
assertEquals("$[2][0]", reader.getPath());
reader.endArray();
assertEquals("$[3]", reader.getPath());
reader.endArray();
assertEquals("$", reader.getPath());
}
@Test public void objectPath() throws IOException { @Test public void objectPath() throws IOException {
JsonReader reader = new JsonReader("{\"a\":1,\"b\":2}"); JsonReader reader = new JsonReader("{\"a\":1,\"b\":2}");
assertEquals("$", reader.getPath()); assertEquals("$", reader.getPath());