Skip to content

Commit 52f45c2

Browse files
garydgregorygarydgregory
committed
Remove exceptions not thrown from method signatures in tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1812845 13f79535-47bb-0310-9956-ffa450edef68
1 parent 208d3db commit 52f45c2

4 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public void testSha1UpdateWithString(){
256256
}
257257

258258
@Test
259-
public void testSha224() throws IOException {
259+
public void testSha224() {
260260
assumeJava8();
261261
assertEquals("d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f",
262262
new DigestUtils(MessageDigestAlgorithms.SHA_224).digestAsHex(("")));
@@ -298,7 +298,7 @@ public void testSha384() throws IOException {
298298
}
299299

300300
@Test
301-
public void testSha512() throws IOException {
301+
public void testSha512() {
302302
// Examples from FIPS 180-2
303303
assertEquals("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a" +
304304
"2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",

‎src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void tearDown() throws Exception {
135135
}
136136

137137
@Test
138-
public void testAlgorithm() throws IOException, NoSuchAlgorithmException {
138+
public void testAlgorithm() throws NoSuchAlgorithmException {
139139
final String algorithm = hmacAlgorithm.getName();
140140
Assert.assertNotNull(algorithm);
141141
Assert.assertFalse(algorithm.isEmpty());
@@ -154,7 +154,7 @@ public void testGetHmacNullKey() {
154154
}
155155

156156
@Test(expected = IllegalArgumentException.class)
157-
public void testHmacFailByteArray() throws IOException {
157+
public void testHmacFailByteArray() {
158158
new HmacUtils(hmacAlgorithm, (byte[]) null).hmac(STANDARD_PHRASE_BYTES);
159159
}
160160

@@ -164,12 +164,12 @@ public void testHmacFailInputStream() throws IOException {
164164
}
165165

166166
@Test(expected = IllegalArgumentException.class)
167-
public void testHmacFailString() throws IOException {
167+
public void testHmacFailString() {
168168
new HmacUtils(hmacAlgorithm, (String) null).hmac(STANDARD_PHRASE_STRING);
169169
}
170170

171171
@Test(expected = IllegalArgumentException.class)
172-
public void testHmacHexFailByteArray() throws IOException {
172+
public void testHmacHexFailByteArray() {
173173
new HmacUtils(hmacAlgorithm, (byte[]) null).hmac(STANDARD_PHRASE_BYTES);
174174
}
175175

@@ -179,25 +179,25 @@ public void testHmacHexFailInputStream() throws IOException {
179179
}
180180

181181
@Test(expected = IllegalArgumentException.class)
182-
public void testHmacHexFailString() throws IOException {
182+
public void testHmacHexFailString() {
183183
new HmacUtils(hmacAlgorithm, (String) null).hmac(STANDARD_PHRASE_STRING);
184184
}
185185

186186
@Test
187-
public void testInitializedMac() throws IOException {
187+
public void testInitializedMac() {
188188
final Mac mac = HmacUtils.getInitializedMac(hmacAlgorithm, STANDARD_KEY_BYTES);
189189
final Mac mac2 = HmacUtils.getInitializedMac(hmacAlgorithm.getName(), STANDARD_KEY_BYTES);
190190
Assert.assertArrayEquals(standardResultBytes, HmacUtils.updateHmac(mac, STANDARD_PHRASE_STRING).doFinal());
191191
Assert.assertArrayEquals(standardResultBytes, HmacUtils.updateHmac(mac2, STANDARD_PHRASE_STRING).doFinal());
192192
}
193193

194194
@Test
195-
public void testMacByteArary() throws IOException {
195+
public void testMacByteArary() {
196196
Assert.assertArrayEquals(standardResultBytes, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmac(STANDARD_PHRASE_BYTES));
197197
}
198198

199199
@Test
200-
public void testMacHexByteArray() throws IOException {
200+
public void testMacHexByteArray() {
201201
Assert.assertEquals(standardResultString, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmacHex(STANDARD_PHRASE_BYTES));
202202
}
203203

@@ -208,7 +208,7 @@ public void testMacHexInputStream() throws IOException {
208208
}
209209

210210
@Test
211-
public void testMacHexString() throws IOException {
211+
public void testMacHexString() {
212212
Assert.assertEquals(standardResultString, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmacHex(STANDARD_PHRASE_STRING));
213213
}
214214

@@ -219,7 +219,7 @@ public void testMacInputStream() throws IOException {
219219
}
220220

221221
@Test
222-
public void testMacString() throws IOException {
222+
public void testMacString() {
223223
Assert.assertArrayEquals(standardResultBytes, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmac(STANDARD_PHRASE_STRING));
224224
}
225225

‎src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testEmptyKey() {
4343
}
4444

4545
@Test
46-
public void testGetHMac() throws IOException {
46+
public void testGetHMac() {
4747
Assert.assertArrayEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_BYTES,
4848
HmacUtils.getHmacMd5(HmacAlgorithmsTest.STANDARD_KEY_BYTES).doFinal(HmacAlgorithmsTest.STANDARD_PHRASE_BYTES));
4949
Assert.assertArrayEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_BYTES,
@@ -80,7 +80,7 @@ public void testHmacSha1Hex() throws IOException {
8080
}
8181

8282
@Test
83-
public void testHmacSha1UpdateWithByteArray() throws IOException {
83+
public void testHmacSha1UpdateWithByteArray() {
8484
final Mac mac = HmacUtils.getHmacSha1(HmacAlgorithmsTest.STANDARD_KEY_BYTES);
8585
HmacUtils.updateHmac(mac, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
8686
assertEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_STRING, Hex.encodeHexString(mac.doFinal()));
@@ -98,7 +98,7 @@ public void testHmacSha1UpdateWithInpustream() throws IOException {
9898
}
9999

100100
@Test
101-
public void testHmacSha1UpdateWithString() throws IOException {
101+
public void testHmacSha1UpdateWithString() {
102102
final Mac mac = HmacUtils.getHmacSha1(HmacAlgorithmsTest.STANDARD_KEY_BYTES);
103103
HmacUtils.updateHmac(mac, HmacAlgorithmsTest.STANDARD_PHRASE_STRING);
104104
assertEquals(HmacAlgorithmsTest.STANDARD_SHA1_RESULT_STRING, Hex.encodeHexString(mac.doFinal()));
@@ -107,7 +107,7 @@ public void testHmacSha1UpdateWithString() throws IOException {
107107
}
108108

109109
@Test
110-
public void testInitializedMac() throws IOException {
110+
public void testInitializedMac() {
111111
final Mac md5Mac = HmacUtils.getInitializedMac(HmacAlgorithms.HMAC_MD5, HmacAlgorithmsTest.STANDARD_KEY_BYTES);
112112
final Mac md5Mac2 = HmacUtils.getInitializedMac("HmacMD5", HmacAlgorithmsTest.STANDARD_KEY_BYTES);
113113
Assert.assertArrayEquals(HmacAlgorithmsTest.STANDARD_MD5_RESULT_BYTES, HmacUtils.updateHmac(md5Mac, HmacAlgorithmsTest.STANDARD_PHRASE_STRING)
@@ -117,12 +117,12 @@ public void testInitializedMac() throws IOException {
117117
}
118118

119119
@Test(expected = IllegalArgumentException.class)
120-
public void testInitializedMacNullAlgo() throws IOException {
120+
public void testInitializedMacNullAlgo() {
121121
HmacUtils.getInitializedMac((String) null, HmacAlgorithmsTest.STANDARD_KEY_BYTES);
122122
}
123123

124124
@Test(expected = IllegalArgumentException.class)
125-
public void testInitializedMacNullKey() throws IOException {
125+
public void testInitializedMacNullKey() {
126126
HmacUtils.getInitializedMac(HmacAlgorithms.HMAC_MD5, null);
127127
}
128128

@@ -147,7 +147,7 @@ public void testMd5HMac() throws IOException {
147147
}
148148

149149
@Test(expected = IllegalArgumentException.class)
150-
public void testMd5HMacFail() throws IOException {
150+
public void testMd5HMacFail() {
151151
HmacUtils.hmacMd5((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
152152
}
153153

@@ -178,7 +178,7 @@ public void testSha1HMac() throws IOException {
178178
}
179179

180180
@Test(expected = IllegalArgumentException.class)
181-
public void testSha1HMacFail() throws IOException {
181+
public void testSha1HMacFail() {
182182
HmacUtils.hmacSha1((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
183183
}
184184

@@ -199,7 +199,7 @@ public void testSha256HMac() throws IOException {
199199
}
200200

201201
@Test(expected = IllegalArgumentException.class)
202-
public void testSha256HMacFail() throws IOException {
202+
public void testSha256HMacFail() {
203203
HmacUtils.hmacSha256((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
204204
}
205205

@@ -220,7 +220,7 @@ public void testSha384HMac() throws IOException {
220220
}
221221

222222
@Test(expected = IllegalArgumentException.class)
223-
public void testSha384HMacFail() throws IOException {
223+
public void testSha384HMacFail() {
224224
HmacUtils.hmacSha384((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
225225
}
226226

@@ -241,7 +241,7 @@ public void testSha512HMac() throws IOException {
241241
}
242242

243243
@Test(expected = IllegalArgumentException.class)
244-
public void testSha512HMacFail() throws IOException {
244+
public void testSha512HMacFail() {
245245
HmacUtils.hmacSha512((byte[]) null, HmacAlgorithmsTest.STANDARD_PHRASE_BYTES);
246246
}
247247
}

‎src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public MessageDigestAlgorithmsTest(final String messageDigestAlgorithm) {
8989
this.messageDigestAlgorithm = messageDigestAlgorithm;
9090
}
9191

92-
private byte[] digestTestData() throws IOException {
92+
private byte[] digestTestData() {
9393
return DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),getTestData());
9494
}
9595

@@ -114,7 +114,7 @@ public void tearDown() throws Exception {
114114
}
115115

116116
@Test
117-
public void testAlgorithm() throws IOException, NoSuchAlgorithmException {
117+
public void testAlgorithm() throws NoSuchAlgorithmException {
118118
final String algorithm = messageDigestAlgorithm;
119119
Assert.assertNotNull(algorithm);
120120
Assert.assertFalse(algorithm.isEmpty());
@@ -123,15 +123,15 @@ public void testAlgorithm() throws IOException, NoSuchAlgorithmException {
123123
}
124124

125125
@Test
126-
public void testDigestByteArray() throws IOException {
126+
public void testDigestByteArray() {
127127
Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
128128
Assert.assertArrayEquals(digestTestData(),
129129
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm), getTestData()));
130130
Assert.assertArrayEquals(digestTestData(), DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),getTestData()));
131131
}
132132

133133
@Test
134-
public void testDigestByteBuffer() throws IOException {
134+
public void testDigestByteBuffer() {
135135
Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
136136
Assert.assertArrayEquals(digestTestData(),
137137
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm), ByteBuffer.wrap(getTestData())));
@@ -155,7 +155,7 @@ public void testDigestInputStream() throws IOException {
155155
}
156156

157157
@Test
158-
public void testGetMessageDigest() throws IOException, NoSuchAlgorithmException {
158+
public void testGetMessageDigest() {
159159
Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
160160
final MessageDigest messageDigest = DigestUtils.getDigest(messageDigestAlgorithm);
161161
Assert.assertEquals(messageDigestAlgorithm, messageDigest.getAlgorithm());

0 commit comments

Comments
 (0)