From d5a18433e62a5cab978f3cf4cc0f84f947d9edec Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Mon, 28 Nov 2022 15:57:23 +1100 Subject: [PATCH] Removing deprecated method (#4741) * Replace deprecated method * Ignore field Signed-off-by: Gabriel Fukushima --- .../besu/cli/options/AbstractCLIOptionsTest.java | 10 ++++++++-- .../besu/cli/options/NetworkingOptionsTest.java | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) 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 5f85a62e33b..91d7e35c39c 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 @@ -42,7 +42,10 @@ private void fromDomainObject(final D domainObject) { final List fieldsToIgnore = getFieldsToIgnore(); final String[] ignored = fieldsToIgnore.toArray(new String[0]); - assertThat(domainObjectFromOptions).isEqualToIgnoringGivenFields(domainObject, ignored); + assertThat(domainObjectFromOptions) + .usingRecursiveComparison() + .ignoringFields(ignored) + .isEqualTo(domainObject); } @Test @@ -78,7 +81,10 @@ public void defaultValues() { // Check default values supplied by CLI match expected default values final String[] fieldsToIgnore = getFieldsWithComputedDefaults().toArray(new String[0]); - assertThat(optionsFromCommand).isEqualToIgnoringGivenFields(defaultOptions, fieldsToIgnore); + assertThat(optionsFromCommand) + .usingRecursiveComparison() + .ignoringFields(fieldsToIgnore) + .isEqualTo(defaultOptions); } abstract D createDefaultDomainObject(); diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java index 747b4021196..383f36c504e 100644 --- a/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java @@ -21,6 +21,9 @@ import org.hyperledger.besu.cli.options.unstable.NetworkingOptions; import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import java.util.Arrays; +import java.util.List; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; @@ -212,4 +215,9 @@ NetworkingOptions optionsFromDomainObject(final NetworkingConfiguration domainOb NetworkingOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) { return besuCommand.getNetworkingOptions(); } + + @Override + protected List getFieldsToIgnore() { + return Arrays.asList("rlpx.peerLowerBound"); + } }