You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/12/26 14:18:55 UTC
[commons-codec] 02/02: Sort members.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git
commit 6471942097893c67004e4990d77002a9071a7f84
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 26 09:04:24 2019 -0500
Sort members.
---
.../codec/digest/MessageDigestAlgorithmsTest.java | 58 +++++++++++-----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
index d0bb626..f1b7295 100644
--- a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
@@ -44,20 +44,6 @@ import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
public class MessageDigestAlgorithmsTest {
- @Parameters(name = "{0}")
- public static Object[] data() {
- return MessageDigestAlgorithms.values();
- }
-
- private static boolean contains(final String key) {
- for(final String s : MessageDigestAlgorithms.values()) {
- if (s.equals(key)) {
- return true;
- }
- }
- return false;
- }
-
@BeforeClass
public static void checkValues() throws Exception {
final Field [] fields = MessageDigestAlgorithms.class.getDeclaredFields();
@@ -87,6 +73,20 @@ public class MessageDigestAlgorithmsTest {
}
}
+ private static boolean contains(final String key) {
+ for(final String s : MessageDigestAlgorithms.values()) {
+ if (s.equals(key)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Parameters(name = "{0}")
+ public static Object[] data() {
+ return MessageDigestAlgorithms.values();
+ }
+
private DigestUtilsTest digestUtilsTest;
private final String messageDigestAlgorithm;
@@ -157,6 +157,21 @@ public class MessageDigestAlgorithmsTest {
}
@Test
+ public void testDigestInputStream() throws IOException {
+ Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
+ Assert.assertArrayEquals(digestTestData(),
+ DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm), new ByteArrayInputStream(getTestData())));
+ Assert.assertArrayEquals(digestTestData(), DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),new ByteArrayInputStream(getTestData())));
+ }
+
+ @Test
+ public void testGetMessageDigest() {
+ Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
+ final MessageDigest messageDigest = DigestUtils.getDigest(messageDigestAlgorithm);
+ Assert.assertEquals(messageDigestAlgorithm, messageDigest.getAlgorithm());
+ }
+
+ @Test
public void testNonBlockingDigestRandomAccessFile() throws IOException {
Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
@@ -175,19 +190,4 @@ public class MessageDigestAlgorithmsTest {
);
}
- @Test
- public void testDigestInputStream() throws IOException {
- Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
- Assert.assertArrayEquals(digestTestData(),
- DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm), new ByteArrayInputStream(getTestData())));
- Assert.assertArrayEquals(digestTestData(), DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),new ByteArrayInputStream(getTestData())));
- }
-
- @Test
- public void testGetMessageDigest() {
- Assume.assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
- final MessageDigest messageDigest = DigestUtils.getDigest(messageDigestAlgorithm);
- Assert.assertEquals(messageDigestAlgorithm, messageDigest.getAlgorithm());
- }
-
}