Merge 5c148a667c5f1df299c9d43d62783425c8153741 into acdd71eb540bd8356719c3274bc7bbbdbd82ea21

Crypto/src/ROT13.java

@@ -12,21 +12,42 @@ public class ROT13  {
 
 
     public String crypt(String text) throws UnsupportedOperationException {
+        StringBuilder textSB = new StringBuilder();
+        for (int i = 0; i < text.length(); i++ ) {
+            char c = text.charAt(i);
 
-        return "";
+            if (c >= 'a' && c <= 'm') textSB.append(c += 13);
+
+            else if (c >= 'n' && c <= 'z') textSB.append(c -= 13);
+
+            else if (c >= 'A' && c <= 'M') textSB.append(c += 13);
+
+            else if (c >= 'N' && c <= 'Z') textSB.append(c -= 13);
+
+            else textSB.append(c);
+        }
+        return textSB.toString();
     }
 
     public String encrypt(String text) {
-        return text;
+        return crypt(text);
     }
 
     public String decrypt(String text) {
-        return text;
+        return crypt(text);
     }
 
     public static String rotate(String s, Character c) {
-
-        return "";
+        StringBuilder textSB = new StringBuilder();
+        int startingIndex = s.indexOf(c);
+
+        for (int i = startingIndex; i < s.length(); i++) {
+            textSB.append(s.charAt(i));
+        }
+        for (int i = 0; i < startingIndex; i++) {
+            textSB.append(s.charAt(i));
+        }
+        return textSB.toString();
     }
 
 }

Crypto/src/ROT13Test.java

@@ -1,6 +1,7 @@
-import org.junit.Test;
 
-import static org.junit.Assert.*;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 
 public class ROT13Test {
 
@@ -16,7 +17,7 @@ public class ROT13Test {
         String actual = cipher.rotate(s1, 'A');
 
         // Then
-        assertTrue(actual.equals(s2));
+        Assert.assertTrue(actual.equals(s2));
     }
 
     @Test
@@ -30,7 +31,7 @@ public class ROT13Test {
         String actual = cipher.rotate(s1, 'D');
 
         // Then
-        assertTrue(actual.equals(s2));
+        Assert.assertTrue(actual.equals(s2));
     }
 
     @Test
@@ -45,7 +46,7 @@ public class ROT13Test {
         System.out.println(s1);
         System.out.println(actual);
         // Then
-        assertTrue(actual.equals(s2));
+        Assert.assertTrue(actual.equals(s2));
     }
 
     @Test
@@ -64,14 +65,14 @@ public class ROT13Test {
         System.out.println(Q1);
         System.out.println(A1);
         // Then
-        assertTrue(actual.equals(A1));
+        Assert.assertTrue(actual.equals(A1));
 
         // When
         String actual2 = cipher.decrypt(Q2);
         System.out.println(Q2);
         System.out.println(A2);
         // Then
-        assertTrue(actual2.equals(A2));
+        Assert.assertTrue(actual2.equals(A2));
     }
     @Test
     public void cryptTest2() {
@@ -85,7 +86,7 @@ public class ROT13Test {
         String actual = cipher.crypt(cipher.crypt(Q1));
         System.out.println(actual);
         // Then
-        assertTrue(actual.equals(Q1));
+        Assert.assertTrue(actual.equals(Q1));
     }
 
 }

SimpleCrypt.iml

@@ -0,0 +1,16 @@
+<?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="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.testng:testng:6.14.2" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
+  </component>
+</module>

pom.xml

@@ -7,6 +7,13 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>SimpleCrypt</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
 
 
 </project>