Skip to content
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

crypto migrate to junit 5 #6234

Merged
merged 4 commits into from
Dec 6, 2023
Merged

crypto migrate to junit 5 #6234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b37998d
migrate to junit5
macfarla Dec 5, 2023
0eec3ab
Merge branch 'main' into crypto-junit-5
macfarla Dec 6, 2023
a48fd91
Merge branch 'main' into crypto-junit-5
macfarla Dec 6, 2023
425e8df
Merge branch 'main' into crypto-junit-5
macfarla Dec 6, 2023
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
1 change: 0 additions & 1 deletion crypto/algorithms/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies {
implementation 'org.hyperledger.besu:blake2bf'
implementation 'com.google.guava:guava'

testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'

Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.security.spec.ECPoint;

import org.apache.tuweni.bytes.Bytes;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class ECPointUtilTest {

Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/HashTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import org.apache.tuweni.bytes.Bytes;
import org.bouncycastle.util.encoders.Hex;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class HashTest {

Expand Down
6 changes: 3 additions & 3 deletions crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import org.bouncycastle.asn1.x9.X9ECParameters;
import org.bouncycastle.crypto.params.ECDomainParameters;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

public class KeyPairTest {
public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
Expand All @@ -39,7 +39,7 @@ public class KeyPairTest {
public static KeyPairGenerator keyPairGenerator;
public static ECDomainParameters curve;

@BeforeClass
@BeforeAll
public static void setUp() {
Security.addProvider(new BouncyCastleProvider());

Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import java.io.File;

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

public class KeyPairUtilTest {

Expand Down
10 changes: 5 additions & 5 deletions crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class SECP256K1Test {

Expand All @@ -39,15 +39,15 @@ public class SECP256K1Test {
protected static String suiteStartTime = null;
protected static String suiteName = null;

@BeforeClass
@BeforeAll
public static void setTestSuiteStartTime() {
suiteStartTime =
LocalDateTime.now(ZoneId.systemDefault())
.format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
suiteName(SECP256K1Test.class);
}

@Before
@BeforeEach
public void setUp() {
secp256K1 = new SECP256K1();
}
Expand Down
10 changes: 5 additions & 5 deletions crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256R1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class SECP256R1Test {

Expand Down Expand Up @@ -103,7 +103,7 @@ public class SECP256R1Test {
protected static String suiteStartTime = null;
protected static String suiteName = null;

@BeforeClass
@BeforeAll
public static void setTestSuiteStartTime() {
suiteStartTime =
LocalDateTime.now(ZoneId.systemDefault())
Expand All @@ -113,7 +113,7 @@ public static void setTestSuiteStartTime() {
SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create("secp256r1"));
}

@Before
@BeforeEach
public void setUp() {
secp256R1 = new SECP256R1();
}
Expand Down
6 changes: 3 additions & 3 deletions crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPrivateKeyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.bouncycastle.asn1.sec.SECNamedCurves;
import org.bouncycastle.asn1.x9.X9ECParameters;
import org.bouncycastle.crypto.params.ECDomainParameters;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

public class SECPPrivateKeyTest {
public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
Expand All @@ -40,7 +40,7 @@ public class SECPPrivateKeyTest {
protected static String suiteName = null;
public static ECDomainParameters curve;

@BeforeClass
@BeforeAll
public static void setUp() {
suiteStartTime =
LocalDateTime.now(ZoneId.systemDefault())
Expand Down
6 changes: 3 additions & 3 deletions crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPublicKeyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
import org.bouncycastle.asn1.sec.SECNamedCurves;
import org.bouncycastle.asn1.x9.X9ECParameters;
import org.bouncycastle.crypto.params.ECDomainParameters;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class SECPPublicKeyTest {
public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
public static final String CURVE_NAME = "secp256k1";

public ECDomainParameters curve;

@Before
@BeforeEach
public void setUp() {
final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
Expand Down
6 changes: 3 additions & 3 deletions crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPSignatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
import org.bouncycastle.asn1.sec.SECNamedCurves;
import org.bouncycastle.asn1.x9.X9ECParameters;
import org.bouncycastle.crypto.params.ECDomainParameters;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

public class SECPSignatureTest {
public static final String CURVE_NAME = "secp256k1";

public static BigInteger curveOrder;

@BeforeClass
@BeforeAll
public static void setUp() {
final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
final ECDomainParameters curve =
Expand Down
6 changes: 3 additions & 3 deletions ...o/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;

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

public class SignatureAlgorithmFactoryTest {

@Before
@BeforeEach
public void setUp() {
SignatureAlgorithmFactory.resetInstance();
}
Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

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

public class SignatureAlgorithmTypeTest {
@Test
Expand Down
2 changes: 1 addition & 1 deletion ...algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.math.BigInteger;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
2 changes: 1 addition & 1 deletion .../algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.math.BigInteger;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
2 changes: 1 addition & 1 deletion ...o/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.math.BigInteger;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.math.BigInteger;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import static org.assertj.core.api.Assertions.assertThat;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.math.BigInteger;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
2 changes: 1 addition & 1 deletion crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.math.BigInteger;

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

/**
* Adapted from the pc_ecc (Apache 2 License) implementation:
Expand Down
Loading