added another cipher

Crypto/src/CipherTwo.java

@@ -0,0 +1,6 @@
+public class CipherTwo extends ROT13 {
+
+    public CipherTwo(Character cs, Character cf) {
+        super(cs, Character.isLowerCase(cf) ? (char) ('a' + (cf - 'a') / 2) : (char) ('A' + (cf - 'A') / 2));
+    }
+}

Crypto/src/CipherTwoTest.java

@@ -0,0 +1,48 @@
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class CipherTwoTest {
+
+    @Test
+    public void cryptTest1() {
+        // Given
+        CipherTwo cipher = new CipherTwo('a', 'n');
+
+        String Q1 = "Why did the chicken cross the road?";
+        String A1 = "Cne joj znk inoiqkt ixuyy znk xugj?";
+
+        String Q2 = "Zu mkz zu znk uznkx yojk!";
+        String A2 = "To get to the other side!";
+
+        // When
+        String actual = cipher.encrypt(Q1);
+        System.out.println(Q1);
+        System.out.println(A1);
+        // Then
+        assertTrue(actual.equals(A1));
+
+        // When
+        String actual2 = cipher.decrypt(Q2);
+        System.out.println(Q2);
+        System.out.println(A2);
+        // Then
+        assertTrue(actual2.equals(A2));
+    }
+    @Test
+    public void cryptTest2() {
+        // Given
+        CipherTwo cipher = new CipherTwo('a', 'n');
+
+        String Q1 = "Why did the chicken cross the road?";
+        System.out.println(Q1);
+
+        String expected = "Itk pup ftq otuowqz odaee ftq damp?";
+        // When
+        String actual = cipher.crypt(cipher.crypt(Q1));
+        System.out.println(actual);
+        // Then
+        assertTrue(actual.equals(expected));
+    }
+
+}

Crypto/src/ROT13.java

@@ -1,32 +1,49 @@
-import static java.lang.Character.isLowerCase;
-import static java.lang.Character.isUpperCase;
-import static java.lang.Character.toLowerCase;
-
 public class ROT13  {
 
+    private int shift;
+
     ROT13(Character cs, Character cf) {
+        shift = cf - cs;
     }
 
     ROT13() {
+        this.shift = 13;
     }
 
-
     public String crypt(String text) throws UnsupportedOperationException {
-
-        return "";
+        return encrypt(text);
     }
 
     public String encrypt(String text) {
-        return text;
+        StringBuilder encrypted = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            if (Character.isLowerCase(text.charAt(i)))
+                encrypted.append((char) ('a' + ( (text.charAt(i) - 'a')  + shift) % 26));
+            else if (Character.isUpperCase((text.charAt(i))))
+                encrypted.append((char) ('A' + ( (text.charAt(i) - 'A') + shift) %26));
+            else encrypted.append(text.charAt(i));
+            System.out.println(encrypted);
+        }
+        return encrypted.toString();
     }
 
     public String decrypt(String text) {
-        return text;
+        StringBuilder encrypted = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            if (Character.isLowerCase(text.charAt(i)))
+                encrypted.append((char) ('a' + ( (text.charAt(i) - 'a')  + (26 - shift)) % 26));
+            else if (Character.isUpperCase((text.charAt(i))))
+                encrypted.append((char) ('A' + ( (text.charAt(i) - 'A') + (26 - shift)) %26));
+            else encrypted.append(text.charAt(i));
+        }
+        return encrypted.toString();
     }
 
     public static String rotate(String s, Character c) {
-
-        return "";
+        int index = s.indexOf(c);
+        String beginning = s.substring(index, s.length());
+        String end = s.substring(0, index);
+        return beginning + end;
     }
 
 }

SimpleCrypt.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/Crypto/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>

pom.xml

@@ -8,5 +8,13 @@
     <artifactId>SimpleCrypt</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
+
 
 </project>