Skip to content

Commit 7cae3d4

Browse files
vanitasvitaevanitasvitae
committed
Fix checkstyle issues in test classes
1 parent c642da5 commit 7cae3d4

9 files changed

+122
-28
lines changed

‎pg/src/test/java/org/bouncycastle/openpgp/test/Curve25519PrivateKeyEncodingTest.java

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,28 @@
22

33
import org.bouncycastle.asn1.ASN1OctetString;
44
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
5-
import org.bouncycastle.bcpg.*;
5+
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
66
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
77
import org.bouncycastle.crypto.generators.X25519KeyPairGenerator;
88
import org.bouncycastle.crypto.params.X25519KeyGenerationParameters;
99
import org.bouncycastle.crypto.params.X25519PrivateKeyParameters;
1010
import org.bouncycastle.jcajce.spec.XDHParameterSpec;
1111
import org.bouncycastle.jce.provider.BouncyCastleProvider;
12-
import org.bouncycastle.openpgp.*;
12+
import org.bouncycastle.openpgp.PGPException;
13+
import org.bouncycastle.openpgp.PGPKeyPair;
1314
import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter;
1415
import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair;
1516
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter;
1617
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
1718
import org.bouncycastle.util.Arrays;
1819

1920
import java.io.IOException;
20-
import java.security.*;
21+
import java.security.InvalidAlgorithmParameterException;
22+
import java.security.KeyPair;
23+
import java.security.KeyPairGenerator;
24+
import java.security.NoSuchAlgorithmException;
25+
import java.security.PrivateKey;
26+
import java.security.SecureRandom;
2127
import java.util.Date;
2228

2329
/**
@@ -169,7 +175,8 @@ public boolean containsSubsequence(byte[] sequence, byte[] subsequence)
169175
/**
170176
* Test proper functionality of the {@link #containsSubsequence(byte[], byte[])} method.
171177
*/
172-
private void containsTest() {
178+
private void containsTest()
179+
{
173180
// Make sure our containsSubsequence method functions correctly
174181
byte[] s = new byte[] {0x00, 0x01, 0x02, 0x03};
175182
isTrue(containsSubsequence(s, new byte[] {0x00, 0x01}));

‎pg/src/test/java/org/bouncycastle/openpgp/test/DedicatedEd25519KeyPairTest.java

+24-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
package org.bouncycastle.openpgp.test;
22

3-
import org.bouncycastle.bcpg.*;
3+
import org.bouncycastle.bcpg.Ed25519PublicBCPGKey;
4+
import org.bouncycastle.bcpg.Ed25519SecretBCPGKey;
5+
import org.bouncycastle.bcpg.HashAlgorithmTags;
6+
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
7+
import org.bouncycastle.bcpg.PublicKeyPacket;
48
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
59
import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator;
610
import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
711
import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters;
812
import org.bouncycastle.jcajce.spec.EdDSAParameterSpec;
913
import org.bouncycastle.jce.provider.BouncyCastleProvider;
10-
import org.bouncycastle.openpgp.*;
14+
import org.bouncycastle.openpgp.PGPException;
15+
import org.bouncycastle.openpgp.PGPKeyPair;
16+
import org.bouncycastle.openpgp.PGPPublicKey;
17+
import org.bouncycastle.openpgp.PGPSignature;
18+
import org.bouncycastle.openpgp.PGPSignatureGenerator;
1119
import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
1220
import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
13-
import org.bouncycastle.openpgp.operator.bc.*;
21+
import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
22+
import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder;
23+
import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
24+
import org.bouncycastle.openpgp.operator.bc.BcPGPKeyConverter;
25+
import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair;
1426
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
1527
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
1628
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter;
@@ -20,7 +32,12 @@
2032

2133
import java.io.IOException;
2234
import java.nio.charset.StandardCharsets;
23-
import java.security.*;
35+
import java.security.InvalidAlgorithmParameterException;
36+
import java.security.KeyPair;
37+
import java.security.KeyPairGenerator;
38+
import java.security.NoSuchAlgorithmException;
39+
import java.security.PublicKey;
40+
import java.security.SecureRandom;
2441
import java.util.Date;
2542

2643
public class DedicatedEd25519KeyPairTest
@@ -184,7 +201,9 @@ private void testConversionOfBcKeyPair()
184201
date.getTime(), j2.getPublicKey().getCreationTime().getTime());
185202
}
186203

