Tests pass but needs refactor

Crypto/src/Main/ROT13.java

@@ -1,5 +1,4 @@
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -8,30 +7,38 @@ import static java.lang.Character.isUpperCase;
 import static java.lang.Character.toLowerCase;
 
 public class ROT13  {
-    private int rotateBy;
+    private int rotate;
     private int encryptShift = 26;
-    private int decryptShift = -26;
+
 
     ROT13(Character cs, Character cf) {
-        rotateBy = (int)(cs) - (int)(cf);
+        rotate = (int)(cs) - (int)(cf);
     }
 
     ROT13() {
     }
 
-    public String crypt(String text) throws UnsupportedOperationException {
+    public int getRotate() {
+        return rotate;
+    }
 
-        return "";
+    public String crypt(String text){
+        return encrypt(text);
     }
 
-    public String encrypt(String text) {
+
+    public String crypt(String text, int shift, int rotate, boolean encrypt) throws UnsupportedOperationException {
         List<String> textList = Arrays.asList(text.split(" "));
         StringBuilder builder = new StringBuilder();
 
         for (String s: textList) {
             char[] charArr = s.toCharArray();
             for (char c: charArr) {
-                builder.append(shiftChar(c, encryptShift));
+                if (encrypt)
+                    builder.append(shiftCharEncrypt(c, shift, rotate));
+                else {
+                    builder.append(shiftCharDecrypt(c, shift, rotate));
+                }
             }
             builder.append(" ");
         }
@@ -39,21 +46,37 @@ public class ROT13  {
         return builder.toString().trim();
     }
 
-    public String shiftChar(char c, int shift){
+    public String encrypt(String text) {
+        return crypt(text, encryptShift, getRotate(), true);
+    }
+
+    public String decrypt(String text) {
+
+        return crypt(text, encryptShift * -1, getRotate() * -1, false);
+    }
+
+    public String shiftCharEncrypt(char c, int shift, int rotate){
         if (c > 64){
-            if ( (c > 96 && (c+rotateBy) > 96) || (c < 97 && (c+rotateBy) > 64))
-                return  ( Character.toString( (char)(c+rotateBy) ) );
+            if ( (c > 96 && (c+ rotate) > 96) || (c <= 96 && (c+ rotate) > 64))
+                return  ( Character.toString( (char)(c+ rotate) ) );
             else {
-                return  ( Character.toString( (char)(c+rotateBy+shift) ) );
+                return  ( Character.toString( (char)(c+ rotate +shift) ) );
             }
         } else {
             return Character.toString(c);
         }
     }
 
-    public String decrypt(String text) {
-
-        return crypt(text);
+    public String shiftCharDecrypt(char c, int shift, int rotate){
+        if (c > 64){
+            if ( (c + rotate > 122) || (c <= 90  && c + rotate > 90 ) ) // ( (c < 123 && (c+ rotate) < 123) || (c <= 123 && (c+ rotate) > 64))
+                return  ( Character.toString( (char)(c+ rotate +shift) ) );
+            else {
+                return  ( Character.toString( (char)(c+ rotate) ) );
+            }
+        } else {
+            return Character.toString(c);
+        }
     }
 
     public static String rotate(String s, Character c) {

Crypto/src/Main/ROT13A.java

@@ -1,5 +1,4 @@
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -8,25 +7,33 @@ import static java.lang.Character.isUpperCase;
 import static java.lang.Character.toLowerCase;
 
 public class ROT13A  {
-    private int rotateBy;
+    private int rotate;
     private int encryptShift = 26;
-    private int decryptShift = -26;
+
 
     ROT13A(Character cs, Character cf) {
-        rotateBy = (int)(cs) - (int)(cf);
+        rotate = (int)(cs) - (int)(cf);
     }
 
     ROT13A() {
     }
 
-    public String crypt(String text, int shift) throws UnsupportedOperationException {
+    public int getRotate() {
+        return rotate;
+    }
+
+    public String crypt(String text, int shift, int rotate, boolean encrypt) throws UnsupportedOperationException {
         List<String> textList = Arrays.asList(text.split(" "));
         StringBuilder builder = new StringBuilder();
 
         for (String s: textList) {
             char[] charArr = s.toCharArray();
             for (char c: charArr) {
-                builder.append(shiftChar(c, shift));
+                if (encrypt)
+                    builder.append(shiftCharEncrypt(c, shift, rotate));
+                else {
+                    builder.append(shiftCharDecrypt(c, shift, rotate));
+                }
             }
             builder.append(" ");
         }
@@ -35,24 +42,36 @@ public class ROT13A  {
     }
 
     public String encrypt(String text) {
-        return crypt(text, encryptShift);
+        return crypt(text, encryptShift, getRotate(), true);
+    }
+
+    public String decrypt(String text) {
+
+        return crypt(text, encryptShift * -1, getRotate() * -1, false);
     }
 
-    public String shiftChar(char c, int shift){
+    public String shiftCharEncrypt(char c, int shift, int rotate){
         if (c > 64){
-            if ( (c > 96 && (c+rotateBy) > 96) || (c < 97 && (c+rotateBy) > 64))
-                return  ( Character.toString( (char)(c+rotateBy) ) );
+            if ( (c > 96 && (c+ rotate) > 96) || (c <= 96 && (c+ rotate) > 64))
+                return  ( Character.toString( (char)(c+ rotate) ) );
             else {
-                return  ( Character.toString( (char)(c+rotateBy+shift) ) );
+                return  ( Character.toString( (char)(c+ rotate +shift) ) );
             }
         } else {
             return Character.toString(c);
         }
     }
 
-    public String decrypt(String text) {
-
-        return crypt(text, decryptShift);
+    public String shiftCharDecrypt(char c, int shift, int rotate){
+        if (c > 64){
+            if ( (c + rotate > 122) || (c <= 90  && c + rotate > 90 ) ) // ( (c < 123 && (c+ rotate) < 123) || (c <= 123 && (c+ rotate) > 64))
+                return  ( Character.toString( (char)(c+ rotate +shift) ) );
+            else {
+                return  ( Character.toString( (char)(c+ rotate) ) );
+            }
+        } else {
+            return Character.toString(c);
+        }
     }
 
     public static String rotate(String s, Character c) {

Crypto/src/Test/ROT13Test.java

@@ -51,7 +51,7 @@ public class ROT13Test {
     @Test
     public void cryptTest1() {
         // Given
-        ROT13A cipher = new ROT13A('a', 'n');
+        ROT13 cipher = new ROT13('a', 'n');
 
         String Q1 = "Why did the chicken cross the road?";
         String A1 = "Jul qvq gur puvpxra pebff gur ebnq?";