Merge pull request #421 from FridaTveit/AtbashCipherUseInstanceMethod

atbash-cipher: make class use instance method [Fix #366]

exercises/atbash-cipher/src/example/java/Atbash.java

@@ -7,7 +7,7 @@ public class Atbash {
     private static final String PLAIN = "abcdefghijklmnopqrstuvwxyz";
     private static final String CIPHER = "zyxwvutsrqponmlkjihgfedcba";
 
-    public static String encode(String input) {
+    public String encode(String input) {
         String encoded = stripInvalidCharacters(input).toLowerCase();
         String cyphered = "";
 
@@ -18,7 +18,7 @@ public class Atbash {
         return splitIntoFiveLetterWords(cyphered);
     }
 
-    public static String decode(String input) {
+    public String decode(String input) {
         String encoded = stripInvalidCharacters(input).toLowerCase();
         String deciphered = "";
 
@@ -29,7 +29,7 @@ public class Atbash {
         return deciphered;
     }
 
-    private static String stripInvalidCharacters(String input) {
+    private String stripInvalidCharacters(String input) {
         String filteredValue = "";
 
         for (char c : input.toCharArray()) {
@@ -41,13 +41,13 @@ public class Atbash {
         return filteredValue;
     }
 
-    private static char applyCipher(char input) {
+    private char applyCipher(char input) {
         int idx = PLAIN.indexOf(input);
 
         return idx >= 0 ? CIPHER.toCharArray()[idx] : input;
     }
 
-    private static String splitIntoFiveLetterWords(String value) {
+    private String splitIntoFiveLetterWords(String value) {
         List<String> words = new ArrayList<>();
 
         for (int i = 0; i < value.length(); i += GROUP_SIZE) {

exercises/atbash-cipher/src/test/java/AtbashTest.java

@@ -1,5 +1,5 @@
-import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -20,14 +20,14 @@ public class AtbashTest {
 
         @Parameters(name = "{index}: expected plaintext \"{0}\" to encode to ciphertext \"{1}\".")
         public static Collection<Object[]> data() {
-            return Arrays.asList(new Object[][] {
-                    { "no", "ml" },
-                    { "yes", "bvh" },
-                    { "OMG", "lnt" },
-                    { "mindblowingly", "nrmwy oldrm tob" },
-                    { "Testing, 1 2 3, testing.", "gvhgr mt123 gvhgr mt" },
-                    { "Truth is fiction.", "gifgs rhurx grlm" },
-                    { "The quick brown fox jumps over the lazy dog.", "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt" }
+            return Arrays.asList(new Object[][]{
+                    {"no", "ml"},
+                    {"yes", "bvh"},
+                    {"OMG", "lnt"},
+                    {"mindblowingly", "nrmwy oldrm tob"},
+                    {"Testing, 1 2 3, testing.", "gvhgr mt123 gvhgr mt"},
+                    {"Truth is fiction.", "gifgs rhurx grlm"},
+                    {"The quick brown fox jumps over the lazy dog.", "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt"}
             });
         }
 
@@ -37,9 +37,9 @@ public class AtbashTest {
         }
 
 
-    @Test
+        @Test
         public void test() {
-            assertEquals(ciphertext, Atbash.encode(plaintext));
+            assertEquals(ciphertext, new Atbash().encode(plaintext));
         }
     }
 
@@ -50,11 +50,11 @@ public class AtbashTest {
 
         @Parameters(name = "{index}: expected ciphertext \"{0}\" to decode to plaintext \"{1}\".")
         public static Collection<Object[]> data() {
-            return Arrays.asList(new Object[][] {
-                    { "vcvix rhn", "exercism" },
-                    { "zmlyh gzxov rhlug vmzhg vkkrm thglm v", "anobstacleisoftenasteppingstone" },
-                    { "gvhgr mt123 gvhgr mt", "testing123testing" },
-                    { "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt", "thequickbrownfoxjumpsoverthelazydog" }
+            return Arrays.asList(new Object[][]{
+                    {"vcvix rhn", "exercism"},
+                    {"zmlyh gzxov rhlug vmzhg vkkrm thglm v", "anobstacleisoftenasteppingstone"},
+                    {"gvhgr mt123 gvhgr mt", "testing123testing"},
+                    {"gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt", "thequickbrownfoxjumpsoverthelazydog"}
             });
         }
 
@@ -64,9 +64,9 @@ public class AtbashTest {
         }
 
         @Ignore
-    @Test
+        @Test
         public void test() {
-            assertEquals(plaintext, Atbash.decode(ciphertext));
+            assertEquals(plaintext, new Atbash().decode(ciphertext));
         }
     }
 }