From 69e86faafc63ff8dcec72205968639cbed059168 Mon Sep 17 00:00:00 2001
From: Brandon Johnson <brandon@moov.io>
Date: Sat, 23 Jul 2022 20:40:26 -0600
Subject: [PATCH] meta: add tests/Ciphers; change ciphers dir to Ciphers for
 consistency

---
 .../CaesarCipher.php                          |  2 +-
 .../morseCode.php => Ciphers/MorseCode.php    |  2 +-
 {ciphers => Ciphers}/XORCipher.php            |  0
 {ciphers => Ciphers}/monoAlphabeticCipher.php |  0
 tests/CipherTest.php                          | 22 ---------------
 tests/Ciphers/CiphersTest.php                 | 28 +++++++++++++++++++
 tests/{ => Ciphers}/MorseCodeTest.php         |  6 ++--
 tests/CiphersTest.php                         | 18 ------------
 8 files changed, 33 insertions(+), 45 deletions(-)
 rename ciphers/caesarCipher.php => Ciphers/CaesarCipher.php (99%)
 rename ciphers/morseCode.php => Ciphers/MorseCode.php (99%)
 rename {ciphers => Ciphers}/XORCipher.php (100%)
 rename {ciphers => Ciphers}/monoAlphabeticCipher.php (100%)
 delete mode 100644 tests/CipherTest.php
 create mode 100755 tests/Ciphers/CiphersTest.php
 rename tests/{ => Ciphers}/MorseCodeTest.php (57%)
 delete mode 100755 tests/CiphersTest.php

diff --git a/ciphers/caesarCipher.php b/Ciphers/CaesarCipher.php
similarity index 99%
rename from ciphers/caesarCipher.php
rename to Ciphers/CaesarCipher.php
index f7d1883..17adddb 100755
--- a/ciphers/caesarCipher.php
+++ b/Ciphers/CaesarCipher.php
@@ -37,7 +37,7 @@ function decrypt(string $text, int $shift): string
         if (ctype_alpha($c)) {
             $placeValue = ord($c) - ord(ctype_upper($c) ? 'A' : 'a'); // Getting value of character (i.e. 0-25)
             $placeValue = ($placeValue - $shift) % 26; // Applying decryption formula
-            if ($placeValue < 0) { // Handling case where remainder is negative 
+            if ($placeValue < 0) { // Handling case where remainder is negative
                 $placeValue += 26;
             }
             $placeValue += ord(ctype_upper($c) ? 'A' : 'a');
diff --git a/ciphers/morseCode.php b/Ciphers/MorseCode.php
similarity index 99%
rename from ciphers/morseCode.php
rename to Ciphers/MorseCode.php
index aa2673a..b50bc25 100644
--- a/ciphers/morseCode.php
+++ b/Ciphers/MorseCode.php
@@ -104,7 +104,7 @@ function decode(string $text): string
         "-----" => "0",
         "/" => " "
     );
-    
+
     $decodedText = ""; // Stores the decoded text
     foreach (explode(" ", $text) as $c) { // Going through each group
         if (array_key_exists($c, $MORSE_CODE)) { // Checks if it is a valid character
diff --git a/ciphers/XORCipher.php b/Ciphers/XORCipher.php
similarity index 100%
rename from ciphers/XORCipher.php
rename to Ciphers/XORCipher.php
diff --git a/ciphers/monoAlphabeticCipher.php b/Ciphers/monoAlphabeticCipher.php
similarity index 100%
rename from ciphers/monoAlphabeticCipher.php
rename to Ciphers/monoAlphabeticCipher.php
diff --git a/tests/CipherTest.php b/tests/CipherTest.php
deleted file mode 100644
index 0f630f2..0000000
--- a/tests/CipherTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-use function PHPUnit\Framework\assertEquals;
-use function PHPUnit\Framework\assertFalse;
-use function PHPUnit\Framework\assertNotEquals;
-use function PHPUnit\Framework\assertTrue;
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../ciphers/XORCipher.php';
-
-class CipherTest extends TestCase
-{
-    public function testXor_cipher()
-    {
-        $inp_str = "test@string";
-        $key = "test-key";
-        $invalid_key = "wrong-key";
-        assertEquals( $inp_str, xor_cipher( xor_cipher( $inp_str , $key) , $key));
-        assertNotEquals( $inp_str, xor_cipher( xor_cipher( $inp_str , $key) , $invalid_key));
-    }
-}
diff --git a/tests/Ciphers/CiphersTest.php b/tests/Ciphers/CiphersTest.php
new file mode 100755
index 0000000..332b359
--- /dev/null
+++ b/tests/Ciphers/CiphersTest.php
@@ -0,0 +1,28 @@
+<?php
+
+use function PHPUnit\Framework\assertEquals;
+use PHPUnit\Framework\TestCase;
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../Ciphers/CaesarCipher.php';
+require_once __DIR__ . '/../../Ciphers/XORCipher.php';
+
+class CiphersTest extends TestCase
+{
+    public function testCaesarCipher()
+    {
+        assertEquals('Aopz pz h alza.', encrypt('This is a test.', 7));
+        assertEquals('Aopz pz h alza.', encrypt('This is a test.', 7 + 26));
+        assertEquals('This is a test.', decrypt('Aopz pz h alza.', 7));
+        assertEquals('This is a test.', decrypt('Aopz pz h alza.', 7 + 26));
+    }
+
+    public function testXorCipher()
+    {
+        $input_str = "test@string";
+        $key = "test-key";
+        $invalid_key = "wrong-key";
+        assertEquals( $input_str, xorCipher( xorCipher( $input_str , $key) , $key));
+        assertNotEquals( $input_str, xorCipher( xorCipher( $input_str , $key) , $invalid_key));
+    }
+}
diff --git a/tests/MorseCodeTest.php b/tests/Ciphers/MorseCodeTest.php
similarity index 57%
rename from tests/MorseCodeTest.php
rename to tests/Ciphers/MorseCodeTest.php
index 1eb2348..7c9b97b 100644
--- a/tests/MorseCodeTest.php
+++ b/tests/Ciphers/MorseCodeTest.php
@@ -3,12 +3,12 @@
 use function PHPUnit\Framework\assertEquals;
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../ciphers/morseCode.php';
+require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../Ciphers/MorseCode.php';
 
 class MorseCodeTest extends TestCase
 {
-    public function testCaesarCipher()
+    public function testMorseCodeCipher()
     {
         assertEquals('TEST 123', decode(encode('TEST 123')));
     }
diff --git a/tests/CiphersTest.php b/tests/CiphersTest.php
deleted file mode 100755
index cd455f3..0000000
--- a/tests/CiphersTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-use function PHPUnit\Framework\assertEquals;
-use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../ciphers/caesarCipher.php';
-
-class CiphersTest extends TestCase
-{
-    public function testCaesarCipher()
-    {
-        assertEquals('Aopz pz h alza.', encrypt('This is a test.', 7));
-        assertEquals('Aopz pz h alza.', encrypt('This is a test.', 7 + 26));
-        assertEquals('This is a test.', decrypt('Aopz pz h alza.', 7));
-        assertEquals('This is a test.', decrypt('Aopz pz h alza.', 7 + 26));
-    }
-}