diff --git a/src/main/java/com/thealgorithms/ciphers/ColumnarTranspositionCipher.java b/src/main/java/com/thealgorithms/ciphers/ColumnarTranspositionCipher.java index d7e64a12ebfd..b6b889b079ca 100644 --- a/src/main/java/com/thealgorithms/ciphers/ColumnarTranspositionCipher.java +++ b/src/main/java/com/thealgorithms/ciphers/ColumnarTranspositionCipher.java @@ -27,13 +27,13 @@ private ColumnarTranspositionCipher() { * @return a String with the word encrypted by the Columnar Transposition * Cipher Rule */ - public static String encrpyter(String word, String keyword) { + public static String encrypt(final String word, final String keyword) { ColumnarTranspositionCipher.keyword = keyword; - abecedariumBuilder(500); + abecedariumBuilder(); table = tableBuilder(word); Object[][] sortedTable = sortTable(table); StringBuilder wordEncrypted = new StringBuilder(); - for (int i = 0; i < sortedTable[i].length; i++) { + for (int i = 0; i < sortedTable[0].length; i++) { for (int j = 1; j < sortedTable.length; j++) { wordEncrypted.append(sortedTable[j][i]); } @@ -51,11 +51,12 @@ public static String encrpyter(String word, String keyword) { * @return a String with the word encrypted by the Columnar Transposition * Cipher Rule */ - public static String encrpyter(String word, String keyword, String abecedarium) { + public static String encrypt(String word, String keyword, String abecedarium) { ColumnarTranspositionCipher.keyword = keyword; ColumnarTranspositionCipher.abecedarium = Objects.requireNonNullElse(abecedarium, ABECEDARIUM); table = tableBuilder(word); Object[][] sortedTable = sortTable(table); + StringBuilder wordEncrypted = new StringBuilder(); for (int i = 0; i < sortedTable[0].length; i++) { for (int j = 1; j < sortedTable.length; j++) { @@ -72,7 +73,7 @@ public static String encrpyter(String word, String keyword, String abecedarium) * @return a String decrypted with the word encrypted by the Columnar * Transposition Cipher Rule */ - public static String decrypter() { + public static String decrypt() { StringBuilder wordDecrypted = new StringBuilder(); for (int i = 1; i < table.length; i++) { for (Object item : table[i]) { @@ -91,14 +92,14 @@ public static String decrypter() { */ private static Object[][] tableBuilder(String word) { Object[][] table = new Object[numberOfRows(word) + 1][keyword.length()]; - char[] wordInChards = word.toCharArray(); - // Fils in the respective numbers + char[] wordInChars = word.toCharArray(); + // Fills in the respective numbers for the column table[0] = findElements(); int charElement = 0; for (int i = 1; i < table.length; i++) { for (int j = 0; j < table[i].length; j++) { - if (charElement < wordInChards.length) { - table[i][j] = wordInChards[charElement]; + if (charElement < wordInChars.length) { + table[i][j] = wordInChars[charElement]; charElement++; } else { table[i][j] = ENCRYPTION_FIELD_CHAR; @@ -116,7 +117,7 @@ private static Object[][] tableBuilder(String word) { * order to respect the Columnar Transposition Cipher Rule. */ private static int numberOfRows(String word) { - if (word.length() / keyword.length() > word.length() / keyword.length()) { + if (word.length() % keyword.length() != 0) { return (word.length() / keyword.length()) + 1; } else { return word.length() / keyword.length(); @@ -173,13 +174,11 @@ private static void switchColumns(Object[][] table, int firstColumnIndex, int se } /** - * Creates an abecedarium with a specified ascii inded - * - * @param value Number of characters being used based on the ASCII Table + * Creates an abecedarium with all available ascii values. */ - private static void abecedariumBuilder(int value) { + private static void abecedariumBuilder() { StringBuilder t = new StringBuilder(); - for (int i = 0; i < value; i++) { + for (int i = 0; i < 256; i++) { t.append((char) i); } abecedarium = t.toString(); diff --git a/src/test/java/com/thealgorithms/ciphers/ColumnarTranspositionCipherTest.java b/src/test/java/com/thealgorithms/ciphers/ColumnarTranspositionCipherTest.java index 0d306a6623db..8deae45099d6 100644 --- a/src/test/java/com/thealgorithms/ciphers/ColumnarTranspositionCipherTest.java +++ b/src/test/java/com/thealgorithms/ciphers/ColumnarTranspositionCipherTest.java @@ -20,7 +20,7 @@ public void setUp() { @Test public void testEncryption() { - String encryptedText = ColumnarTranspositionCipher.encrpyter(plaintext, keyword); + String encryptedText = ColumnarTranspositionCipher.encrypt(plaintext, keyword); assertNotNull(encryptedText, "The encrypted text should not be null."); assertFalse(encryptedText.isEmpty(), "The encrypted text should not be empty."); // Check if the encrypted text is different from the plaintext @@ -29,19 +29,19 @@ public void testEncryption() { @Test public void testDecryption() { - String encryptedText = ColumnarTranspositionCipher.encrpyter(plaintext, keyword); - String decryptedText = ColumnarTranspositionCipher.decrypter(); + String encryptedText = ColumnarTranspositionCipher.encrypt(plaintext, keyword); + String decryptedText = ColumnarTranspositionCipher.decrypt(); assertEquals(plaintext.replaceAll(" ", ""), decryptedText.replaceAll(" ", ""), "The decrypted text should match the original plaintext, ignoring spaces."); - assertEquals(encryptedText, ColumnarTranspositionCipher.encrpyter(plaintext, keyword), "The encrypted text should be the same when encrypted again."); + assertEquals(encryptedText, ColumnarTranspositionCipher.encrypt(plaintext, keyword), "The encrypted text should be the same when encrypted again."); } @Test public void testLongPlainText() { String longText = "This is a significantly longer piece of text to test the encryption and decryption capabilities of the Columnar Transposition Cipher. It should handle long strings gracefully."; - String encryptedText = ColumnarTranspositionCipher.encrpyter(longText, keyword); - String decryptedText = ColumnarTranspositionCipher.decrypter(); + String encryptedText = ColumnarTranspositionCipher.encrypt(longText, keyword); + String decryptedText = ColumnarTranspositionCipher.decrypt(); assertEquals(longText.replaceAll(" ", ""), decryptedText.replaceAll(" ", ""), "The decrypted text should match the original long plaintext, ignoring spaces."); - assertEquals(encryptedText, ColumnarTranspositionCipher.encrpyter(longText, keyword), "The encrypted text should be the same when encrypted again."); + assertEquals(encryptedText, ColumnarTranspositionCipher.encrypt(longText, keyword), "The encrypted text should be the same when encrypted again."); } }