187-
private void testConversionOfTestVectorKey() throws PGPException, IOException {
204+
private void testConversionOfTestVectorKey()
205+
throws PGPException, IOException
206+
{
188207
JcaPGPKeyConverter jc = new JcaPGPKeyConverter().setProvider(new BouncyCastleProvider());
189208
BcPGPKeyConverter bc = new BcPGPKeyConverter();
190209
// ed25519 public key from https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-13.html#name-hashed-data-stream-for-sign

‎pg/src/test/java/org/bouncycastle/openpgp/test/DedicatedEd448KeyPairTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424

2525
import java.io.IOException;
2626
import java.nio.charset.StandardCharsets;
27-
import java.security.*;
27+
import java.security.InvalidAlgorithmParameterException;
28+
import java.security.KeyPair;
29+
import java.security.KeyPairGenerator;
30+
import java.security.NoSuchAlgorithmException;
31+
import java.security.SecureRandom;
2832
import java.util.Date;
2933

3034
public class DedicatedEd448KeyPairTest

‎pg/src/test/java/org/bouncycastle/openpgp/test/DedicatedX25519KeyPairTest.java

+20-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
import org.bouncycastle.crypto.params.X25519KeyGenerationParameters;
1010
import org.bouncycastle.jcajce.spec.XDHParameterSpec;
1111
import org.bouncycastle.jce.provider.BouncyCastleProvider;
12-
import org.bouncycastle.openpgp.*;
12+
import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
13+
import org.bouncycastle.openpgp.PGPEncryptedDataList;
14+
import org.bouncycastle.openpgp.PGPException;
15+
import org.bouncycastle.openpgp.PGPKeyPair;
16+
import org.bouncycastle.openpgp.PGPLiteralData;
17+
import org.bouncycastle.openpgp.PGPLiteralDataGenerator;
18+
import org.bouncycastle.openpgp.PGPObjectFactory;
19+
import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData;
1320
import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
1421
import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
1522
import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder;
@@ -26,9 +33,17 @@
2633
import org.bouncycastle.util.Arrays;
2734
import org.bouncycastle.util.io.Streams;
2835

29-
import java.io.*;
36+
import java.io.ByteArrayInputStream;
37+
import java.io.ByteArrayOutputStream;
38+
import java.io.IOException;
39+
import java.io.InputStream;
40+
import java.io.OutputStream;
3041
import java.nio.charset.StandardCharsets;
31-
import java.security.*;
42+
import java.security.InvalidAlgorithmParameterException;
43+
import java.security.KeyPair;
44+
import java.security.KeyPairGenerator;
45+
import java.security.NoSuchAlgorithmException;
46+
import java.security.SecureRandom;
3247
import java.util.Date;
3348

3449
public class DedicatedX25519KeyPairTest
@@ -100,7 +115,8 @@ private void testV4MessageEncryptionDecryptionWithJcaKey()
100115
}
101116

102117
private void testV4MessageEncryptionDecryptionWithBcKey()
103-
throws PGPException, IOException {
118+
throws PGPException, IOException
119+
{
104120
Date date = currentTimeRounded();
105121
X25519KeyPairGenerator gen = new X25519KeyPairGenerator();
106122
gen.init(new X25519KeyGenerationParameters(new SecureRandom()));

‎pg/src/test/java/org/bouncycastle/openpgp/test/DedicatedX448KeyPairTest.java

+20-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
import org.bouncycastle.crypto.params.X448KeyGenerationParameters;
1010
import org.bouncycastle.jcajce.spec.XDHParameterSpec;
1111
import org.bouncycastle.jce.provider.BouncyCastleProvider;
12-
import org.bouncycastle.openpgp.*;
12+
import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
13+
import org.bouncycastle.openpgp.PGPEncryptedDataList;
14+
import org.bouncycastle.openpgp.PGPException;
15+
import org.bouncycastle.openpgp.PGPKeyPair;
16+
import org.bouncycastle.openpgp.PGPLiteralData;
17+
import org.bouncycastle.openpgp.PGPLiteralDataGenerator;
18+
import org.bouncycastle.openpgp.PGPObjectFactory;
19+
import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData;
1320
import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
1421
import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
1522
import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder;
@@ -26,9 +33,17 @@
2633
import org.bouncycastle.util.Arrays;
2734
import org.bouncycastle.util.io.Streams;
2835

29-
import java.io.*;
36+
import java.io.ByteArrayInputStream;
37+
import java.io.ByteArrayOutputStream;
38+
import java.io.IOException;
39+
import java.io.InputStream;
40+
import java.io.OutputStream;
3041
import java.nio.charset.StandardCharsets;
31-
import java.security.*;
42+
import java.security.InvalidAlgorithmParameterException;
43+
import java.security.KeyPair;
44+
import java.security.KeyPairGenerator;
45+
import java.security.NoSuchAlgorithmException;
46+
import java.security.SecureRandom;
3247
import java.util.Date;
3348

3449
public class DedicatedX448KeyPairTest
@@ -100,7 +115,8 @@ private void testV4MessageEncryptionDecryptionWithJcaKey()
100115
}
101116

102117
private void testV4MessageEncryptionDecryptionWithBcKey()
103-
throws PGPException, IOException {
118+
throws PGPException, IOException
119+
{
104120
Date date = currentTimeRounded();
105121
X448KeyPairGenerator gen = new X448KeyPairGenerator();
106122
gen.init(new X448KeyGenerationParameters(new SecureRandom()));

‎pg/src/test/java/org/bouncycastle/openpgp/test/LegacyEd25519KeyPairTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424

2525
import java.io.IOException;
2626
import java.nio.charset.StandardCharsets;
27-
import java.security.*;
27+
import java.security.InvalidAlgorithmParameterException;
28+
import java.security.KeyPair;
29+
import java.security.KeyPairGenerator;
30+
import java.security.NoSuchAlgorithmException;
31+
import java.security.SecureRandom;
2832
import java.util.Date;
2933

3034
public class LegacyEd25519KeyPairTest

‎pg/src/test/java/org/bouncycastle/openpgp/test/LegacyEd448KeyPairTest.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
package org.bouncycastle.openpgp.test;
22

3-
import org.bouncycastle.bcpg.*;
3+
import org.bouncycastle.bcpg.EdDSAPublicBCPGKey;
4+
import org.bouncycastle.bcpg.EdSecretBCPGKey;
5+
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
46
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
57
import org.bouncycastle.crypto.generators.Ed448KeyPairGenerator;
68
import org.bouncycastle.crypto.params.Ed448KeyGenerationParameters;
79
import org.bouncycastle.jcajce.spec.EdDSAParameterSpec;
810
import org.bouncycastle.jce.provider.BouncyCastleProvider;
9-
import org.bouncycastle.openpgp.*;
11+
import org.bouncycastle.openpgp.PGPException;
1012
import org.bouncycastle.openpgp.operator.bc.BcPGPKeyPair;
1113
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
1214

1315
import java.io.IOException;
14-
import java.security.*;
16+
import java.security.InvalidAlgorithmParameterException;
17+
import java.security.KeyPair;
18+
import java.security.KeyPairGenerator;
19+
import java.security.NoSuchAlgorithmException;
20+
import java.security.SecureRandom;
1521
import java.util.Date;
1622

1723
public class LegacyEd448KeyPairTest

‎pg/src/test/java/org/bouncycastle/openpgp/test/LegacyX25519KeyPairTest.java

+20-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
import org.bouncycastle.crypto.params.X25519KeyGenerationParameters;
1010
import org.bouncycastle.jcajce.spec.XDHParameterSpec;
1111
import org.bouncycastle.jce.provider.BouncyCastleProvider;
12-
import org.bouncycastle.openpgp.*;
12+
import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
13+
import org.bouncycastle.openpgp.PGPEncryptedDataList;
14+
import org.bouncycastle.openpgp.PGPException;
15+
import org.bouncycastle.openpgp.PGPKeyPair;
16+
import org.bouncycastle.openpgp.PGPLiteralData;
17+
import org.bouncycastle.openpgp.PGPLiteralDataGenerator;
18+
import org.bouncycastle.openpgp.PGPObjectFactory;
19+
import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData;
1320
import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
1421
import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
1522
import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder;
@@ -26,9 +33,17 @@
2633
import org.bouncycastle.util.Arrays;
2734
import org.bouncycastle.util.io.Streams;
2835

29-
import java.io.*;
36+
import java.io.ByteArrayInputStream;
37+
import java.io.ByteArrayOutputStream;
38+
import java.io.IOException;
39+
import java.io.InputStream;
40+
import java.io.OutputStream;
3041
import java.nio.charset.StandardCharsets;
31-
import java.security.*;
42+
import java.security.InvalidAlgorithmParameterException;
43+
import java.security.KeyPair;
44+
import java.security.KeyPairGenerator;
45+
import java.security.NoSuchAlgorithmException;
46+
import java.security.SecureRandom;
3247
import java.util.Date;
3348

3449
public class LegacyX25519KeyPairTest
@@ -100,7 +115,8 @@ private void testV4MessageEncryptionDecryptionWithJcaKey()
100115
}
101116

102117
private void testV4MessageEncryptionDecryptionWithBcKey()
103-
throws PGPException, IOException {
118+
throws PGPException, IOException
119+
{
104120
Date date = currentTimeRounded();
105121
X25519KeyPairGenerator gen = new X25519KeyPairGenerator();
106122
gen.init(new X25519KeyGenerationParameters(new SecureRandom()));

‎pg/src/test/java/org/bouncycastle/openpgp/test/LegacyX448KeyPairTest.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.bouncycastle.openpgp.test;
22

3-
import org.bouncycastle.bcpg.*;
3+
import org.bouncycastle.bcpg.ECDHPublicBCPGKey;
4+
import org.bouncycastle.bcpg.ECSecretBCPGKey;
5+
import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
46
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
57
import org.bouncycastle.crypto.generators.X448KeyPairGenerator;
68
import org.bouncycastle.crypto.params.X448KeyGenerationParameters;
@@ -11,7 +13,11 @@
1113
import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
1214

1315
import java.io.IOException;
14-
import java.security.*;
16+
import java.security.InvalidAlgorithmParameterException;
17+
import java.security.KeyPair;
18+
import java.security.KeyPairGenerator;
19+
import java.security.NoSuchAlgorithmException;
20+
import java.security.SecureRandom;
1521
import java.util.Date;
1622

1723
public class LegacyX448KeyPairTest

0 commit comments

Comments
 (0)