From 1bcc35cbcf3a40125465ab64881edfa9c6247b68 Mon Sep 17 00:00:00 2001 From: redkale Date: Wed, 9 Oct 2024 23:18:31 +0800 Subject: [PATCH] json --- .../org/redkale/convert/json/JsonReader.java | 2 +- .../redkale/test/convert/json/TinyTest.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/redkale/convert/json/JsonReader.java b/src/main/java/org/redkale/convert/json/JsonReader.java index d3c0f4b14..64da69e68 100644 --- a/src/main/java/org/redkale/convert/json/JsonReader.java +++ b/src/main/java/org/redkale/convert/json/JsonReader.java @@ -162,7 +162,7 @@ public class JsonReader extends Reader { */ protected char nextChar() { int p = ++this.position; - if (p >= limit) { + if (p > limit) { return 0; } return this.text[p]; diff --git a/src/test/java/org/redkale/test/convert/json/TinyTest.java b/src/test/java/org/redkale/test/convert/json/TinyTest.java index db5ad953c..04f014576 100644 --- a/src/test/java/org/redkale/test/convert/json/TinyTest.java +++ b/src/test/java/org/redkale/test/convert/json/TinyTest.java @@ -12,38 +12,38 @@ import org.redkale.convert.json.*; /** @author zhangjx */ public class TinyTest { - private boolean main; - public static void main(String[] args) throws Throwable { TinyTest test = new TinyTest(); - test.main = true; - test.run(); + test.run1(); + test.run2(); } @Test - public void run() throws Exception { + public void run1() throws Exception { TinyRecord record = new TinyRecord(); record.id = 5; { JsonFactory factory = JsonFactory.create().withFeatures(Convert.FEATURE_TINY); JsonConvert convert = factory.getConvert(); String json = "{\"id\":5}"; - if (!main) { - Assertions.assertEquals(json, convert.convertTo(record)); - } + Assertions.assertEquals(json, convert.convertTo(record)); System.out.println(convert.convertTo(record)); } { JsonFactory factory = JsonFactory.create().withFeatures(0); JsonConvert convert = factory.getConvert(); String json = "{\"id\":5,\"name\":\"\"}"; - if (!main) { - Assertions.assertEquals(json, convert.convertTo(record)); - } + Assertions.assertEquals(json, convert.convertTo(record)); System.out.println(convert.convertTo(record)); } } + @Test + public void run2() throws Exception { + String json = "{\"id\":5,\"name\":\"\", \"status\":2}"; + JsonConvert.root().convertFrom(TinyRecord.class, json); + } + public static class TinyRecord { public String name = "";