refactor 2325

fishercoder1534 · fishercoder1534 · commit 6ba5230651b1 · 2022-10-31T08:17:54.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_2325.java b/src/main/java/com/fishercoder/solutions/_2325.java
@@ -31,6 +31,7 @@ public String decodeMessage(String key, String message) {
             return sb.toString();
         }
     }
+
     public static class Solution2 {
 
         public String decodeMessage(String key, String message) {
@@ -41,17 +42,20 @@ public String decodeMessage(String key, String message) {
             char keyArr[] = key.toCharArray();
             StringBuilder result = new StringBuilder();
 
-            for(int i = 0; i < keyArr.length; i++) {
+            for (int i = 0; i < keyArr.length; i++) {
                 if (keyArr[i] != ' ' && !bucket.containsKey(keyArr[i])) {
                     bucket.put(keyArr[i], ch++);
                 }
             }
 
             // decode the message using the bucket
             char msgArr[] = message.toCharArray();
-            for(int i = 0; i < msgArr.length; i++) {
-                if(msgArr[i] == ' ') result.append(" ");
-                else result.append(bucket.get(msgArr[i]));
+            for (int i = 0; i < msgArr.length; i++) {
+                if (msgArr[i] == ' ') {
+                    result.append(" ");
+                } else {
+                    result.append(bucket.get(msgArr[i]));
+                }
             }
             return result.toString();
         }
diff --git a/src/test/java/com/fishercoder/_2325Test.java b/src/test/java/com/fishercoder/_2325Test.java
@@ -6,17 +6,28 @@
 import org.junit.Test;
 
 public class _2325Test {
+    private static _2325.Solution1 solution1;
     private static _2325.Solution2 solution2;
     private String key;
     private String message;
 
     @BeforeClass
     public static void setup() {
+        solution1 = new _2325.Solution1();
         solution2 = new _2325.Solution2();
     }
 
     @Test
     public void test1() {
+        key = "the quick brown fox jumps over the lazy dog";
+        message = "vkbs bs t suepuv";
+        String actual = solution1.decodeMessage(key, message);
+        String expected = "this is a secret";
+        Assert.assertEquals(actual, expected);
+    }
+
+    @Test
+    public void test2() {
         key = "the quick brown fox jumps over the lazy dog";
         message = "vkbs bs t suepuv";
         String actual = solution2.decodeMessage(key, message);

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public String decodeMessage(String key, String message) {`
`31`	`31`	`return sb.toString();`
`32`	`32`	`}`
`33`	`33`	`}`
	`34`	`+`
`34`	`35`	`public static class Solution2 {`
`35`	`36`
`36`	`37`	`public String decodeMessage(String key, String message) {`
`@@ -41,17 +42,20 @@ public String decodeMessage(String key, String message) {`
`41`	`42`	`char keyArr[] = key.toCharArray();`
`42`	`43`	`StringBuilder result = new StringBuilder();`
`43`	`44`
`44`		`- for(int i = 0; i < keyArr.length; i++) {`
	`45`	`+ for (int i = 0; i < keyArr.length; i++) {`
`45`	`46`	`if (keyArr[i] != ' ' && !bucket.containsKey(keyArr[i])) {`
`46`	`47`	`bucket.put(keyArr[i], ch++);`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`// decode the message using the bucket`
`51`	`52`	`char msgArr[] = message.toCharArray();`
`52`		`- for(int i = 0; i < msgArr.length; i++) {`
`53`		`- if(msgArr[i] == ' ') result.append(" ");`
`54`		`- else result.append(bucket.get(msgArr[i]));`
	`53`	`+ for (int i = 0; i < msgArr.length; i++) {`
	`54`	`+ if (msgArr[i] == ' ') {`
	`55`	`+ result.append(" ");`
	`56`	`+ } else {`
	`57`	`+ result.append(bucket.get(msgArr[i]));`
	`58`	`+ }`
`55`	`59`	`}`
`56`	`60`	`return result.toString();`
`57`	`61`	`}`