Skip to content

Commit e7bda9e

Browse files
authored
Remove dryRunDetector workaround methods from unit tests (besu-eth#10201)
* Remove dryRunDetector workaround methods from unit tests The dryRunDetector methods were added as a workaround for a Gradle issue that prevented @ParameterizedTest classes from being selected when running with --dry-run. Since the issue is fixed and --dry-run is no longer used, these methods are no longer needed. Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Remove dryRunDetector workaround from acceptance tests too The Gradle issue is confirmed fixed, so the workaround is no longer needed anywhere, including acceptance tests. Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
1 parent 268e098 commit e7bda9e

File tree

90 files changed

+0
-768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+0
-768
lines changed

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import org.awaitility.Awaitility;
6363
import org.junit.jupiter.api.AfterEach;
6464
import org.junit.jupiter.api.BeforeEach;
65-
import org.junit.jupiter.api.Test;
6665
import org.junit.jupiter.api.TestInfo;
6766
import org.junit.jupiter.api.extension.ExtendWith;
6867
import org.slf4j.Logger;
@@ -210,11 +209,4 @@ protected void waitForFile(final Path path) {
210209
}
211210
});
212211
}
213-
214-
@Test
215-
public void dryRunDetector() {
216-
assertThat(true)
217-
.withFailMessage("This test is here so gradle --dry-run executes this class")
218-
.isTrue();
219-
}
220212
}

acceptance-tests/tests/src/acceptanceTest/java/org/hyperledger/besu/tests/acceptance/jsonrpc/AbstractJsonRpcTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import okhttp3.Request;
4141
import okhttp3.RequestBody;
4242
import okhttp3.Response;
43-
import org.junit.jupiter.api.Test;
4443
import org.junit.jupiter.params.ParameterizedTest;
4544
import org.junit.jupiter.params.provider.Arguments;
4645
import org.junit.jupiter.params.provider.MethodSource;
@@ -148,11 +147,4 @@ public static Stream<Arguments> testCasesFromPath(final String testCasesPath)
148147

149148
return Arrays.stream(testCasesList).sorted().map(File::toURI).map(Arguments::of);
150149
}
151-
152-
@Test
153-
void dryRunDetector() {
154-
assertThat(true)
155-
.withFailMessage("This test is here so gradle --dry-run executes this class")
156-
.isTrue();
157-
}
158150
}

app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949

5050
import com.google.common.collect.Streams;
5151
import org.apache.tuweni.bytes.Bytes;
52-
import org.junit.jupiter.api.Test;
5352
import org.junit.jupiter.api.extension.ExtendWith;
5453
import org.junit.jupiter.params.ParameterizedTest;
5554
import org.junit.jupiter.params.provider.MethodSource;
@@ -207,11 +206,4 @@ public Stream<Long> streamMilestoneBlocks() {
207206
MilestoneStreamingProtocolSchedule::streamMilestoneBlocks);
208207
}
209208
}
210-
211-
@Test
212-
void dryRunDetector() {
213-
assertThat(true)
214-
.withFailMessage("This test is here so gradle --dry-run executes this class")
215-
.isTrue();
216-
}
217209
}

app/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import dagger.Component;
6565
import dagger.Module;
6666
import dagger.Provides;
67-
import org.junit.jupiter.api.Test;
6867
import org.junit.jupiter.api.io.TempDir;
6968
import org.junit.jupiter.params.ParameterizedTest;
7069
import org.junit.jupiter.params.provider.Arguments;
@@ -348,13 +347,6 @@ public void importChain_specialFields(final String consensusEngine) throws IOExc
348347
.hasMessage(
349348
"Some fields (coinbase, extraData) are no longer supported for block import since PoW consensus has been removed");
350349
}
351-
352-
@Test
353-
void dryRunDetector() {
354-
assertThat(true)
355-
.withFailMessage("This test is here so gradle --dry-run executes this class")
356-
.isTrue();
357-
}
358350
}
359351

360352
protected Block getBlockAt(final Blockchain blockchain, final long blockNumber) {

app/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.hyperledger.besu.config.NetworkDefinition;
2121

22-
import org.junit.jupiter.api.Test;
2322
import org.junit.jupiter.params.ParameterizedTest;
2423
import org.junit.jupiter.params.provider.EnumSource;
2524

@@ -42,11 +41,4 @@ void shouldThrowErrorForNonDeprecatedNetworks(final NetworkDefinition network) {
4241
assertThatThrownBy(() -> NetworkDeprecationMessage.generate(network))
4342
.isInstanceOf(AssertionError.class);
4443
}
45-
46-
@Test
47-
void dryRunDetector() {
48-
assertThat(true)
49-
.withFailMessage("This test is here so gradle --dry-run executes this class")
50-
.isTrue();
51-
}
5244
}

consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import java.util.stream.Stream;
2424

25-
import org.junit.jupiter.api.Test;
2625
import org.junit.jupiter.api.extension.ExtensionContext;
2726
import org.junit.jupiter.params.ParameterizedTest;
2827
import org.junit.jupiter.params.provider.Arguments;
@@ -53,11 +52,4 @@ public void test(final long input, final boolean expectedResult) {
5352

5453
assertThat(uut.validate(header, null)).isEqualTo(expectedResult);
5554
}
56-
57-
@Test
58-
void dryRunDetector() {
59-
assertThat(true)
60-
.withFailMessage("This test is here so gradle --dry-run executes this class")
61-
.isTrue();
62-
}
6355
}

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package org.hyperledger.besu.ethereum.api.graphql;
1616

1717
import static com.google.common.base.Preconditions.checkState;
18-
import static org.assertj.core.api.Assertions.assertThat;
1918

2019
import java.io.IOException;
2120
import java.net.URISyntaxException;
@@ -32,7 +31,6 @@
3231
import okhttp3.RequestBody;
3332
import okhttp3.Response;
3433
import org.assertj.core.api.Assertions;
35-
import org.junit.jupiter.api.Test;
3634
import org.junit.jupiter.params.ParameterizedTest;
3735
import org.junit.jupiter.params.provider.Arguments;
3836
import org.junit.jupiter.params.provider.MethodSource;
@@ -86,11 +84,4 @@ private void graphQLCall(final String name) throws IOException {
8684
Assertions.assertThat(resp.code()).isEqualTo(expectedStatusCode);
8785
}
8886
}
89-
90-
@Test
91-
void dryRunDetector() {
92-
assertThat(true)
93-
.withFailMessage("This test is here so gradle --dry-run executes this class")
94-
.isTrue();
95-
}
9687
}

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceParameterizedTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import okhttp3.Response;
2828
import org.junit.jupiter.api.AfterAll;
2929
import org.junit.jupiter.api.BeforeAll;
30-
import org.junit.jupiter.api.Test;
3130
import org.junit.jupiter.params.ParameterizedTest;
3231
import org.junit.jupiter.params.provider.MethodSource;
3332

@@ -61,11 +60,4 @@ public void invalidJsonShouldReturnParseError(final String requestJson) throws E
6160
json, null, expectedError.getCode(), expectedError.getMessage());
6261
}
6362
}
64-
65-
@Test
66-
void dryRunDetector() {
67-
assertThat(true)
68-
.withFailMessage("This test is here so gradle --dry-run executes this class")
69-
.isTrue();
70-
}
7163
}

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcErrorTypeConverterTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.Arrays;
2323
import java.util.Collection;
2424

25-
import org.junit.jupiter.api.Test;
2625
import org.junit.jupiter.params.ParameterizedTest;
2726
import org.junit.jupiter.params.provider.MethodSource;
2827

@@ -80,11 +79,4 @@ public void expectedTransactionValidationToJsonRpcErrorConversion(
8079
assertThat(JsonRpcErrorConverter.convertTransactionInvalidReason(txInvalidReason))
8180
.isEqualTo(expectedJsonRpcError);
8281
}
83-
84-
@Test
85-
void dryRunDetector() {
86-
assertThat(true)
87-
.withFailMessage("This test is here so gradle --dry-run executes this class")
88-
.isTrue();
89-
}
9082
}

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/DebugGethTraceJsonRpcHttpBySpecTest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@
1414
*/
1515
package org.hyperledger.besu.ethereum.api.jsonrpc.bonsai;
1616

17-
import static org.assertj.core.api.Assertions.assertThat;
18-
1917
import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
2018
import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
2119
import org.hyperledger.besu.plugin.services.storage.DataStorageFormat;
2220

23-
import org.junit.jupiter.api.Test;
24-
2521
public class DebugGethTraceJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
2622
@Override
2723
protected void doSetup() throws Exception {
@@ -49,11 +45,4 @@ public static Object[][] specs() {
4945
"debug-geth/specs/4byte-tracer"
5046
});
5147
}
52-
53-
@Test
54-
void dryRunDetector() {
55-
assertThat(true)
56-
.withFailMessage("This test is here so gradle --dry-run executes this class")
57-
.isTrue();
58-
}
5948
}

0 commit comments

Comments
 (0)