From c0b1316d7b1a4febed5e3de4a1f7b0dc2eb32ae9 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 15 Nov 2021 20:20:59 +1000 Subject: [PATCH] deprecation: replace calls to isEqualToComparingFieldByField (#3042) * replace isEqualToComparingFieldByField with usingRecursiveComparison().isEqualTo Signed-off-by: Sally MacFarlane * isEqualTo() Signed-off-by: Sally MacFarlane * revert ibft and qbft tests back to compareFieldByField Signed-off-by: Sally MacFarlane * revert tests back to compareFieldByField Signed-off-by: Sally MacFarlane --- .../PrivGetPrivateTransactionSuccess.java | 2 +- .../privacy/PrivacyClusterAcceptanceTest.java | 2 +- .../hyperledger/besu/cli/BesuCommandTest.java | 12 ++++++---- .../cli/options/AbstractCLIOptionsTest.java | 2 +- .../consensus/common/bft/BlockTimerTest.java | 9 ++++--- .../AbstractVoteProposerMethodTest.java | 2 +- .../hyperledger/besu/enclave/EnclaveTest.java | 2 +- .../DebugTraceTransactionIntegrationTest.java | 2 +- .../fork/frontier/EthCallIntegrationTest.java | 24 +++++++++---------- .../EthGetBlockByHashIntegrationTest.java | 4 ++-- .../EthGetFilterChangesIntegrationTest.java | 18 +++++++------- ...cleByBlockHashAndIndexIntegrationTest.java | 2 +- ...eByBlockNumberAndIndexIntegrationTest.java | 2 +- ...vGetPrivateTransactionIntegrationTest.java | 3 ++- .../fork/london/EthCallIntegrationTest.java | 18 +++++++------- .../EthGetFilterChangesIntegrationTest.java | 18 +++++++------- .../filter/FilterManagerLogFilterTest.java | 2 +- .../internal/filter/FilterRepositoryTest.java | 4 ++-- .../internal/methods/AdminAddPeerTest.java | 18 +++++++------- .../methods/AdminChangeLogLevelTest.java | 12 +++++----- .../methods/AdminLogsRemoveCacheTest.java | 6 ++--- .../methods/AdminLogsRepairCacheTest.java | 4 ++-- .../internal/methods/AdminNodeInfoTest.java | 4 ++-- .../internal/methods/AdminPeersTest.java | 5 ++-- .../internal/methods/EthBlockNumberTest.java | 2 +- .../internal/methods/EthChainIdTest.java | 4 ++-- .../internal/methods/EthCoinbaseTest.java | 4 ++-- .../internal/methods/EthGasPriceTest.java | 6 ++--- .../methods/EthGetFilterChangesTest.java | 14 +++++------ .../methods/EthGetFilterLogsTest.java | 6 ++--- .../EthGetUncleByBlockHashAndIndexTest.java | 4 ++-- .../EthGetUncleByBlockNumberAndIndexTest.java | 2 +- .../internal/methods/EthGetWorkTest.java | 8 +++---- .../internal/methods/EthHashrateTest.java | 4 ++-- .../internal/methods/EthMiningTest.java | 4 ++-- .../methods/EthNewBlockFilterTest.java | 2 +- .../internal/methods/EthNewFilterTest.java | 8 +++---- .../methods/EthProtocolVersionTest.java | 6 ++--- .../methods/EthSendRawTransactionTest.java | 12 +++++----- .../methods/EthSendTransactionTest.java | 2 +- .../internal/methods/EthSubmitWorkTest.java | 6 ++--- .../internal/methods/EthSyncingTest.java | 6 ++--- .../internal/methods/NetEnodeTest.java | 9 ++++--- .../internal/methods/NetListeningTest.java | 6 +++-- .../internal/methods/NetVersionTest.java | 4 ++-- .../internal/methods/RpcModulesTest.java | 2 +- .../methods/Web3ClientVersionTest.java | 2 +- .../internal/methods/Web3Sha3Test.java | 16 ++++++------- .../methods/miner/MinerSetCoinbaseTest.java | 4 ++-- .../methods/miner/MinerSetEtherbaseTest.java | 2 +- .../methods/miner/MinerStartTest.java | 6 ++--- .../internal/methods/miner/MinerStopTest.java | 4 ++-- .../PermAddAccountsToAllowlistTest.java | 10 ++++---- .../PermAddAccountsToWhitelistTest.java | 10 ++++---- .../PermAddNodesToAllowlistTest.java | 17 ++++++------- .../PermAddNodesToWhitelistTest.java | 17 ++++++------- .../PermGetAccountsAllowlistTest.java | 4 ++-- .../PermGetAccountsWhitelistTest.java | 4 ++-- .../PermGetNodesAllowlistTest.java | 7 +++--- .../PermGetNodesWhitelistTest.java | 7 +++--- .../PermReloadPermissionsFromFileTest.java | 6 ++--- .../PermRemoveAccountsFromAllowlistTest.java | 10 ++++---- .../PermRemoveAccountsFromWhitelistTest.java | 10 ++++---- .../PermRemoveNodesFromAllowlistTest.java | 17 ++++++------- .../PermRemoveNodesFromWhitelistTest.java | 17 ++++++------- .../parameters/FilterParameterTest.java | 24 +++++++++---------- ...GoQuorumSendRawPrivateTransactionTest.java | 4 ++-- .../privacy/methods/priv/PrivCallTest.java | 6 ++--- .../PrivDistributeRawTransactionTest.java | 4 ++-- .../priv/PrivFindPrivacyGroupTest.java | 2 +- .../priv/PrivGetPrivateTransactionTest.java | 4 ++-- .../priv/PrivGetTransactionReceiptTest.java | 4 ++-- .../PrivxFindOnchainPrivacyGroupTest.java | 2 +- .../subscription/SubscriptionBuilderTest.java | 10 ++++---- .../SubscriptionRequestMapperTest.java | 15 ++++-------- .../MainnetTransactionProcessorTest.java | 3 ++- .../MultiTenancyPrivacyControllerTest.java | 4 ++-- .../privacy/OnchainPrivacyControllerTest.java | 4 ++-- ...estrictedDefaultPrivacyControllerTest.java | 4 ++-- .../eth/transactions/TransactionPoolTest.java | 3 ++- .../besu/nat/docker/DockerNatManagerTest.java | 6 ++--- .../KubernetesClusterIpNatManagerTest.java | 6 ++--- .../KubernetesLoadManagerNatManagerTest.java | 6 ++--- 83 files changed, 297 insertions(+), 282 deletions(-) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java index 33383a054..b09b1b29b 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java @@ -38,6 +38,6 @@ public class PrivGetPrivateTransactionSuccess implements Condition { @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/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java index 847006300..b588fd1d0 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java @@ -195,7 +195,7 @@ public class PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase { 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 index f9e1c08d1..ff7a73815 100644 --- 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 class BesuCommandTest extends CommandTestAbstract { 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 class BesuCommandTest extends CommandTestAbstract { 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 class BesuCommandTest extends CommandTestAbstract { 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 class BesuCommandTest extends CommandTestAbstract { 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 index 8818eaee9..99f6cb084 100644 --- 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 @@ public abstract class AbstractCLIOptionsTest> 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 index 350944cd9..920952790 100644 --- 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 class BlockTimerTest { 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 class BlockTimerTest { assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue(); assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier()) - .isEqualToComparingFieldByField(round); + .usingRecursiveComparison() + .isEqualTo(round); } @Test @@ -198,7 +200,8 @@ public class BlockTimerTest { assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue(); assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier()) - .isEqualToComparingFieldByField(round); + .usingRecursiveComparison() + .isEqualTo(round); } @Test diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java index 0ed99dc4d..ac1cfc937 100644 --- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java +++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java @@ -75,7 +75,7 @@ public abstract class AbstractVoteProposerMethodTest { 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 index c3518e4a0..153026183 100644 --- 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 class EnclaveTest { 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/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java index 75a2cc525..4bc4a701b 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java @@ -91,6 +91,6 @@ public class DebugTraceTransactionIntegrationTest { 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/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java index 4e6a95c3d..9491726f9 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java @@ -84,7 +84,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -107,7 +107,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -152,7 +152,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -174,7 +174,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -197,7 +197,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -219,7 +219,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -242,7 +242,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -264,7 +264,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -287,7 +287,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -310,7 +310,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -333,7 +333,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -354,7 +354,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java index 3c900e72b..77a0ecfe1 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java @@ -76,7 +76,7 @@ public class EthGetBlockByHashIntegrationTest { 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 class EthGetBlockByHashIntegrationTest { "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/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java index 5d8321c95..2f517a1cf 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java @@ -146,7 +146,7 @@ public class EthGetFilterChangesIntegrationTest { 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 class EthGetFilterChangesIntegrationTest { 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 class EthGetFilterChangesIntegrationTest { // 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 class EthGetFilterChangesIntegrationTest { // 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,7 +225,7 @@ public class EthGetFilterChangesIntegrationTest { // 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); @@ -233,12 +233,12 @@ public class EthGetFilterChangesIntegrationTest { 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/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java index e659ff8f6..d5fa3cc6e 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java @@ -106,6 +106,6 @@ public class EthGetUncleByBlockHashAndIndexIntegrationTest { final JsonRpcResponse actual = method.response(request); assertThat(actual).isInstanceOf(JsonRpcSuccessResponse.class); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java index 6accd88cd..fcc989ae3 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java @@ -97,7 +97,7 @@ public class EthGetUncleByBlockNumberAndIndexIntegrationTest { final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } private JsonRpcRequestContext getUncleByBlockNumberAndIndex() { diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java index 17d42e7ee..837c3b534 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java @@ -182,6 +182,7 @@ public class PrivGetPrivateTransactionIntegrationTest { (PrivateTransactionLegacyResult) response.getResult(); assertThat(new PrivateTransactionLegacyResult(this.privateTransaction)) - .isEqualToComparingFieldByField(result); + .usingRecursiveComparison() + .isEqualTo(result); } } diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java index 5d0024437..4cf918782 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java @@ -81,7 +81,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -103,7 +103,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -126,7 +126,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -148,7 +148,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -171,7 +171,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -194,7 +194,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -216,7 +216,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -239,7 +239,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -261,7 +261,7 @@ public class EthCallIntegrationTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java index 4b83c648a..fe87648a0 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java @@ -146,7 +146,7 @@ public class EthGetFilterChangesIntegrationTest { 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 class EthGetFilterChangesIntegrationTest { 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 class EthGetFilterChangesIntegrationTest { // 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 class EthGetFilterChangesIntegrationTest { // 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,7 +225,7 @@ public class EthGetFilterChangesIntegrationTest { // 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); @@ -233,12 +233,12 @@ public class EthGetFilterChangesIntegrationTest { 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/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java index e5bb608c9..8afd5a5bd 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java @@ -124,7 +124,7 @@ public class FilterManagerLogFilterTest { final List retrievedLogs = filterManager.logsChanges(filterId); - assertThat(retrievedLogs).isEqualToComparingFieldByFieldRecursively(expectedLogs); + assertThat(retrievedLogs).usingRecursiveComparison().isEqualTo(expectedLogs); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java index eecbe19eb..6a8782eff 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java @@ -57,7 +57,7 @@ public class FilterRepositoryTest { final BlockFilter retrievedFilter = repository.getFilter("id", BlockFilter.class).get(); - assertThat(retrievedFilter).isEqualToComparingFieldByField(filter); + assertThat(retrievedFilter).usingRecursiveComparison().isEqualTo(filter); } @Test @@ -89,7 +89,7 @@ public class FilterRepositoryTest { final Optional optional = repository.getFilter(filter.getId(), BlockFilter.class); assertThat(optional.isPresent()).isTrue(); - assertThat(optional.get()).isEqualToComparingFieldByField(filter); + assertThat(optional.get()).usingRecursiveComparison().isEqualTo(filter); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java index e843928f0..82a9f9b5b 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java @@ -66,7 +66,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -78,7 +78,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -90,7 +90,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -103,7 +103,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -123,7 +123,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -135,7 +135,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(validRequest); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -149,7 +149,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -161,7 +161,7 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(validRequest); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -175,6 +175,6 @@ public class AdminAddPeerTest { final JsonRpcResponse actualResponse = method.response(validRequest); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java index 6bcc0c8cd..7b4a2f6ed 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java @@ -60,7 +60,7 @@ public class AdminChangeLogLevelTest { (JsonRpcSuccessResponse) adminChangeLogLevel.response(request); final Level levelAfterJsonRpcRequest = LogManager.getLogger().getLevel(); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); assertThat(levelBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO); assertThat(levelAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG); } @@ -83,7 +83,7 @@ public class AdminChangeLogLevelTest { final Level levelWithSpecificPackageAfterJsonRpcRequest = LogManager.getLogger("com").getLevel(); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); assertThat(levelOfAllProjectBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO); assertThat(levelOfAllProjectAfterJsonRpcRequest).isEqualByComparingTo(Level.INFO); assertThat(levelWithSpecificPackageBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO); @@ -103,7 +103,7 @@ public class AdminChangeLogLevelTest { (JsonRpcSuccessResponse) adminChangeLogLevel.response(request); final Level levelAfterJsonRpcRequest = LogManager.getLogger().getLevel(); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); assertThat(levelBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO); assertThat(levelAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG); } @@ -117,7 +117,7 @@ public class AdminChangeLogLevelTest { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -129,7 +129,7 @@ public class AdminChangeLogLevelTest { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -141,6 +141,6 @@ public class AdminChangeLogLevelTest { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java index 741f4f7ac..24400bef8 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java @@ -131,7 +131,7 @@ public class AdminLogsRemoveCacheTest { final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); assertThat(fromBlock.getValue()).isEqualTo(expectedFromBlock); assertThat(toBlock.getValue()).isEqualTo(expectedToBlock); } @@ -152,7 +152,7 @@ public class AdminLogsRemoveCacheTest { final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test(expected = IllegalStateException.class) @@ -180,6 +180,6 @@ public class AdminLogsRemoveCacheTest { final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java index c7495c273..a0d268438 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java @@ -68,7 +68,7 @@ public class AdminLogsRepairCacheTest { final JsonRpcResponse actualResponse = adminLogsRepairCache.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -88,7 +88,7 @@ public class AdminLogsRepairCacheTest { final JsonRpcResponse actualResponse = adminLogsRepairCache.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test(expected = IllegalStateException.class) diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java index 0096cd809..bd93c3d92 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java @@ -334,7 +334,7 @@ public class AdminNodeInfoTest { final JsonRpcResponse response = method.response(request); assertThat(response).isInstanceOf(JsonRpcErrorResponse.class); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -349,7 +349,7 @@ public class AdminNodeInfoTest { final JsonRpcResponse response = method.response(request); assertThat(response).isInstanceOf(JsonRpcErrorResponse.class); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @SuppressWarnings("unchecked") diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java index 55f65374e..b1f370e03 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java @@ -76,7 +76,7 @@ public class AdminPeersTest { final JsonRpcResponse response = adminPeers.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -104,7 +104,8 @@ public class AdminPeersTest { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.P2P_DISABLED); Assertions.assertThat(adminPeers.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } private Collection peerList() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java index 697bfac10..373bbbf4b 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java @@ -63,6 +63,6 @@ public class EthBlockNumberTest { new JsonRpcSuccessResponse(request.getRequest().getId(), Quantity.create(headBlockNumber)); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java index b2a600f1a..2425b4299 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java @@ -50,7 +50,7 @@ public class EthChainIdTest { final JsonRpcResponse response = method.response(request()); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -60,7 +60,7 @@ public class EthChainIdTest { final JsonRpcResponse response = method.response(request()); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext request() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java index 106ce8006..ddd0b7d4a 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java @@ -64,7 +64,7 @@ public class EthCoinbaseTest { when(miningCoordinator.getCoinbase()).thenReturn(Optional.of(expectedAddress)); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(miningCoordinator).getCoinbase(); verifyNoMoreInteractions(miningCoordinator); } @@ -77,7 +77,7 @@ public class EthCoinbaseTest { when(miningCoordinator.getCoinbase()).thenReturn(Optional.empty()); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java index ed79714b4..00b5eb74c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java @@ -89,7 +89,7 @@ public class EthGasPriceTest { .thenAnswer(invocation -> createEmptyBlock(invocation.getArgument(0, Long.class))); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(miningCoordinator).getMinTransactionGasPrice(); verifyNoMoreInteractions(miningCoordinator); @@ -111,7 +111,7 @@ public class EthGasPriceTest { .thenAnswer(invocation -> createFakeBlock(invocation.getArgument(0, Long.class))); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verifyNoMoreInteractions(miningCoordinator); @@ -132,7 +132,7 @@ public class EthGasPriceTest { .thenAnswer(invocation -> createFakeBlock(invocation.getArgument(0, Long.class))); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verifyNoMoreInteractions(miningCoordinator); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java index a3631e9cc..444badfdb 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java @@ -100,7 +100,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); verify(filterManager).blockChanges(eq("0x1")); verify(filterManager).pendingTransactionChanges(eq("0x1")); verify(filterManager).logsChanges(eq("0x1")); @@ -117,7 +117,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -129,7 +129,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -144,7 +144,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -157,7 +157,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -172,7 +172,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -187,7 +187,7 @@ public class EthGetFilterChangesTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java index ec014aa91..5446cdde2 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java @@ -96,7 +96,7 @@ public class EthGetFilterLogsTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -108,7 +108,7 @@ public class EthGetFilterLogsTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -120,7 +120,7 @@ public class EthGetFilterLogsTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithFilterId(final Object... filterId) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java index a68c51936..37a017d5c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java @@ -126,7 +126,7 @@ public class EthGetUncleByBlockHashAndIndexTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -141,7 +141,7 @@ public class EthGetUncleByBlockHashAndIndexTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private BlockResult blockResult(final BlockHeader header) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java index f20f85b34..664324a5b 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java @@ -102,7 +102,7 @@ public class EthGetUncleByBlockNumberAndIndexTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java index 67e71b555..ca9d4b221 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java @@ -77,7 +77,7 @@ public class EthGetWorkTest { when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values)); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -101,7 +101,7 @@ public class EthGetWorkTest { when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values)); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -128,7 +128,7 @@ public class EthGetWorkTest { when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values)); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -139,7 +139,7 @@ public class EthGetWorkTest { when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.empty()); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java index 915be2cf7..d4ada3f27 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java @@ -57,7 +57,7 @@ public class EthHashrateTest { when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.of(12L)); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -68,7 +68,7 @@ public class EthHashrateTest { when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.empty()); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java index c75257346..c118e0c7b 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java @@ -57,7 +57,7 @@ public class EthMiningTest { when(miningCoordinator.isMining()).thenReturn(true); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(miningCoordinator).isMining(); verifyNoMoreInteractions(miningCoordinator); } @@ -70,7 +70,7 @@ public class EthMiningTest { when(miningCoordinator.isMining()).thenReturn(false); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(miningCoordinator).isMining(); verifyNoMoreInteractions(miningCoordinator); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java index da5e25189..082873e56 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java @@ -56,7 +56,7 @@ public class EthNewBlockFilterTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(request.getRequest().getId(), "0x0"); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(filterManager).installBlockFilter(); verifyNoMoreInteractions(filterManager); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java index 0b0ca4de2..2102add6c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java @@ -100,7 +100,7 @@ public class EthNewFilterTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(filterManager) .installLogFilter( refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery)); @@ -119,7 +119,7 @@ public class EthNewFilterTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(filterManager) .installLogFilter( refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery)); @@ -138,7 +138,7 @@ public class EthNewFilterTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(filterManager) .installLogFilter( refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery)); @@ -159,7 +159,7 @@ public class EthNewFilterTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(filterManager) .installLogFilter( refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery)); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java index 9117ac702..1c0a19fe3 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java @@ -49,7 +49,7 @@ public class EthProtocolVersionTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(request.getRequest().getId(), "0x3f"); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -63,7 +63,7 @@ public class EthProtocolVersionTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(request.getRequest().getId(), null); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -77,7 +77,7 @@ public class EthProtocolVersionTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(request.getRequest().getId(), "0x3f"); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java index 73a97c9d5..b8ec5d2f3 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java @@ -60,7 +60,7 @@ public class EthSendRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -73,7 +73,7 @@ public class EthSendRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -87,7 +87,7 @@ public class EthSendRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -103,7 +103,7 @@ public class EthSendRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -122,7 +122,7 @@ public class EthSendRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(transactionPool).addLocalTransaction(any(Transaction.class)); } @@ -196,7 +196,7 @@ public class EthSendRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(transactionPool).addLocalTransaction(any(Transaction.class)); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java index 465654059..7f0f5fad0 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java @@ -51,6 +51,6 @@ public class EthSendTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java index 01b6c54c0..b63bcc849 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java @@ -66,7 +66,7 @@ public class EthSubmitWorkTest { final JsonRpcResponse actualResponse = method.response(request); final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.NO_MINING_WORK_FOUND); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -112,7 +112,7 @@ public class EthSubmitWorkTest { when(miningCoordinator.submitWork(expectedFirstOutput)).thenReturn(true); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -123,7 +123,7 @@ public class EthSubmitWorkTest { when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.empty()); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext requestWithParams(final Object... params) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java index aa818e551..1f3db3ab3 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java @@ -63,7 +63,7 @@ public class EthSyncingTest { when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(synchronizer).getSyncStatus(); verifyNoMoreInteractions(synchronizer); } @@ -80,7 +80,7 @@ public class EthSyncingTest { when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(synchronizer).getSyncStatus(); verifyNoMoreInteractions(synchronizer); } @@ -97,7 +97,7 @@ public class EthSyncingTest { when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus); final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(synchronizer).getSyncStatus(); verifyNoMoreInteractions(synchronizer); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java index 8ea03df14..826f4aac2 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java @@ -81,7 +81,8 @@ public class NetEnodeTest { new JsonRpcSuccessResponse(request.getRequest().getId(), enodeURL.get().toString()); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } @Test @@ -93,7 +94,8 @@ public class NetEnodeTest { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.P2P_DISABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } @Test @@ -107,7 +109,8 @@ public class NetEnodeTest { request.getRequest().getId(), JsonRpcError.P2P_NETWORK_NOT_RUNNING); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } private JsonRpcRequestContext netEnodeRequest() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java index fc0e3e216..4660ddf28 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java @@ -52,7 +52,8 @@ public class NetListeningTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, true); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } @Test @@ -63,7 +64,8 @@ public class NetListeningTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, false); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java index 553e26b79..d80e40233 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java @@ -49,7 +49,7 @@ public class NetVersionTest { final JsonRpcResponse response = method.response(request()); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -59,7 +59,7 @@ public class NetVersionTest { final JsonRpcResponse response = method.response(request()); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext request() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java index 8839aa3a6..b23396857 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java @@ -54,6 +54,6 @@ public class RpcModulesTest { new JsonRpcSuccessResponse(request.getRequest().getId(), ImmutableMap.of("debug", "1.0")); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java index 5e9428ab6..833ceb1a0 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java @@ -46,6 +46,6 @@ public class Web3ClientVersionTest { new JsonRpcSuccessResponse(request.getRequest().getId(), CLIENT_VERSION); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java index ffb068478..724171146 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java @@ -46,7 +46,7 @@ public class Web3Sha3Test { "0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad"); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -60,7 +60,7 @@ public class Web3Sha3Test { "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -73,7 +73,7 @@ public class Web3Sha3Test { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -86,7 +86,7 @@ public class Web3Sha3Test { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -99,7 +99,7 @@ public class Web3Sha3Test { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -112,7 +112,7 @@ public class Web3Sha3Test { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -126,7 +126,7 @@ public class Web3Sha3Test { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -138,6 +138,6 @@ public class Web3Sha3Test { new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS); final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java index a24d9c915..9df4e5688 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java @@ -82,7 +82,7 @@ public class MinerSetCoinbaseTest { final JsonRpcResponse response = method.response(request); verify(miningCoordinator).setCoinbase(eq(Address.fromHexString("0x0"))); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -99,7 +99,7 @@ public class MinerSetCoinbaseTest { .setCoinbase(any()); final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext minerSetCoinbaseRequest(final String hexString) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java index af94e9669..e4eb3c237 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java @@ -59,6 +59,6 @@ public class MinerSetEtherbaseTest { method.response(request); final JsonRpcRequestContext delegatedRequest = requestCaptor.getValue(); - assertThat(delegatedRequest).isEqualToComparingFieldByField(request); + assertThat(delegatedRequest).usingRecursiveComparison().isEqualTo(request); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java index 66dab3707..eb09f5f66 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java @@ -58,7 +58,7 @@ public class MinerStartTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -69,7 +69,7 @@ public class MinerStartTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -82,7 +82,7 @@ public class MinerStartTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext minerStart() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java index aeb23886e..f5c443d3a 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java @@ -54,7 +54,7 @@ public class MinerStopTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -65,7 +65,7 @@ public class MinerStopTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } private JsonRpcRequestContext minerStop() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java index b614da111..2eb4cb038 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java @@ -64,7 +64,7 @@ public class PermAddAccountsToAllowlistTest { JsonRpcResponse actualResponse = method.response(request(accounts)); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -76,7 +76,7 @@ public class PermAddAccountsToAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -88,7 +88,7 @@ public class PermAddAccountsToAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -100,7 +100,7 @@ public class PermAddAccountsToAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -113,7 +113,7 @@ public class PermAddAccountsToAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java index bc6d22c00..f423402b4 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java @@ -65,7 +65,7 @@ public class PermAddAccountsToWhitelistTest { JsonRpcResponse actualResponse = method.response(request(accounts)); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -77,7 +77,7 @@ public class PermAddAccountsToWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -89,7 +89,7 @@ public class PermAddAccountsToWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -101,7 +101,7 @@ public class PermAddAccountsToWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -114,7 +114,7 @@ public class PermAddAccountsToWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java index bbd2cbbda..adc97eed3 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java @@ -83,7 +83,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -99,7 +99,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -114,7 +114,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -129,7 +129,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -144,7 +144,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -157,7 +157,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -173,7 +173,7 @@ public class PermAddNodesToAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -190,7 +190,8 @@ public class PermAddNodesToAllowlistTest { request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } private JsonRpcRequestContext buildRequest(final List enodeList) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java index ea5daf79a..f2b8cbc12 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java @@ -84,7 +84,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -100,7 +100,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -115,7 +115,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -130,7 +130,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -145,7 +145,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -158,7 +158,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -174,7 +174,7 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -191,7 +191,8 @@ public class PermAddNodesToWhitelistTest { request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } private JsonRpcRequestContext buildRequest(final List enodeList) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java index eaeaee4f3..d7ffc872f 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java @@ -60,7 +60,7 @@ public class PermGetAccountsAllowlistTest { JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -71,6 +71,6 @@ public class PermGetAccountsAllowlistTest { JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java index 8e5b794e1..55300293d 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java @@ -61,7 +61,7 @@ public class PermGetAccountsWhitelistTest { JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -72,6 +72,6 @@ public class PermGetAccountsWhitelistTest { JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java index a7d261b84..a9aaead28 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java @@ -76,7 +76,7 @@ public class PermGetNodesAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist(); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -92,7 +92,7 @@ public class PermGetNodesAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist(); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -108,7 +108,8 @@ public class PermGetNodesAllowlistTest { request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } private JsonRpcRequestContext buildRequest() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java index a644e090c..435c5b51c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java @@ -77,7 +77,7 @@ public class PermGetNodesWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist(); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -93,7 +93,7 @@ public class PermGetNodesWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist(); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -109,7 +109,8 @@ public class PermGetNodesWhitelistTest { request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } private JsonRpcRequestContext buildRequest() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java index 5f8174cc1..cbc957aa5 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java @@ -64,7 +64,7 @@ public class PermReloadPermissionsFromFileTest { JsonRpcResponse response = method.response(reloadRequest()); - assertThat(response).isEqualToComparingFieldByField(expectedErrorResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedErrorResponse); } @Test @@ -74,7 +74,7 @@ public class PermReloadPermissionsFromFileTest { verify(accountLocalConfigPermissioningController).reload(); verify(nodeLocalConfigPermissioningController).reload(); - assertThat(response).isEqualToComparingFieldByField(successResponse()); + assertThat(response).usingRecursiveComparison().isEqualTo(successResponse()); } @Test @@ -85,7 +85,7 @@ public class PermReloadPermissionsFromFileTest { JsonRpcResponse response = method.response(reloadRequest()); - assertThat(response).isEqualToComparingFieldByField(expectedErrorResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedErrorResponse); } private JsonRpcSuccessResponse successResponse() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java index 995ecbe01..60d3f7a8f 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java @@ -65,7 +65,7 @@ public class PermRemoveAccountsFromAllowlistTest { JsonRpcResponse actualResponse = method.response(request(accounts)); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -77,7 +77,7 @@ public class PermRemoveAccountsFromAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -89,7 +89,7 @@ public class PermRemoveAccountsFromAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -101,7 +101,7 @@ public class PermRemoveAccountsFromAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -114,7 +114,7 @@ public class PermRemoveAccountsFromAllowlistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java index ba1a79b1b..dd70d9458 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java @@ -66,7 +66,7 @@ public class PermRemoveAccountsFromWhitelistTest { JsonRpcResponse actualResponse = method.response(request(accounts)); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -78,7 +78,7 @@ public class PermRemoveAccountsFromWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -90,7 +90,7 @@ public class PermRemoveAccountsFromWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -102,7 +102,7 @@ public class PermRemoveAccountsFromWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test @@ -115,7 +115,7 @@ public class PermRemoveAccountsFromWhitelistTest { JsonRpcResponse actualResponse = method.response(request(new ArrayList<>())); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java index f96526d15..650c8c8e3 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java @@ -82,7 +82,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -97,7 +97,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -110,7 +110,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -126,7 +126,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -141,7 +141,8 @@ public class PermRemoveNodesFromAllowlistTest { request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } @Test @@ -156,7 +157,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -171,7 +172,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -187,7 +188,7 @@ public class PermRemoveNodesFromAllowlistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } private JsonRpcRequestContext buildRequest(final List enodeList) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java index f0dcde3de..2b1cb7d4d 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java @@ -83,7 +83,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -98,7 +98,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -111,7 +111,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -127,7 +127,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any()); verifyNoMoreInteractions(nodeLocalConfigPermissioningController); @@ -142,7 +142,8 @@ public class PermRemoveNodesFromWhitelistTest { request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED); Assertions.assertThat(method.response(request)) - .isEqualToComparingFieldByField(expectedResponse); + .usingRecursiveComparison() + .isEqualTo(expectedResponse); } @Test @@ -157,7 +158,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -172,7 +173,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } @Test @@ -188,7 +189,7 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse actual = method.response(request); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + assertThat(actual).usingRecursiveComparison().isEqualTo(expected); } private JsonRpcRequestContext buildRequest(final List enodeList) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java index d421294b3..73521ce66 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java @@ -59,8 +59,7 @@ public class FilterParameterTest { final FilterParameter parsedFilterParameter = request.getRequiredParameter(0, FilterParameter.class); - assertThat(parsedFilterParameter) - .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter); + assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter); } @Test @@ -74,8 +73,7 @@ public class FilterParameterTest { final FilterParameter parsedFilterParameter = request.getRequiredParameter(0, FilterParameter.class); - assertThat(parsedFilterParameter) - .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter); + assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter); } @Test @@ -94,8 +92,7 @@ public class FilterParameterTest { final FilterParameter parsedFilterParameter = request.getRequiredParameter(0, FilterParameter.class); - assertThat(parsedFilterParameter) - .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter); + assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter); } @Test @@ -114,8 +111,7 @@ public class FilterParameterTest { final FilterParameter parsedFilterParameter = request.getRequiredParameter(0, FilterParameter.class); - assertThat(parsedFilterParameter) - .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter); + assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter); } @Test @@ -137,8 +133,7 @@ public class FilterParameterTest { final FilterParameter parsedFilterParameter = request.getRequiredParameter(0, FilterParameter.class); - assertThat(parsedFilterParameter) - .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter); + assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter); } @Test @@ -195,7 +190,8 @@ public class FilterParameterTest { assertThat(parsedFilterParameterUsingAlias.isValid()).isFalse(); assertThat(parsedFilterParameter) - .isEqualToComparingFieldByField(parsedFilterParameterUsingAlias); + .usingRecursiveComparison() + .isEqualTo(parsedFilterParameterUsingAlias); } @Test @@ -236,7 +232,8 @@ public class FilterParameterTest { // blockhash and blockHash should end up the same assertThat(parsedFilterParameter) - .isEqualToComparingFieldByField(parsedFilterParameterUsingAlias); + .usingRecursiveComparison() + .isEqualTo(parsedFilterParameterUsingAlias); } @Test @@ -248,7 +245,8 @@ public class FilterParameterTest { "{\"address\":\"0x8CdaF0CD259887258Bc13a92C0a6dA92698644C0\",\"fromBlock\":\"earliest\",\"toBlock\":\"latest\",\"topics\":[\"0x492e34c7da2a87c57444aa0f6143558999bceec63065f04557cfb20932e0d591\"]}"; assertThat(readJsonAsFilterParameter(jsonWithTopicsFirst)) - .isEqualToComparingFieldByFieldRecursively(readJsonAsFilterParameter(jsonWithTopicsLast)); + .usingRecursiveComparison() + .isEqualTo(readJsonAsFilterParameter(jsonWithTopicsLast)); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/goquorum/GoQuorumSendRawPrivateTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/goquorum/GoQuorumSendRawPrivateTransactionTest.java index ea62d042f..b3edaddc0 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/goquorum/GoQuorumSendRawPrivateTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/goquorum/GoQuorumSendRawPrivateTransactionTest.java @@ -158,7 +158,7 @@ public class GoQuorumSendRawPrivateTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verifyNoInteractions(transactionPool); } @@ -223,7 +223,7 @@ public class GoQuorumSendRawPrivateTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(transactionPool).addLocalTransaction(any(Transaction.class)); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java index 4bb5dab93..eac8a73d1 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java @@ -103,7 +103,7 @@ public class PrivCallTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByField(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); verify(privacyController).simulatePrivateTransaction(any(), any(), any(), anyLong()); } @@ -120,7 +120,7 @@ public class PrivCallTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); verify(privacyController) .simulatePrivateTransaction(any(), any(), eq(callParameter), anyLong()); } @@ -134,7 +134,7 @@ public class PrivCallTest { final JsonRpcResponse response = method.response(request); - assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse); + assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse); verify(privacyController) .simulatePrivateTransaction(any(), any(), eq(callParameter()), anyLong()); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java index e3c7e938d..3619e5812 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java @@ -94,7 +94,7 @@ public class PrivDistributeRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); verify(privacyController) .createPrivateMarkerTransactionPayload( any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY), any()); @@ -123,6 +123,6 @@ public class PrivDistributeRawTransactionTest { final JsonRpcResponse actualResponse = method.response(request); - assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse); + assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java index 184a529e2..4da11b4a1 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java @@ -87,7 +87,7 @@ public class PrivFindPrivacyGroupTest { (JsonRpcSuccessResponse) privFindPrivacyGroup.response(request); final List result = (List) response.getResult(); assertThat(result).hasSize(1); - assertThat(result.get(0)).isEqualToComparingFieldByField(privacyGroup); + assertThat(result.get(0)).usingRecursiveComparison().isEqualTo(privacyGroup); verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java index 69cac349b..3f41e14b7 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java @@ -85,7 +85,7 @@ public class PrivGetPrivateTransactionTest { final JsonRpcRequestContext request = createRequestContext(); final PrivateTransactionResult result = makeRequest(request); - assertThat(result).isEqualToComparingFieldByField(expectedResult); + assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult); } @Test @@ -104,7 +104,7 @@ public class PrivGetPrivateTransactionTest { final JsonRpcRequestContext request = createRequestContext(); final PrivateTransactionResult result = makeRequest(request); - assertThat(result).isEqualToComparingFieldByField(expectedResult); + assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java index 0de1b780a..5cc220755 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java @@ -100,7 +100,7 @@ public class PrivGetTransactionReceiptTest { final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); - assertThat(result).isEqualToComparingFieldByField(expectedResult); + assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult); } @Test @@ -121,7 +121,7 @@ public class PrivGetTransactionReceiptTest { final PrivateTransactionReceiptResult result = (PrivateTransactionReceiptResult) response.getResult(); - assertThat(result).isEqualToComparingFieldByField(expectedResult); + assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroupTest.java index a1345e9a3..0ae1d92bd 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroupTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroupTest.java @@ -89,7 +89,7 @@ public class PrivxFindOnchainPrivacyGroupTest { (JsonRpcSuccessResponse) privxFindOnchainPrivacyGroup.response(request); final List result = (List) response.getResult(); assertThat(result).hasSize(1); - assertThat(result.get(0)).isEqualToComparingFieldByField(privacyGroup); + assertThat(result.get(0)).usingRecursiveComparison().isEqualTo(privacyGroup); verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java index c37bcfead..c3a6b2c4b 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java @@ -53,7 +53,7 @@ public class SubscriptionBuilderTest { final Subscription builtSubscription = subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest); - assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription); + assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription); } @Test @@ -76,7 +76,7 @@ public class SubscriptionBuilderTest { final Subscription builtSubscription = subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest); - assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription); + assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription); } @Test @@ -89,7 +89,7 @@ public class SubscriptionBuilderTest { final Subscription builtSubscription = subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest); - assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription); + assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription); } @Test @@ -102,7 +102,7 @@ public class SubscriptionBuilderTest { final Subscription builtSubscription = subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest); - assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription); + assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription); } @Test @@ -115,7 +115,7 @@ public class SubscriptionBuilderTest { final Subscription builtSubscription = subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest); - assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription); + assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription); } @Test diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java index 379eff8bf..c2ae3c609 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java @@ -189,8 +189,7 @@ public class SubscriptionRequestMapperTest { final SubscribeRequest subscribeRequest = mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)); - assertThat(subscribeRequest) - .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest); + assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest); } @Test @@ -225,8 +224,7 @@ public class SubscriptionRequestMapperTest { final SubscribeRequest subscribeRequest = mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)); - assertThat(subscribeRequest) - .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest); + assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest); } @Test @@ -260,8 +258,7 @@ public class SubscriptionRequestMapperTest { final SubscribeRequest subscribeRequest = mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)); - assertThat(subscribeRequest) - .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest); + assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest); } @Test @@ -289,8 +286,7 @@ public class SubscriptionRequestMapperTest { final SubscribeRequest subscribeRequest = mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)); - assertThat(subscribeRequest) - .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest); + assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest); } @Test @@ -419,8 +415,7 @@ public class SubscriptionRequestMapperTest { mapper.mapPrivateSubscribeRequest( new JsonRpcRequestContext(jsonRpcRequest), ENCLAVE_PUBLIC_KEY); - assertThat(subscribeRequest) - .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest); + assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest); } @Test diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java index 10a466ed4..d18ca0585 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java @@ -88,7 +88,8 @@ public class MainnetTransactionProcessorTest { ImmutableTransactionValidationParams.builder().build()); assertThat(txValidationParamCaptor.getValue()) - .isEqualToComparingFieldByField(expectedValidationParams); + .usingRecursiveComparison() + .isEqualTo(expectedValidationParams); } private ArgumentCaptor transactionValidationParamCaptor() { diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java index c6174ddec..f710c3b34 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java @@ -159,7 +159,7 @@ public class MultiTenancyPrivacyControllerTest { final PrivacyGroup privacyGroup = multiTenancyPrivacyController.createPrivacyGroup( addresses, "name", "description", ENCLAVE_PUBLIC_KEY1); - assertThat(privacyGroup).isEqualToComparingFieldByField(delegatePrivacyGroup); + assertThat(privacyGroup).usingRecursiveComparison().isEqualTo(delegatePrivacyGroup); verify(privacyController) .createPrivacyGroup(addresses, "name", "description", ENCLAVE_PUBLIC_KEY1); } @@ -208,7 +208,7 @@ public class MultiTenancyPrivacyControllerTest { final PrivacyGroup[] privacyGroups = multiTenancyPrivacyController.findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1); assertThat(privacyGroups).hasSize(1); - assertThat(privacyGroups[0]).isEqualToComparingFieldByField(privacyGroup); + assertThat(privacyGroups[0]).usingRecursiveComparison().isEqualTo(privacyGroup); verify(privacyController).findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1); } diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyControllerTest.java index 50fd77349..66a4b1775 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyControllerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyControllerTest.java @@ -204,7 +204,7 @@ public class OnchainPrivacyControllerTest { final List privacyGroups = List.of(privacyController.findPrivacyGroupByMembers(PRIVACY_GROUP_ADDRESSES, ADDRESS1)); assertThat(privacyGroups).hasSize(1); - assertThat(privacyGroups.get(0)).isEqualToComparingFieldByField(EXPECTED_PRIVACY_GROUP); + assertThat(privacyGroups.get(0)).usingRecursiveComparison().isEqualTo(EXPECTED_PRIVACY_GROUP); verify(privateStateStorage).getPrivacyGroupHeadBlockMap(any()); verify(privateTransactionSimulator).process(any(), any()); } @@ -294,7 +294,7 @@ public class OnchainPrivacyControllerTest { final Optional privacyGroupFound = privacyController.findPrivacyGroupByGroupId(PRIVACY_GROUP_ID, ADDRESS1); assertThat(privacyGroupFound).isPresent(); - assertThat(privacyGroupFound.get()).isEqualToComparingFieldByField(privacyGroup); + assertThat(privacyGroupFound.get()).usingRecursiveComparison().isEqualTo(privacyGroup); } @Test diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java index db7d49db0..44d0edd83 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java @@ -201,7 +201,7 @@ public class RestrictedDefaultPrivacyControllerTest { PRIVACY_GROUP_DESCRIPTION, ENCLAVE_PUBLIC_KEY); - assertThat(privacyGroup).isEqualToComparingFieldByField(enclavePrivacyGroupResponse); + assertThat(privacyGroup).usingRecursiveComparison().isEqualTo(enclavePrivacyGroupResponse); verify(enclave) .createPrivacyGroup( PRIVACY_GROUP_ADDRESSES, @@ -235,7 +235,7 @@ public class RestrictedDefaultPrivacyControllerTest { final PrivacyGroup[] privacyGroups = privacyController.findPrivacyGroupByMembers(PRIVACY_GROUP_ADDRESSES, ENCLAVE_PUBLIC_KEY); assertThat(privacyGroups).hasSize(1); - assertThat(privacyGroups[0]).isEqualToComparingFieldByField(privacyGroup); + assertThat(privacyGroups[0]).usingRecursiveComparison().isEqualTo(privacyGroup); verify(enclave).findPrivacyGroup(PRIVACY_GROUP_ADDRESSES); } diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java index cc67b3256..adb00e7bf 100644 --- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java @@ -681,7 +681,8 @@ public class TransactionPoolTest { transactionPool.addLocalTransaction(transaction1); assertThat(txValidationParamCaptor.getValue()) - .isEqualToComparingFieldByField(expectedValidationParams); + .usingRecursiveComparison() + .isEqualTo(expectedValidationParams); } @Test diff --git a/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java index b4e111f9e..6bed06c1a 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java +++ b/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java @@ -97,7 +97,7 @@ public final class DockerNatManagerTest { p2pPort, p2pPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } @Test @@ -116,7 +116,7 @@ public final class DockerNatManagerTest { rpcHttpPort, rpcHttpPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } @Test @@ -135,6 +135,6 @@ public final class DockerNatManagerTest { p2pPort, p2pPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } } diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java index aaac57741..2065510ea 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java +++ b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java @@ -114,7 +114,7 @@ public final class KubernetesClusterIpNatManagerTest { p2pPort, p2pPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } @Test @@ -133,7 +133,7 @@ public final class KubernetesClusterIpNatManagerTest { rpcHttpPort, rpcHttpPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } @Test @@ -152,6 +152,6 @@ public final class KubernetesClusterIpNatManagerTest { p2pPort, p2pPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } } diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java index c2ddbface..a997041aa 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java +++ b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java @@ -123,7 +123,7 @@ public final class KubernetesLoadManagerNatManagerTest { p2pPort, p2pPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } @Test @@ -142,7 +142,7 @@ public final class KubernetesLoadManagerNatManagerTest { rpcHttpPort, rpcHttpPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } @Test @@ -161,6 +161,6 @@ public final class KubernetesLoadManagerNatManagerTest { p2pPort, p2pPort); - assertThat(mapping).isEqualToComparingFieldByField(expectedMapping); + assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping); } }