optimize some testcases

Author: 317787106

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

@@ -169,7 +169,8 @@ public enum RequestSource {
   private static final String NO_BLOCK_HEADER_BY_HASH = "header for hash not found";
 
   private static final String ERROR_SELECTOR = "08c379a0"; // Function selector for Error(string)
-  private final int filterParallelThreshold = 10000;
+  @Setter
+  private int filterParallelThreshold = 10000;
   /**
    * Using the default maxLogFilterNum of 20,000, a 3-thread pool can keep up with log event
    * processing for each block within the 3-second BLOCK_PRODUCED_INTERVAL. Increasing the thread

framework/src/test/java/org/tron/core/jsonrpc/HandleLogsFilterTest.java

@@ -41,7 +41,9 @@ private TransactionInfo buildTxInfoWithLog(byte[] address) {
     return TransactionInfo.newBuilder().addLog(LogInfo.buildLog(logInfo)).build();
   }
 
-  /** Events dispatched to a matching filter in the serial (<=10000 entries) path. */
+  /**
+   * Events dispatched to a matching filter in the serial (<=10000 entries) path.
+   */
   @Test
   public void testMatchingFilter_receivesLogElements() throws JsonRpcInvalidParamsException {
     FilterRequest fr = new FilterRequest();
@@ -58,7 +60,9 @@ public void testMatchingFilter_receivesLogElements() throws JsonRpcInvalidParams
     Assert.assertEquals(1, filterAndResult.getResult().size());
   }
 
-  /** Filter with fromBlock=100 does not receive a capsule whose blockNumber is 50. */
+  /**
+   * Filter with fromBlock=100 does not receive a capsule whose blockNumber is 50.
+   */
   @Test
   public void testBlockNumberBelowRange_noResult() throws JsonRpcInvalidParamsException {
     FilterRequest fr = new FilterRequest();
@@ -76,7 +80,9 @@ public void testBlockNumberBelowRange_noResult() throws JsonRpcInvalidParamsExce
     Assert.assertTrue(filterAndResult.getResult().isEmpty());
   }
 
-  /** An expired filter is removed from the map during handleLogsFilter. */
+  /**
+   * An expired filter is removed from the map during handleLogsFilter.
+   */
   @Test
   public void testExpiredFilter_removedFromMap() throws Exception {
     FilterRequest fr = new FilterRequest();
@@ -100,7 +106,9 @@ public void testExpiredFilter_removedFromMap() throws Exception {
     Assert.assertFalse("expired filter should be removed", map.containsKey(FILTER_ID_1));
   }
 
-  /** A solidified capsule is routed only to the solidity map; the full-node map is untouched. */
+  /**
+   * A solidified capsule is routed only to the solidity map; the full-node map is untouched.
+   */
   @Test
   public void testSolidifiedCapsule_routedToSolidityMap() throws JsonRpcInvalidParamsException {
     FilterRequest fr = new FilterRequest();
@@ -121,7 +129,9 @@ public void testSolidifiedCapsule_routedToSolidityMap() throws JsonRpcInvalidPar
     Assert.assertTrue("full-node filter must not be touched", fullFilter.getResult().isEmpty());
   }
 
-  /** A non-solidified capsule is routed only to the full-node map. */
+  /**
+   * A non-solidified capsule is routed only to the full-node map.
+   */
   @Test
   public void testNonSolidifiedCapsule_routedToFullMap() throws JsonRpcInvalidParamsException {
     FilterRequest fr = new FilterRequest();
@@ -142,7 +152,9 @@ public void testNonSolidifiedCapsule_routedToFullMap() throws JsonRpcInvalidPara
     Assert.assertTrue("solidity filter must not be touched", solidityFilter.getResult().isEmpty());
   }
 
-  /** Both filters in the map receive events when both match. */
+  /**
+   * Both filters in the map receive events when both match.
+   */
   @Test
   public void testMultipleMatchingFilters_bothReceiveEvents() throws JsonRpcInvalidParamsException {
     FilterRequest fr = new FilterRequest();
@@ -162,7 +174,9 @@ public void testMultipleMatchingFilters_bothReceiveEvents() throws JsonRpcInvali
     Assert.assertEquals(1, filter2.getResult().size());
   }
 
-  /** An empty txInfoList produces no results. */
+  /**
+   * An empty txInfoList produces no results.
+   */
   @Test
   public void testEmptyTxInfoList_noResult() throws JsonRpcInvalidParamsException {
     FilterRequest fr = new FilterRequest();
@@ -177,14 +191,8 @@ public void testEmptyTxInfoList_noResult() throws JsonRpcInvalidParamsException
     Assert.assertTrue(filterAndResult.getResult().isEmpty());
   }
 
-  // -------------------------------------------------------------------------
-  // Parallel path tests (filterParallelThreshold lowered to 2 via reflection)
-  // -------------------------------------------------------------------------
-
-  private void setParallelThreshold(int value) throws Exception {
-    Field f = TronJsonRpcImpl.class.getDeclaredField("filterParallelThreshold");
-    f.setAccessible(true);
-    f.setInt(jsonRpc, value);
+  private void setParallelThreshold(int value) {
+    jsonRpc.setFilterParallelThreshold(value);
   }
 
   /**

framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java

@@ -159,7 +159,8 @@ public void testEnableInFullNode() {
    */
   @Test
   public void testNewFilter_exceedsCapThrowsException() throws Exception {
-    int cap = Args.getInstance().getJsonRpcMaxLogFilterNum();
+    int cap = 5;
+    Args.getInstance().setJsonRpcMaxLogFilterNum(cap);
     FilterRequest fr = new FilterRequest();
     TronJsonRpcImpl tronJsonRpc = new TronJsonRpcImpl(nodeInfoService, wallet);
     tronJsonRpc.setManager(dbManager);