From 0c696be2aca1dfcdbe823c05aacd31bcf5395980 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 27 Nov 2017 10:04:56 -0500 Subject: [PATCH 1/3] ehhhhh --- src/main/java/io/zipcoder/Problem1.java | 22 +++++++++++++++++++++ src/test/java/io/zipcoder/Problem1Test.java | 11 +++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/main/java/io/zipcoder/Problem1.java b/src/main/java/io/zipcoder/Problem1.java index 6cd6024..020d510 100644 --- a/src/main/java/io/zipcoder/Problem1.java +++ b/src/main/java/io/zipcoder/Problem1.java @@ -1,4 +1,26 @@ package io.zipcoder; +import java.util.HashMap; +import java.util.Map; + public class Problem1 { + + //need a map + HashMap characterMap = new HashMap(); + + public String replaceCharacters(String stringToReplace){ + characterMap.put('f','7'); + characterMap.put('s', '$'); + characterMap.put('1', '!'); + characterMap.put('a', '@'); + + char[] charArray = stringToReplace.toCharArray(); + + for (int i = 0; i < charArray.length; i++){ + if (charArray[i] == characterMap.) + } + + return ""; + } + } diff --git a/src/test/java/io/zipcoder/Problem1Test.java b/src/test/java/io/zipcoder/Problem1Test.java index de82e99..c7333a5 100644 --- a/src/test/java/io/zipcoder/Problem1Test.java +++ b/src/test/java/io/zipcoder/Problem1Test.java @@ -1,4 +1,15 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class Problem1Test { + + @Test + public void replaceCharactersTest(){ + String expected = "The 7@rmer went to the $tore to get ! doll@ar'$ worth of 7ertilizer"; + String actual = ""; + Assert.assertEquals(expected, actual); + + } } From 716483d464d88e0631d578db9fc38c1416cb3ca0 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 29 Nov 2017 08:38:44 -0500 Subject: [PATCH 2/3] gotta fix capitalization --- src/main/java/io/zipcoder/Problem1.java | 20 +++++++++++++------- src/test/java/io/zipcoder/Problem1Test.java | 7 +++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem1.java b/src/main/java/io/zipcoder/Problem1.java index 020d510..a88b179 100644 --- a/src/main/java/io/zipcoder/Problem1.java +++ b/src/main/java/io/zipcoder/Problem1.java @@ -6,21 +6,27 @@ public class Problem1 { //need a map - HashMap characterMap = new HashMap(); + private HashMap characterMap = new HashMap(); - public String replaceCharacters(String stringToReplace){ - characterMap.put('f','7'); + public Problem1() { + characterMap.put('f', '7'); characterMap.put('s', '$'); characterMap.put('1', '!'); characterMap.put('a', '@'); + } - char[] charArray = stringToReplace.toCharArray(); + public String replaceCharacters(String stringToReplace){ + + char[] charArray = stringToReplace.toLowerCase().toCharArray(); for (int i = 0; i < charArray.length; i++){ - if (charArray[i] == characterMap.) + char charToReplace = charArray[i]; + if (characterMap.containsKey(charToReplace)){ + charArray[i] = characterMap.get(charToReplace); + } } - return ""; - } + return new String(charArray); + }//replaces letters but gotta fix capitalization } diff --git a/src/test/java/io/zipcoder/Problem1Test.java b/src/test/java/io/zipcoder/Problem1Test.java index c7333a5..0aca7bd 100644 --- a/src/test/java/io/zipcoder/Problem1Test.java +++ b/src/test/java/io/zipcoder/Problem1Test.java @@ -5,10 +5,13 @@ public class Problem1Test { + Problem1 problem1 = new Problem1(); + String stringToTest = "The Farmer went to the store to get 1 dollar’s worth of fertilizer"; + @Test public void replaceCharactersTest(){ - String expected = "The 7@rmer went to the $tore to get ! doll@ar'$ worth of 7ertilizer"; - String actual = ""; + String expected = "The 7@rmer went to the $tore to get ! doll@r'$ worth o7 7ertilizer"; + String actual = problem1.replaceCharacters(stringToTest); Assert.assertEquals(expected, actual); } From 081fe17e71b9aa494dc9f514966dac8496441c7d Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 1 Dec 2017 13:24:29 -0500 Subject: [PATCH 3/3] fixed capitalization error --- src/main/java/io/zipcoder/Problem1.java | 10 ++++------ src/test/java/io/zipcoder/Problem1Test.java | 11 +++++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/zipcoder/Problem1.java b/src/main/java/io/zipcoder/Problem1.java index a88b179..644a4d3 100644 --- a/src/main/java/io/zipcoder/Problem1.java +++ b/src/main/java/io/zipcoder/Problem1.java @@ -1,11 +1,9 @@ package io.zipcoder; import java.util.HashMap; -import java.util.Map; public class Problem1 { - //need a map private HashMap characterMap = new HashMap(); public Problem1() { @@ -17,16 +15,16 @@ public Problem1() { public String replaceCharacters(String stringToReplace){ - char[] charArray = stringToReplace.toLowerCase().toCharArray(); + char[] charArray = stringToReplace.toCharArray(); for (int i = 0; i < charArray.length; i++){ char charToReplace = charArray[i]; - if (characterMap.containsKey(charToReplace)){ - charArray[i] = characterMap.get(charToReplace); + if (characterMap.containsKey(Character.toLowerCase(charToReplace))){ + charArray[i] = characterMap.get(Character.toLowerCase(charToReplace)); } } return new String(charArray); - }//replaces letters but gotta fix capitalization + } } diff --git a/src/test/java/io/zipcoder/Problem1Test.java b/src/test/java/io/zipcoder/Problem1Test.java index 0aca7bd..8e865d6 100644 --- a/src/test/java/io/zipcoder/Problem1Test.java +++ b/src/test/java/io/zipcoder/Problem1Test.java @@ -1,12 +1,19 @@ package io.zipcoder; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; public class Problem1Test { - Problem1 problem1 = new Problem1(); - String stringToTest = "The Farmer went to the store to get 1 dollar’s worth of fertilizer"; + private Problem1 problem1; + private String stringToTest; + + @Before + public void setUp(){ + problem1 = new Problem1(); + stringToTest = "The Farmer went to the store to get 1 dollar's worth of fertilizer"; + } @Test public void replaceCharactersTest(){