Skip to content

refactor: Enhance docs, add more tests in Vigenere #5899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 61 additions & 6 deletions src/main/java/com/thealgorithms/ciphers/Vigenere.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,54 @@
package com.thealgorithms.ciphers;

/**
* A Java implementation of Vigenere Cipher.
* A Java implementation of the Vigenère Cipher.
*
* The Vigenère Cipher is a polyalphabetic substitution cipher that uses a
* keyword to shift letters in the plaintext by different amounts, depending
* on the corresponding character in the keyword. It wraps around the alphabet,
* ensuring the shifts are within 'A'-'Z' or 'a'-'z'.
*
* Non-alphabetic characters (like spaces, punctuation) are kept unchanged.
*
* Encryption Example:
* - Plaintext: "Hello World!"
* - Key: "suchsecret"
* - Encrypted Text: "Zynsg Yfvev!"
*
* Decryption Example:
* - Ciphertext: "Zynsg Yfvev!"
* - Key: "suchsecret"
* - Decrypted Text: "Hello World!"
*
* Wikipedia Reference:
* <a href="https://en.wikipedia.org/wiki/Vigen%C3%A8re_cipher">Vigenère Cipher - Wikipedia</a>
*
* @author straiffix
* @author beingmartinbmc
*/
public class Vigenere {

/**
* Encrypts a given message using the Vigenère Cipher with the specified key.
* Steps:
* 1. Iterate over each character in the message.
* 2. If the character is a letter, shift it by the corresponding character in the key.
* 3. Preserve the case of the letter.
* 4. Preserve non-alphabetic characters.
* 5. Move to the next character in the key (cyclic).
* 6. Return the encrypted message.
*
* @param message The plaintext message to encrypt.
* @param key The keyword used for encryption.
* @throws IllegalArgumentException if the key is empty.
* @return The encrypted message.
*/
public String encrypt(final String message, final String key) {
StringBuilder result = new StringBuilder();
if (key.isEmpty()) {
throw new IllegalArgumentException("Key cannot be empty.");
}

StringBuilder result = new StringBuilder();
int j = 0;
for (int i = 0; i < message.length(); i++) {
char c = message.charAt(i);
Expand All @@ -20,17 +58,35 @@ public String encrypt(final String message, final String key) {
} else {
result.append((char) ((c + key.toLowerCase().charAt(j) - 2 * 'a') % 26 + 'a'));
}
j = ++j % key.length();
} else {
result.append(c);
}
j = ++j % key.length();
}
return result.toString();
}

/**
* Decrypts a given message encrypted with the Vigenère Cipher using the specified key.
* Steps:
* 1. Iterate over each character in the message.
* 2. If the character is a letter, shift it back by the corresponding character in the key.
* 3. Preserve the case of the letter.
* 4. Preserve non-alphabetic characters.
* 5. Move to the next character in the key (cyclic).
* 6. Return the decrypted message.
*
* @param message The encrypted message to decrypt.
* @param key The keyword used for decryption.
* @throws IllegalArgumentException if the key is empty.
* @return The decrypted plaintext message.
*/
public String decrypt(final String message, final String key) {
StringBuilder result = new StringBuilder();
if (key.isEmpty()) {
throw new IllegalArgumentException("Key cannot be empty.");
}

StringBuilder result = new StringBuilder();
int j = 0;
for (int i = 0; i < message.length(); i++) {
char c = message.charAt(i);
Expand All @@ -40,11 +96,10 @@ public String decrypt(final String message, final String key) {
} else {
result.append((char) ('z' - (25 - (c - key.toLowerCase().charAt(j))) % 26));
}
j = ++j % key.length();
} else {
result.append(c);
}

j = ++j % key.length();
}
return result.toString();
}
Expand Down
70 changes: 57 additions & 13 deletions src/test/java/com/thealgorithms/ciphers/VigenereTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.thealgorithms.ciphers;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import org.junit.jupiter.api.Test;

Expand All @@ -9,28 +10,71 @@ class VigenereTest {
Vigenere vigenere = new Vigenere();

@Test
void vigenereEncryptTest() {
// given
void testVigenereEncryptDecrypt() {
String text = "Hello World!";
String key = "suchsecret";

// when
String cipherText = vigenere.encrypt(text, key);
String encryptedText = vigenere.encrypt(text, key);
String decryptedText = vigenere.decrypt(encryptedText, key);

// then
assertEquals("Zynsg Yfvev!", cipherText);
assertEquals("Zynsg Aqipw!", encryptedText);
assertEquals("Hello World!", decryptedText);
}

@Test
void vigenereDecryptTest() {
// given
String encryptedText = "Zynsg Yfvev!";
String key = "suchsecret";
void testWithEmptyMessage() {
String text = "";
String key = "anykey";

// when
String encryptedText = vigenere.encrypt(text, key);
String decryptedText = vigenere.decrypt(encryptedText, key);

// then
assertEquals("Hello World!", decryptedText);
assertEquals("", encryptedText);
assertEquals("", decryptedText);
}

@Test
void testWithEmptyKey() {
String text = "This should remain the same";
String key = "";

assertThrows(IllegalArgumentException.class, () -> vigenere.encrypt(text, key));
assertThrows(IllegalArgumentException.class, () -> vigenere.decrypt(text, key));
}

@Test
void testWithNumbersInMessage() {
String text = "Vigenere123!";
String key = "cipher";

String encryptedText = vigenere.encrypt(text, key);
String decryptedText = vigenere.decrypt(encryptedText, key);

assertEquals("Xqvlrvtm123!", encryptedText);
assertEquals(text, decryptedText);
}

@Test
void testLongerKeyThanMessage() {
String text = "Short";
String key = "VeryLongSecretKey";

String encryptedText = vigenere.encrypt(text, key);
String decryptedText = vigenere.decrypt(encryptedText, key);

assertEquals("Nlfpe", encryptedText);
assertEquals(text, decryptedText);
}

@Test
void testUppercaseMessageAndKey() {
String text = "HELLO";
String key = "SECRET";

String encryptedText = vigenere.encrypt(text, key);
String decryptedText = vigenere.decrypt(encryptedText, key);

assertEquals("ZINCS", encryptedText);
assertEquals(text, decryptedText);
}
}