deprecation: replace calls to isEqualToComparingFieldByField (hyperle…

…dger#3042) * replace isEqualToComparingFieldByField with usingRecursiveComparison().isEqualTo Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> * isEqualTo() Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> * revert ibft and qbft tests back to compareFieldByField Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> * revert tests back to compareFieldByField Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
lacchain · Nov 3, 2023 · d6f6609 · d6f6609
1 parent 42b9add
commit d6f6609
Show file tree

Hide file tree

Showing 83 changed files with 297 additions and 282 deletions.
diff --git a/...yperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java b/...yperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java
@@ -38,6 +38,6 @@ public PrivGetPrivateTransactionSuccess(
   @Override
   public void verify(final Node node) {
     final PrivateTransactionGroupResponse result = node.execute(transaction);
-    assertThat(result).isEqualToComparingFieldByField(privateTransaction);
+    assertThat(result).usingRecursiveComparison().isEqualTo(privateTransaction);
   }
 }
diff --git a/...test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/...test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java
@@ -195,7 +195,7 @@ public void aliceCanUsePrivDistributeTransaction() {
         bobEnclave.receive(
             Bytes.fromHexString(transactionKey).toBase64String(), bob.getEnclaveKey());
 
-    assertThat(bobRR).isEqualToComparingFieldByField(aliceRR);
+    assertThat(bobRR).usingRecursiveComparison().isEqualTo(aliceRR);
 
     final RawTransaction pmt =
         RawTransaction.createTransaction(

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -460,7 +460,8 @@ public void nodePermissionsSmartContractMustUseOption() {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(smartContractPermissioningConfiguration);
+        .usingRecursiveComparison()
+        .isEqualTo(smartContractPermissioningConfiguration);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();
@@ -487,7 +488,8 @@ public void nodePermissionsContractVersionDefaultValue() {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(expectedConfig);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedConfig);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();
@@ -516,7 +518,8 @@ public void nodePermissionsContractVersionSetsValue() {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(expectedConfig);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedConfig);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();
@@ -718,7 +721,8 @@ public void nodePermissioningTomlPathMustUseOption() throws IOException {
     final PermissioningConfiguration config =
         permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getLocalConfig().get())
-        .isEqualToComparingFieldByField(localPermissioningConfiguration);
+        .usingRecursiveComparison()
+        .isEqualTo(localPermissioningConfiguration);
 
     assertThat(commandErrorOutput.toString()).isEmpty();
     assertThat(commandOutput.toString()).isEmpty();

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java
@@ -61,7 +61,7 @@ private void getCLIOptions(final D domainObject) {
     final TestBesuCommand cmd = parseCommand(cliOptions);
     final T optionsFromCommand = getOptionsFromBesuCommand(cmd);
 
-    assertThat(optionsFromCommand).isEqualToComparingFieldByField(options);
+    assertThat(optionsFromCommand).usingRecursiveComparison().isEqualTo(options);
 
     assertThat(commandOutput.toString()).isEmpty();
     assertThat(commandErrorOutput.toString()).isEmpty();

diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java
@@ -140,7 +140,8 @@ public void aBlockTimerExpiryEventIsAddedToTheQueueOnExpiry() throws Interrupted
     final BftEvent queuedEvent = eventQueue.poll(0, TimeUnit.SECONDS);
     assertThat(queuedEvent).isInstanceOf(BlockTimerExpiry.class);
     assertThat(((BlockTimerExpiry) queuedEvent).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
@@ -169,7 +170,8 @@ public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsEqualToNow() {
 
     assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
     assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
@@ -198,7 +200,8 @@ public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsInThePast() {
 
     assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
     assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test

diff --git a/...st/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java b/...st/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java
@@ -75,7 +75,7 @@ public void testConversionFromVoteTypeToBoolean() {
 
     final JsonRpcResponse response = getMethod().response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test

diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java
@@ -194,7 +194,7 @@ public void testCreateDeleteRetrievePrivacyGroup() {
     final PrivacyGroup retrievePrivacyGroup =
         enclave.retrievePrivacyGroup(privacyGroupResponse.getPrivacyGroupId());
 
-    assertThat(retrievePrivacyGroup).isEqualToComparingFieldByField(privacyGroupResponse);
+    assertThat(retrievePrivacyGroup).usingRecursiveComparison().isEqualTo(privacyGroupResponse);
 
     final String response =
         enclave.deletePrivacyGroup(privacyGroupResponse.getPrivacyGroupId(), publicKeys.get(0));

diff --git a/...g/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java b/...g/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java
@@ -91,6 +91,6 @@ public void debugTraceTransactionMissingTest() {
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, null);
 
     final JsonRpcResponse response = method.response(request);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/...g/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java b/...g/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java
@@ -84,7 +84,7 @@ public void shouldReturnExpectedResultForCallAtLatestBlock() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -107,7 +107,7 @@ public void shouldReturnExpectedResultForCallAtSpecificBlock() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -152,7 +152,7 @@ public void shouldReturnErrorWithGasLimitTooLow() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -174,7 +174,7 @@ public void shouldReturnErrorWithGasPriceTooHighAndStrict() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -197,7 +197,7 @@ public void shouldReturnSuccessWithGasPriceTooHighNotStrict() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -219,7 +219,7 @@ public void shouldReturnErrorWithGasPriceTooHigh() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -242,7 +242,7 @@ public void shouldReturnSuccessWithValidGasPrice() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -264,7 +264,7 @@ public void shouldReturnErrorWithGasPriceAndEmptyBalance() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -287,7 +287,7 @@ public void shouldReturnSuccessWithZeroGasPriceAndEmptyBalance() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -310,7 +310,7 @@ public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -333,7 +333,7 @@ public void shouldReturnSuccessWithInvalidGasPricingAndEmptyBalance() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -354,7 +354,7 @@ public void shouldReturnEmptyHashResultForCallWithOnlyToField() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {

diff --git a/...ger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java b/...ger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java
@@ -76,7 +76,7 @@ public void returnEmptyResponseIfBlockNotFound() {
     final JsonRpcMethod method = ethGetBlockByHash();
     final JsonRpcResponse actual = method.response(requestWithParams(ZERO_HASH, true));
 
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -196,7 +196,7 @@ public void returnTransactionHashOnlyIfBlockFound() {
             "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", false);
     final JsonRpcResponse actual = ethGetBlockByHash().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {

diff --git a/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java b/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java
@@ -146,7 +146,7 @@ public void shouldReturnErrorResponseIfFilterNotFound() {
     final JsonRpcResponse expected = new JsonRpcErrorResponse(null, JsonRpcError.FILTER_NOT_FOUND);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -159,7 +159,7 @@ public void shouldReturnEmptyArrayIfNoNewBlocks() {
     final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     filterManager.uninstallFilter(filterId);
 
@@ -177,7 +177,7 @@ public void shouldReturnEmptyArrayIfNoAddedPendingTransactions() {
     // We haven't added any transactions, so the list of pending transactions should be empty.
     final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
     final JsonRpcResponse actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     filterManager.uninstallFilter(filterId);
 
@@ -195,19 +195,19 @@ public void shouldReturnHashesIfNewBlocks() {
     // We haven't added any blocks, so the list of new blocks should be empty.
     JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
     JsonRpcResponse actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     final Block block = appendBlock(transaction);
 
     // We've added one block, so there should be one new hash.
     expected = new JsonRpcSuccessResponse(null, Lists.newArrayList(block.getHash().toString()));
     actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     // The queue should be flushed and return no results.
     expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
     actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     filterManager.uninstallFilter(filterId);
 
@@ -225,20 +225,20 @@ public void shouldReturnHashesIfNewPendingTransactions() {
     // We haven't added any transactions, so the list of pending transactions should be empty.
     JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
     JsonRpcResponse actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     transactions.addRemoteTransaction(transaction);
 
     // We've added one transaction, so there should be one new hash.
     expected =
         new JsonRpcSuccessResponse(null, Lists.newArrayList(String.valueOf(transaction.getHash())));
     actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     // The queue should be flushed and return no results.
     expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
     actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     filterManager.uninstallFilter(filterId);
 

diff --git a/...reum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java b/...reum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java
@@ -106,6 +106,6 @@ public void shouldGetExpectedBlockResult() {
     final JsonRpcResponse actual = method.response(request);
 
     assertThat(actual).isInstanceOf(JsonRpcSuccessResponse.class);
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 }
diff --git a/...um/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java b/...um/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
@@ -97,7 +97,7 @@ public void shouldGetExpectedBlockResult() {
 
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcRequestContext getUncleByBlockNumberAndIndex() {

diff --git a/.../ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java b/.../ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java
@@ -182,6 +182,7 @@ public void returnsStoredPrivateTransaction() {
         (PrivateTransactionLegacyResult) response.getResult();
 
     assertThat(new PrivateTransactionLegacyResult(this.privateTransaction))
-        .isEqualToComparingFieldByField(result);
+        .usingRecursiveComparison()
+        .isEqualTo(result);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ public void testConversionFromVoteTypeToBoolean() { @@
         final JsonRpcResponse response = getMethod().response(request);
-        assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+        assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
       }
       @Test
@@ Expand Down @@