Skip to content

migrate clique tests fully to junit5 #6362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macfarla merged 2 commits into from
Jan 8, 2024
Merged

migrate clique tests fully to junit5 #6362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6b06ba
migrate clique tests fully to junit5
macfarla Jan 7, 2024
a85a345
junit5
macfarla Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...est/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
*/
package org.hyperledger.besu.tests.acceptance.clique;

import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBaseJunit5;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;

import java.io.IOException;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public class CliqueDiscardRpcAcceptanceTest extends AcceptanceTestBase {
public class CliqueDiscardRpcAcceptanceTest extends AcceptanceTestBaseJunit5 {

@Test
public void shouldDiscardVotes() throws IOException {
Expand Down
14 changes: 7 additions & 7 deletions ...tance/clique/CliqueGetSignersRpcTest.java → ...ue/CliqueGetSignersRpcAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;

import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBaseJunit5;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;

import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

@Ignore
public class CliqueGetSignersRpcTest extends AcceptanceTestBase {
@Disabled("flaky test due to hardcoded block numbers")
public class CliqueGetSignersRpcAcceptanceTest extends AcceptanceTestBaseJunit5 {
private BesuNode minerNode1;
private BesuNode minerNode2;

@Before
@BeforeEach
public void setUp() throws Exception {
final String[] validators = {"miner1"};
minerNode1 = besu.createCliqueNodeWithValidators("miner1", validators);
Expand Down
6 changes: 3 additions & 3 deletions ...rc/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
*/
package org.hyperledger.besu.tests.acceptance.clique;

import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBaseJunit5;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory.CliqueOptions;

import java.io.IOException;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public class CliqueMiningAcceptanceTest extends AcceptanceTestBase {
public class CliqueMiningAcceptanceTest extends AcceptanceTestBaseJunit5 {

@Test
public void shouldMineTransactionsOnSingleNode() throws IOException {
Expand Down
6 changes: 3 additions & 3 deletions ...st/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
*/
package org.hyperledger.besu.tests.acceptance.clique;

import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBaseJunit5;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;

import java.io.IOException;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public class CliqueProposalRpcAcceptanceTest extends AcceptanceTestBase {
public class CliqueProposalRpcAcceptanceTest extends AcceptanceTestBaseJunit5 {

@Test
public void shouldReturnProposals() throws IOException {
Expand Down
6 changes: 3 additions & 3 deletions ...est/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
*/
package org.hyperledger.besu.tests.acceptance.clique;

import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBaseJunit5;
import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;

import java.io.IOException;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBase {
public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBaseJunit5 {

@Test
public void shouldAddValidators() throws IOException {
Expand Down
6 changes: 3 additions & 3 deletions ...ceptance/clique/CliqueZeroValidators.java → ...e/CliqueZeroValidatorsAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
*/
package org.hyperledger.besu.tests.acceptance.clique;

import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBaseJunit5;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;

import java.io.IOException;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public class CliqueZeroValidators extends AcceptanceTestBase {
public class CliqueZeroValidatorsAcceptanceTest extends AcceptanceTestBaseJunit5 {

@Test
public void zeroValidatorsFormValidCluster() throws IOException {
Expand Down