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 2023/08/10 12:14:08 UTC
[commons-codec] branch master updated: Normalize spelling
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
The following commit(s) were added to refs/heads/master by this push:
new c44ac8f6 Normalize spelling
c44ac8f6 is described below
commit c44ac8f6fdb18275793a69d73d416aedc69dcc64
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Aug 10 08:13:25 2023 -0400
Normalize spelling
---
src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java | 8 ++++----
src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java | 4 ++--
.../java/org/apache/commons/codec/digest/Sha256CryptTest.java | 4 ++--
.../java/org/apache/commons/codec/digest/Sha512CryptTest.java | 4 ++--
src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
index f908b0dc..436d30d2 100644
--- a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
@@ -52,9 +52,9 @@ public class Apr1CryptTest {
// An empty Bytearray equals an empty String
assertEquals("$apr1$foo$P27KyD1htb4EllIPEYhqi0", Md5Crypt.apr1Crypt(new byte[0], "$apr1$foo"));
- // UTF-8 stores \u00e4 "a with diaeresis" as two bytes 0xc3 0xa4.
+ // UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
assertEquals("$apr1$./$EeFrYzWWbmTyGdf4xULYc.", Md5Crypt.apr1Crypt("t\u00e4st", "$apr1$./$"));
- // ISO-8859-1 stores "a with diaeresis" as single byte 0xe4.
+ // ISO-8859-1 stores "a with dieresis" as single byte 0xe4.
assertEquals("$apr1$./$kCwT1pY9qXAJElYG9q1QE1", Md5Crypt.apr1Crypt("t\u00e4st".getBytes(StandardCharsets.ISO_8859_1), "$apr1$./$"));
}
@@ -68,9 +68,9 @@ public class Apr1CryptTest {
// An empty Bytearray equals an empty String
assertEquals("$apr1$foo$P27KyD1htb4EllIPEYhqi0", Md5Crypt.apr1Crypt(new byte[0], "$apr1$foo"));
- // UTF-8 stores \u00e4 "a with diaeresis" as two bytes 0xc3 0xa4.
+ // UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
assertEquals("$apr1$./$EeFrYzWWbmTyGdf4xULYc.", Md5Crypt.apr1Crypt("t\u00e4st", "$apr1$./$"));
- // ISO-8859-1 stores "a with diaeresis" as single byte 0xe4.
+ // ISO-8859-1 stores "a with dieresis" as single byte 0xe4.
assertEquals("$apr1$./$kCwT1pY9qXAJElYG9q1QE1", Md5Crypt.apr1Crypt("t\u00e4st".getBytes(StandardCharsets.ISO_8859_1), "$apr1$./$"));
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
index 05f0471d..97742c5d 100644
--- a/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
@@ -50,9 +50,9 @@ public class Md5CryptTest {
public void testMd5CryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("$1$foo$9mS5ExwgIECGE5YKlD5o91", Crypt.crypt(new byte[0], "$1$foo"));
- // UTF-8 stores \u00e4 "a with diaeresis" as two bytes 0xc3 0xa4.
+ // UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
assertEquals("$1$./$52agTEQZs877L9jyJnCNZ1", Crypt.crypt("t\u00e4st", "$1$./$"));
- // ISO-8859-1 stores "a with diaeresis" as single byte 0xe4.
+ // ISO-8859-1 stores "a with dieresis" as single byte 0xe4.
assertEquals("$1$./$J2UbKzGe0Cpe63WZAt6p//", Crypt.crypt("t\u00e4st".getBytes(StandardCharsets.ISO_8859_1), "$1$./$"));
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
index f8ceb571..79685885 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
@@ -45,9 +45,9 @@ public class Sha256CryptTest {
public void testSha256CryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("$5$foo$Fq9CX624QIfnCAmlGiPKLlAasdacKCRxZztPoeo7o0B", Crypt.crypt(new byte[0], "$5$foo"));
- // UTF-8 stores \u00e4 "a with diaeresis" as two bytes 0xc3 0xa4.
+ // UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
assertEquals("$5$./$iH66LwY5sTDTdHeOxq5nvNDVAxuoCcyH/y6Ptte82P8", Crypt.crypt("t\u00e4st", "$5$./$"));
- // ISO-8859-1 stores "a with diaeresis" as single byte 0xe4.
+ // ISO-8859-1 stores "a with dieresis" as single byte 0xe4.
assertEquals("$5$./$qx5gFfCzjuWUOvsDDy.5Nor3UULPIqLVBZhgGNS0c14", Crypt.crypt("t\u00e4st".getBytes(StandardCharsets.ISO_8859_1), "$5$./$"));
}
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
index e1a5067a..75dba970 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
@@ -46,9 +46,9 @@ public class Sha512CryptTest {
public void testSha512CryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("$6$foo$Nywkte7LPWjaJhWjNeGJN.dFdY3pN1wYlGifyRLYOVlGS9EMSiZaDDe/BGSOYQ327q9.32I4UqQ5odsqvsBLX/", Crypt.crypt(new byte[0], "$6$foo"));
- // UTF-8 stores \u00e4 "a with diaeresis" as two bytes 0xc3 0xa4.
+ // UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
assertEquals("$6$./$fKtWqslQkwI8ZxjdWoeS.jHHrte97bZxiwB5gwCRHX6LG62fUhT6Bb5MRrjWvieh0C/gxh8ItFuTsVy80VrED1", Crypt.crypt("t\u00e4st", "$6$./$"));
- // ISO-8859-1 stores "a with diaeresis" as single byte 0xe4.
+ // ISO-8859-1 stores "a with dieresis" as single byte 0xe4.
assertEquals("$6$./$L49DSK.d2df/LxGLJQMyS5A/Um.TdHqgc46j5FpScEPlqQHP5dEazltaDNDZ6UEs2mmNI6kPwtH/rsP9g5zBI.", Crypt.crypt("t\u00e4st".getBytes(StandardCharsets.ISO_8859_1), "$6$./$"));
}
diff --git a/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java b/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
index 6b4c2fef..5947c0bd 100644
--- a/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
@@ -48,9 +48,9 @@ public class UnixCryptTest {
public void testUnixCryptBytes() {
// An empty Bytearray equals an empty String
assertEquals("12UFlHxel6uMM", Crypt.crypt(new byte[0], "12"));
- // UTF-8 stores \u00e4 "a with diaeresis" as two bytes 0xc3 0xa4.
+ // UTF-8 stores \u00e4 "a with dieresis" as two bytes 0xc3 0xa4.
assertEquals("./287bds2PjVw", Crypt.crypt("t\u00e4st", "./"));
- // ISO-8859-1 stores "a with diaeresis" as single byte 0xe4.
+ // ISO-8859-1 stores "a with dieresis" as single byte 0xe4.
assertEquals("./bLIFNqo9XKQ", Crypt.crypt("t\u00e4st".getBytes(StandardCharsets.ISO_8859_1), "./"));
assertEquals("./bLIFNqo9XKQ", Crypt.crypt(new byte[]{(byte) 0x74, (byte) 0xe4, (byte) 0x73, (byte) 0x74}, "./"));
}