fix: resolve all 14 PR review comments — strengthen test assertions and add JSONArray auto-parse

halibobo1205 · claude · halibobo1205 · commit 1bdc631ee733 · 2026-04-04T16:14:08.000+08:00
- Add string auto-parse fallback in JSONArray.getJSONObject(int) and getJSONArray(int) for Fastjson compatibility (same fix as JSONObject) - Use non-default ENERGY enum in 4 resource tests and assert parsed value (FreezeBalanceV2, UnFreezeBalanceV2, DelegateResource, UnDelegateResource) - Add token ID assertions in Exchange/Market servlet tests (ExchangeCreate, ExchangeWithdraw, ExchangeInject, ExchangeTransaction, MarketSellAsset) - Add description/url byte field assertions in UpdateAssetServletTest - Add verify+argThat with owner/name/energyLimit in DeployContractServletTest - Fix TestPojo to support Jackson deserialization (add no-arg constructor and @Setter) so testGetObjectPojo actually validates POJO path - Add fuzz tests for JSONArray index-based stringified JSON auto-parse Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/common/src/main/java/org/tron/json/JSONArray.java b/common/src/main/java/org/tron/json/JSONArray.java
@@ -71,10 +71,14 @@ public JSONObject getJSONObject(int index) {
     if (child.isNull()) {
       return null;
     }
-    if (!child.isObject()) {
-      throw new JSONException("Element at index " + index + " is not an object");
+    if (child.isObject()) {
+      return new JSONObject((ObjectNode) child);
     }
-    return new JSONObject((ObjectNode) child);
+    // Fastjson auto-parses stringified JSON objects
+    if (child.isTextual()) {
+      return JSON.parseObject(child.asText());
+    }
+    throw new JSONException("Element at index " + index + " is not an object");
   }
 
   public JSONArray getJSONArray(int index) {
@@ -83,10 +87,14 @@ public JSONArray getJSONArray(int index) {
     if (child.isNull()) {
       return null;
     }
-    if (!child.isArray()) {
-      throw new JSONException("Element at index " + index + " is not an array");
+    if (child.isArray()) {
+      return new JSONArray((ArrayNode) child);
+    }
+    // Fastjson auto-parses stringified JSON arrays
+    if (child.isTextual()) {
+      return JSON.parseArray(child.asText());
     }
-    return new JSONArray((ArrayNode) child);
+    throw new JSONException("Element at index " + index + " is not an array");
   }
 
   public String getString(int index) {
diff --git a/framework/src/test/java/org/tron/core/services/http/DelegateResourceServletTest.java b/framework/src/test/java/org/tron/core/services/http/DelegateResourceServletTest.java
@@ -14,6 +14,7 @@
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.protos.Protocol;
 import org.tron.protos.contract.BalanceContract;
+import org.tron.protos.contract.Common.ResourceCode;
 
 public class DelegateResourceServletTest extends BaseHttpTest {
 
@@ -37,7 +38,7 @@ public void testDelegateResource() throws Exception {
         + "\"owner_address\": \"" + ownerAddr + "\","
         + "\"receiver_address\": \"" + receiverAddr + "\","
         + "\"balance\": 1000000,"
-        + "\"resource\": \"BANDWIDTH\""
+        + "\"resource\": \"ENERGY\""
         + "}";
     MockHttpServletRequest request = postRequest(jsonParam);
 
@@ -49,7 +50,9 @@ && addressEquals(((BalanceContract.DelegateResourceContract) c)
                 .getOwnerAddress(), ownerAddr)
             && addressEquals(((BalanceContract.DelegateResourceContract) c)
                 .getReceiverAddress(), receiverAddr)
-            && ((BalanceContract.DelegateResourceContract) c).getBalance() == 1000000),
+            && ((BalanceContract.DelegateResourceContract) c).getBalance() == 1000000
+            && ((BalanceContract.DelegateResourceContract) c)
+                .getResource() == ResourceCode.ENERGY),
         eq(Protocol.Transaction.Contract.ContractType.DelegateResourceContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/DeployContractServletTest.java b/framework/src/test/java/org/tron/core/services/http/DeployContractServletTest.java
@@ -1,17 +1,18 @@
 package org.tron.core.services.http;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.protos.Protocol;
+import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
 
 public class DeployContractServletTest extends BaseHttpTest {
 
@@ -44,6 +45,14 @@ public void testDeployContract() throws Exception {
     MockHttpServletResponse response = newResponse();
     servlet.doPost(request, response);
     assertEquals(200, response.getStatus());
+    verify(wallet).createTransactionCapsule(
+        argThat(c -> c instanceof CreateSmartContract
+            && addressEquals(((CreateSmartContract) c).getOwnerAddress(),
+                "4199357684bc659f5166046b56c95a0e99f1265cd1")
+            && ((CreateSmartContract) c).getNewContract().getName().equals("TestContract")
+            && ((CreateSmartContract) c).getNewContract()
+                .getOriginEnergyLimit() == 10000000),
+        eq(Protocol.Transaction.Contract.ContractType.CreateSmartContract));
     assertTransactionResponse(response);
   }
 }
diff --git a/framework/src/test/java/org/tron/core/services/http/ExchangeCreateServletTest.java b/framework/src/test/java/org/tron/core/services/http/ExchangeCreateServletTest.java
@@ -47,7 +47,9 @@ public void testExchangeCreate() throws Exception {
             && addressEquals(((ExchangeCreateContract) c)
                 .getOwnerAddress(), ownerAddr)
             && ((ExchangeCreateContract) c).getFirstTokenBalance() == 100
-            && ((ExchangeCreateContract) c).getSecondTokenBalance() == 200),
+            && ((ExchangeCreateContract) c).getSecondTokenBalance() == 200
+            && !((ExchangeCreateContract) c).getFirstTokenId().isEmpty()
+            && !((ExchangeCreateContract) c).getSecondTokenId().isEmpty()),
         eq(ContractType.ExchangeCreateContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/ExchangeInjectServletTest.java b/framework/src/test/java/org/tron/core/services/http/ExchangeInjectServletTest.java
@@ -47,7 +47,8 @@ public void testExchangeInject() throws Exception {
             && addressEquals(((ExchangeContract.ExchangeInjectContract) c)
                 .getOwnerAddress(), ownerAddr)
             && ((ExchangeContract.ExchangeInjectContract) c).getExchangeId() == 1
-            && ((ExchangeContract.ExchangeInjectContract) c).getQuant() == 100),
+            && ((ExchangeContract.ExchangeInjectContract) c).getQuant() == 100
+            && !((ExchangeContract.ExchangeInjectContract) c).getTokenId().isEmpty()),
         eq(Protocol.Transaction.Contract.ContractType.ExchangeInjectContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/ExchangeTransactionServletTest.java b/framework/src/test/java/org/tron/core/services/http/ExchangeTransactionServletTest.java
@@ -49,7 +49,8 @@ && addressEquals(((ExchangeContract.ExchangeTransactionContract) c)
                 .getOwnerAddress(), ownerAddr)
             && ((ExchangeContract.ExchangeTransactionContract) c).getExchangeId() == 1
             && ((ExchangeContract.ExchangeTransactionContract) c).getQuant() == 100
-            && ((ExchangeContract.ExchangeTransactionContract) c).getExpected() == 10),
+            && ((ExchangeContract.ExchangeTransactionContract) c).getExpected() == 10
+            && !((ExchangeContract.ExchangeTransactionContract) c).getTokenId().isEmpty()),
         eq(Protocol.Transaction.Contract.ContractType.ExchangeTransactionContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/ExchangeWithdrawServletTest.java b/framework/src/test/java/org/tron/core/services/http/ExchangeWithdrawServletTest.java
@@ -47,7 +47,8 @@ public void testExchangeWithdraw() throws Exception {
             && addressEquals(((ExchangeContract.ExchangeWithdrawContract) c)
                 .getOwnerAddress(), ownerAddr)
             && ((ExchangeContract.ExchangeWithdrawContract) c).getExchangeId() == 1
-            && ((ExchangeContract.ExchangeWithdrawContract) c).getQuant() == 50),
+            && ((ExchangeContract.ExchangeWithdrawContract) c).getQuant() == 50
+            && !((ExchangeContract.ExchangeWithdrawContract) c).getTokenId().isEmpty()),
         eq(Protocol.Transaction.Contract.ContractType.ExchangeWithdrawContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/FreezeBalanceV2ServletTest.java b/framework/src/test/java/org/tron/core/services/http/FreezeBalanceV2ServletTest.java
@@ -14,6 +14,7 @@
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.protos.Protocol;
 import org.tron.protos.contract.BalanceContract;
+import org.tron.protos.contract.Common.ResourceCode;
 
 public class FreezeBalanceV2ServletTest extends BaseHttpTest {
 
@@ -35,7 +36,7 @@ public void testFreezeBalanceV2() throws Exception {
     String jsonParam = "{"
         + "\"owner_address\": \"" + ownerAddr + "\","
         + "\"frozen_balance\": 1000000,"
-        + "\"resource\": \"BANDWIDTH\""
+        + "\"resource\": \"ENERGY\""
         + "}";
     MockHttpServletRequest request = postRequest(jsonParam);
 
@@ -45,7 +46,9 @@ public void testFreezeBalanceV2() throws Exception {
         argThat(c -> c instanceof BalanceContract.FreezeBalanceV2Contract
             && addressEquals(((BalanceContract.FreezeBalanceV2Contract) c)
                 .getOwnerAddress(), ownerAddr)
-            && ((BalanceContract.FreezeBalanceV2Contract) c).getFrozenBalance() == 1000000),
+            && ((BalanceContract.FreezeBalanceV2Contract) c).getFrozenBalance() == 1000000
+            && ((BalanceContract.FreezeBalanceV2Contract) c)
+                .getResource() == ResourceCode.ENERGY),
         eq(Protocol.Transaction.Contract.ContractType.FreezeBalanceV2Contract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/MarketSellAssetServletTest.java b/framework/src/test/java/org/tron/core/services/http/MarketSellAssetServletTest.java
@@ -48,7 +48,9 @@ public void testMarketSellAsset() throws Exception {
             && addressEquals(((MarketContract.MarketSellAssetContract) c)
                 .getOwnerAddress(), ownerAddr)
             && ((MarketContract.MarketSellAssetContract) c).getSellTokenQuantity() == 100
-            && ((MarketContract.MarketSellAssetContract) c).getBuyTokenQuantity() == 200),
+            && ((MarketContract.MarketSellAssetContract) c).getBuyTokenQuantity() == 200
+            && !((MarketContract.MarketSellAssetContract) c).getSellTokenId().isEmpty()
+            && !((MarketContract.MarketSellAssetContract) c).getBuyTokenId().isEmpty()),
         eq(Protocol.Transaction.Contract.ContractType.MarketSellAssetContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/UnDelegateResourceServletTest.java b/framework/src/test/java/org/tron/core/services/http/UnDelegateResourceServletTest.java
@@ -14,6 +14,7 @@
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.protos.Protocol;
 import org.tron.protos.contract.BalanceContract;
+import org.tron.protos.contract.Common.ResourceCode;
 
 public class UnDelegateResourceServletTest extends BaseHttpTest {
 
@@ -37,7 +38,7 @@ public void testUnDelegateResource() throws Exception {
         + "\"owner_address\": \"" + ownerAddr + "\","
         + "\"receiver_address\": \"" + receiverAddr + "\","
         + "\"balance\": 1000000,"
-        + "\"resource\": \"BANDWIDTH\""
+        + "\"resource\": \"ENERGY\""
         + "}";
     MockHttpServletRequest request = postRequest(jsonParam);
 
@@ -49,7 +50,9 @@ && addressEquals(((BalanceContract.UnDelegateResourceContract) c)
                 .getOwnerAddress(), ownerAddr)
             && addressEquals(((BalanceContract.UnDelegateResourceContract) c)
                 .getReceiverAddress(), receiverAddr)
-            && ((BalanceContract.UnDelegateResourceContract) c).getBalance() == 1000000),
+            && ((BalanceContract.UnDelegateResourceContract) c).getBalance() == 1000000
+            && ((BalanceContract.UnDelegateResourceContract) c)
+                .getResource() == ResourceCode.ENERGY),
         eq(Protocol.Transaction.Contract.ContractType.UnDelegateResourceContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/UnFreezeBalanceV2ServletTest.java b/framework/src/test/java/org/tron/core/services/http/UnFreezeBalanceV2ServletTest.java
@@ -14,6 +14,7 @@
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.protos.Protocol;
 import org.tron.protos.contract.BalanceContract;
+import org.tron.protos.contract.Common.ResourceCode;
 
 public class UnFreezeBalanceV2ServletTest extends BaseHttpTest {
 
@@ -35,7 +36,7 @@ public void testUnFreezeBalanceV2() throws Exception {
     String jsonParam = "{"
         + "\"owner_address\": \"" + ownerAddr + "\","
         + "\"unfreeze_balance\": 1000000,"
-        + "\"resource\": \"BANDWIDTH\""
+        + "\"resource\": \"ENERGY\""
         + "}";
     MockHttpServletRequest request = postRequest(jsonParam);
 
@@ -45,7 +46,9 @@ public void testUnFreezeBalanceV2() throws Exception {
         argThat(c -> c instanceof BalanceContract.UnfreezeBalanceV2Contract
             && addressEquals(((BalanceContract.UnfreezeBalanceV2Contract) c)
                 .getOwnerAddress(), ownerAddr)
-            && ((BalanceContract.UnfreezeBalanceV2Contract) c).getUnfreezeBalance() == 1000000),
+            && ((BalanceContract.UnfreezeBalanceV2Contract) c).getUnfreezeBalance() == 1000000
+            && ((BalanceContract.UnfreezeBalanceV2Contract) c)
+                .getResource() == ResourceCode.ENERGY),
         eq(Protocol.Transaction.Contract.ContractType.UnfreezeBalanceV2Contract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/core/services/http/UpdateAssetServletTest.java b/framework/src/test/java/org/tron/core/services/http/UpdateAssetServletTest.java
@@ -48,7 +48,11 @@ public void testUpdateAsset() throws Exception {
             && addressEquals(((AssetIssueContractOuterClass.UpdateAssetContract) c)
                 .getOwnerAddress(), ownerAddr)
             && ((AssetIssueContractOuterClass.UpdateAssetContract) c).getNewLimit() == 100
-            && ((AssetIssueContractOuterClass.UpdateAssetContract) c).getNewPublicLimit() == 200),
+            && ((AssetIssueContractOuterClass.UpdateAssetContract) c).getNewPublicLimit() == 200
+            && ((AssetIssueContractOuterClass.UpdateAssetContract) c)
+                .getDescription().toStringUtf8().equals("test_desc")
+            && ((AssetIssueContractOuterClass.UpdateAssetContract) c)
+                .getUrl().toStringUtf8().equals("test_url")),
         eq(Protocol.Transaction.Contract.ContractType.UpdateAssetContract));
     assertTransactionResponse(response);
   }
diff --git a/framework/src/test/java/org/tron/json/JsonCompatibilityFuzzTest.java b/framework/src/test/java/org/tron/json/JsonCompatibilityFuzzTest.java
@@ -17,6 +17,7 @@
 import java.util.Random;
 import java.util.Set;
 import lombok.Getter;
+import lombok.Setter;
 import org.junit.Test;
 
 /**
@@ -1800,11 +1801,15 @@ public void testGetObjectJSONArrayTypeMismatch() {
 
   @Test
   public void testGetObjectPojo() {
-    // Regular POJO deserialization still works via MAPPER.treeToValue
-    JSONObject obj = JSON.parseObject("{\"name\":\"test\",\"nullField\":null}");
-    TestPojo pojo = obj.getObject("", TestPojo.class);
-    // getObject with empty key returns null (key doesn't exist)
-    assertNull(pojo);
+    // POJO deserialization via MAPPER.treeToValue
+    JSONObject obj = JSON.parseObject(
+        "{\"inner\":{\"name\":\"test\",\"nullField\":null}}");
+    TestPojo pojo = obj.getObject("inner", TestPojo.class);
+    assertNotNull(pojo);
+    assertEquals("test", pojo.getName());
+    assertNull(pojo.getNullField());
+    // missing key returns null
+    assertNull(obj.getObject("nonexistent", TestPojo.class));
   }
 
   // -------------------------------------------------------------------------
@@ -2524,16 +2529,19 @@ private static String randomGarbage(Random rng) {
   // =========================================================================
 
   @Getter
+  @Setter
   @SuppressWarnings("unused")
   static class TestPojo {
-    private final String name;
-    private final String nullField;
+    private String name;
+    private String nullField;
+
+    TestPojo() {
+    }
 
     TestPojo(String name, String nullField) {
       this.name = name;
       this.nullField = nullField;
     }
-
   }
 
   // ---------------------------------------------------------------------------
@@ -2574,4 +2582,30 @@ public void testGetJSONArrayFromStringifiedComplexArray() {
     JSONObject contract = arr.getJSONObject(0);
     assertEquals("TransferContract", contract.getString("type"));
   }
+
+  // ---------------------------------------------------------------------------
+  // Section 79-80: JSONArray index-based stringified JSON auto-parse
+  // ---------------------------------------------------------------------------
+
+  @Test
+  public void testArrayGetJSONObjectFromStringifiedElement() {
+    // Fastjson auto-parses stringified JSON objects at array indices
+    JSONArray arr = new JSONArray();
+    arr.add("{\"key\":\"value\",\"num\":42}");
+    JSONObject obj = arr.getJSONObject(0);
+    assertNotNull(obj);
+    assertEquals("value", obj.getString("key"));
+    assertEquals(Integer.valueOf(42), obj.getInteger("num"));
+  }
+
+  @Test
+  public void testArrayGetJSONArrayFromStringifiedElement() {
+    // Fastjson auto-parses stringified JSON arrays at array indices
+    JSONArray arr = new JSONArray();
+    arr.add("[1,2,3]");
+    JSONArray nested = arr.getJSONArray(0);
+    assertNotNull(nested);
+    assertEquals(3, nested.size());
+    assertEquals(1, nested.get(0));
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,14 @@ public JSONObject getJSONObject(int index) {`
`71`	`71`	`if (child.isNull()) {`
`72`	`72`	`return null;`
`73`	`73`	`}`
`74`		`- if (!child.isObject()) {`
`75`		`- throw new JSONException("Element at index " + index + " is not an object");`
	`74`	`+ if (child.isObject()) {`
	`75`	`+ return new JSONObject((ObjectNode) child);`
`76`	`76`	`}`
`77`		`- return new JSONObject((ObjectNode) child);`
	`77`	`+ // Fastjson auto-parses stringified JSON objects`
	`78`	`+ if (child.isTextual()) {`
	`79`	`+ return JSON.parseObject(child.asText());`
	`80`	`+ }`
	`81`	`+ throw new JSONException("Element at index " + index + " is not an object");`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`public JSONArray getJSONArray(int index) {`
`@@ -83,10 +87,14 @@ public JSONArray getJSONArray(int index) {`
`83`	`87`	`if (child.isNull()) {`
`84`	`88`	`return null;`
`85`	`89`	`}`
`86`		`- if (!child.isArray()) {`
`87`		`- throw new JSONException("Element at index " + index + " is not an array");`
	`90`	`+ if (child.isArray()) {`
	`91`	`+ return new JSONArray((ArrayNode) child);`
	`92`	`+ }`
	`93`	`+ // Fastjson auto-parses stringified JSON arrays`
	`94`	`+ if (child.isTextual()) {`
	`95`	`+ return JSON.parseArray(child.asText());`
`88`	`96`	`}`
`89`		`- return new JSONArray((ArrayNode) child);`
	`97`	`+ throw new JSONException("Element at index " + index + " is not an array");`
`90`	`98`	`}`
`91`	`99`
`92`	`100`	`public String getString(int index) {`