From 9c859937f9c12dd35192926b4d2236d22182c5bc Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 9 Aug 2021 16:20:19 -0400 Subject: [PATCH 1/3] working on tests --- Hurtlocker.iml | 18 ---- pom.xml | 12 +++ src/main/java/Grocery.java | 40 ++++++++ src/main/java/Main.java | 188 +++++++++++++++++++++++++++++++++++- src/test/java/MainTest.java | 40 ++++++++ target/classes/Main.class | Bin 1162 -> 6595 bytes 6 files changed, 275 insertions(+), 23 deletions(-) delete mode 100644 Hurtlocker.iml create mode 100644 src/main/java/Grocery.java create mode 100644 src/test/java/MainTest.java diff --git a/Hurtlocker.iml b/Hurtlocker.iml deleted file mode 100644 index 22967e8..0000000 --- a/Hurtlocker.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 39639cd..5ac4bdd 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,18 @@ io.zipcoder HurtLocker 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 7 + 7 + + + + diff --git a/src/main/java/Grocery.java b/src/main/java/Grocery.java new file mode 100644 index 0000000..915094d --- /dev/null +++ b/src/main/java/Grocery.java @@ -0,0 +1,40 @@ +import java.text.SimpleDateFormat; + +public class Grocery { + String name; + Double price; + SimpleDateFormat date; + + public Grocery(){ + } + + public Grocery(String name, Double price, SimpleDateFormat date) { + this.name = name; + this.price = price; + this.date = date; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public SimpleDateFormat getDate() { + return date; + } + + public void setDate(SimpleDateFormat date) { + this.date = date; + } +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 632942a..36bd985 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,17 +1,195 @@ -import org.apache.commons.io.IOUtils; +import com.sun.org.apache.xerces.internal.impl.xpath.regex.Match; + +import java.io.File; import java.io.IOException; +import java.nio.file.LinkPermission; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class Main { - public String readRawDataToString() throws Exception{ + + public String readRawDataToString(){ ClassLoader classLoader = getClass().getClassLoader(); - String result = IOUtils.toString(classLoader.getResourceAsStream("RawData.txt")); - return result; + File file = new File(classLoader.getResource("RawData.txt").getFile()); + StringBuilder result = new StringBuilder(""); + + try(Scanner scanner = new Scanner(file)){ + while(scanner.hasNextLine()){ + String line = scanner.nextLine(); + result.append(line).append("\n"); + } + + }catch (IOException e){ + e.printStackTrace(); + } + return result.toString(); + + } + public String nameChange(String input){ + try{ + Pattern pattern = Pattern.compile("name", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(input); + String nameString = matcher.replaceAll("Name"); + return nameString; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + public String changeMilk(String input){ + try{ + Pattern pattern = Pattern.compile("milk", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(input); + String milk = matcher.replaceAll("Milk"); + return milk; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } } - public static void main(String[] args) throws Exception{ + public String priceChange(String input){ + try{ + Pattern pattern = Pattern.compile("price", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(input); + String priceString = matcher.replaceAll("Name"); + return priceString; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + public String changeApples(String input){ + try{ + Pattern pattern = Pattern.compile("apples", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(input); + String apples = matcher.replaceAll("Apples"); + return apples; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + public String changeBread(String input){ + try{ + Pattern pattern = Pattern.compile("Bread", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(input); + String bread = matcher.replaceAll("Bread"); + return bread; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + public String changeCookies(String input){ + try{ + Pattern pattern = Pattern.compile("c[o0][o0]kies", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(input); + String cookies = matcher.replaceAll("Cookies"); + return cookies; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + public static void main(String[] args) { String output = (new Main()).readRawDataToString(); System.out.println(output); + } +// public int countMilk(){ +// List index = new ArrayList<>(); +// String jerk = readRawDataToString(); +// Pattern pattern = Pattern.compile("milk", Pattern.CASE_INSENSITIVE); +// Matcher matcher = pattern.matcher(jerk); +// +// for (int i = 0; matcher.find(); i++) { +// index.add(matcher.start()); +// } +// return index.size(); +// +// } + public String listEm(String input) { + try { + Pattern pattern = Pattern.compile("##"); + Matcher matcher = pattern.matcher(input); + String result = matcher.replaceAll("\n"); + return result; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + + public String correctSeparator(){ + try{ + String jerk = readRawDataToString(); + Pattern pattern = Pattern.compile("[!@^%*]"); + Matcher matcher = pattern.matcher(jerk); + String result = matcher.replaceAll(";"); + return result; + }catch (Exception e){ + throw new UnsupportedOperationException(); + } + } + public int findGroceries(String input) { + Integer holdingVal = 0; + Boolean checkVal = false; + Pattern pattern = Pattern.compile(input, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(readyForFormatting()); + while (!checkVal) { + if(!matcher.find()){ + checkVal = true; + continue; + } + holdingVal++; + } + return holdingVal; + } + + public String formatting(){ + String result = + "name: Milk seen: " + findGroceries("milk") + " times\n" + + "============= =============\n" + + "Price: 3.23 seen: " + findGroceries("milk;price:3.23") + " times\n" + + "------------- --------------\n" + + "Price: 1.23 seen: " + findGroceries("milk;price:1.23") + " times\n\n" + + + "name: Bread seen: " + findGroceries("bread") + " times\n" + + "============== ==============\n" + + "Price: 1.23 seen: " + findGroceries("price:1.23") + " times\n\n" + + "-------------- ---------------\n" + + + "name: Cookies seen: " + findGroceries("cookies") + " times\n" + + "=============== ===============\n" + + "Price: 2.25 seen: " + findGroceries("price:2.25") + " times\n" + + "--------------- ---------------\n" + + + "name: Apples seen: " + findGroceries("apples") + " times\n" + + "=============== ===============\n" + + "Price: 0.25 seen: " + findGroceries("price:0.25") + " times\n" + + "--------------- ---------------\n" + + "Price: 0.23 seen: " + findGroceries("price:0.23") + " times\n\n" + + + "Errors seen: " + countingErrors() + " times"; + return result; + } + + + public int countingErrors(){ + int counter = 0; + counter += findGroceries("Name:;"); + counter += findGroceries("milk") - (findGroceries("milk;price:3.23") + findGroceries("milk;price:1.23")); + return counter; + } + + public String readyForFormatting(){ + String result = listEm(correctSeparator()); + String result1 = changeApples(result); + String result2 = changeBread(result1); + String result3 = changeCookies(result2); + String result4 = changeMilk(result3); + String result5 = nameChange(result4); + String result6 = priceChange(result5); + return result6; + } } diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java new file mode 100644 index 0000000..a2dbfbf --- /dev/null +++ b/src/test/java/MainTest.java @@ -0,0 +1,40 @@ +import org.junit.Assert; +import org.junit.Test; + +public class MainTest { + Main test = new Main(); + +// @Test +// public void findAlpha(){ +// String find = test.findAlphabetCharacters(); +// System.out.println(find); +// } + +// @Test +// public void listTest() { +// String formation = test.listEm(); +// System.out.println(formation); +// } +// @Test +// public void milkCount(){ +// int actual = 8; +// int expected = test.countMilk(); +// +// Assert.assertEquals(expected,actual); +// } +// @Test +// public void separator(){ +// String finder = test.findSeparatorCorrected(); +// System.out.println(finder); +// } + @Test + public void correctSeparation(){ + String finder = test.correctSeparator(); + System.out.println(finder); + } + @Test + public void formatTest(){ + System.out.println(test.formatting()); + } + +} diff --git a/target/classes/Main.class b/target/classes/Main.class index c9d3858bc278f548c9eaabc471ed4e0ba034dcf0..a8461e66cf20281f6decb0739d2e9afe4385defb 100644 GIT binary patch literal 6595 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 N>}gcxphLz-{|lGHhQI&- literal 1162 zcmZuwYg5xe6g^8z)288JOF>i=-z^{!-wHkuaK@P+4j?n?rzK=cm^A4msp7v@O^1Q2YPqK4I&NffQ%4yU9W$8KFsDOP z#~NhTCrGOes5g0FjJdJJ%lwp-67yBGD zRnUm*4W`n!f<|aNuUsWPr_{}>+y;g)Y~UX5Yj|MbAs$giTkm{)7;AWJ;0YErEE#wT zb~UZI2F6g*@Z7))ENggaU0y9bWVyv45TSeHPy>cp*{5b$3wTTZrUq)Th# zhC7r_ecm$6ZS-mzE`KGb6a1c*kM&Ej*d!>>v+q%*R3PzD?|6V z1+=;XdAu&Aewuc0nGeR``vOuBYW7@5xHD-5?cmH2#5ev7V3cd7eDG0;THnk}T882o|E`rKFglUTzojD{?~0&=aG(+RH~Gs_&~m|*Mz zIcG7+^&I(Wdd`z^0aNs-j2pBAw8dZ0-X9^`M9%sSeYS~wxA-LC5b{)6pd2M)JfYzt UE^(J Date: Mon, 9 Aug 2021 16:24:22 -0400 Subject: [PATCH 2/3] tests working --- src/main/java/Main.java | 38 ++++++++++++++++++++++++------------ src/test/java/MainTest.java | 30 ++++++++++++---------------- target/classes/Main.class | Bin 6595 -> 7083 bytes 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 36bd985..c655607 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -30,6 +30,20 @@ public String readRawDataToString(){ return result.toString(); } + public String findAlphabetCharacters() { + String result = ""; + String jerkTest = readRawDataToString(); + Pattern pattern = Pattern.compile("[A-Z]", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(jerkTest); + String horation = ""; + while (matcher.find()) { + horation = matcher.group(); + result += horation; + } + + return result; + } + public String nameChange(String input){ try{ Pattern pattern = Pattern.compile("name", Pattern.CASE_INSENSITIVE); @@ -96,18 +110,18 @@ public static void main(String[] args) { System.out.println(output); } -// public int countMilk(){ -// List index = new ArrayList<>(); -// String jerk = readRawDataToString(); -// Pattern pattern = Pattern.compile("milk", Pattern.CASE_INSENSITIVE); -// Matcher matcher = pattern.matcher(jerk); -// -// for (int i = 0; matcher.find(); i++) { -// index.add(matcher.start()); -// } -// return index.size(); -// -// } + public int countMilk(){ + List index = new ArrayList<>(); + String jerk = readRawDataToString(); + Pattern pattern = Pattern.compile("milk", Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(jerk); + + for (int i = 0; matcher.find(); i++) { + index.add(matcher.start()); + } + return index.size(); + + } public String listEm(String input) { try { Pattern pattern = Pattern.compile("##"); diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java index a2dbfbf..dbc752d 100644 --- a/src/test/java/MainTest.java +++ b/src/test/java/MainTest.java @@ -4,29 +4,25 @@ public class MainTest { Main test = new Main(); -// @Test -// public void findAlpha(){ -// String find = test.findAlphabetCharacters(); -// System.out.println(find); -// } + @Test + public void findAlpha(){ + String find = test.findAlphabetCharacters(); + System.out.println(find); + } // @Test // public void listTest() { // String formation = test.listEm(); // System.out.println(formation); // } -// @Test -// public void milkCount(){ -// int actual = 8; -// int expected = test.countMilk(); -// -// Assert.assertEquals(expected,actual); -// } -// @Test -// public void separator(){ -// String finder = test.findSeparatorCorrected(); -// System.out.println(finder); -// } + @Test + public void milkCount(){ + int actual = 8; + int expected = test.countMilk(); + + Assert.assertEquals(expected,actual); + } + @Test public void correctSeparation(){ String finder = test.correctSeparator(); diff --git a/target/classes/Main.class b/target/classes/Main.class index a8461e66cf20281f6decb0739d2e9afe4385defb..c1bed94ae9ed0c4dfed6488cdb4d7e994171a463 100644 GIT binary patch literal 7083 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 From a0d87d108b543bed2eeb0848a2e3432b576d843e Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 9 Aug 2021 17:16:30 -0400 Subject: [PATCH 3/3] updated methods --- src/main/java/Main.java | 6 +++--- target/classes/Main.class | Bin 7083 -> 7376 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index c655607..a244ca7 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -69,7 +69,7 @@ public String priceChange(String input){ try{ Pattern pattern = Pattern.compile("price", Pattern.CASE_INSENSITIVE); Matcher matcher = pattern.matcher(input); - String priceString = matcher.replaceAll("Name"); + String priceString = matcher.replaceAll("Price"); return priceString; }catch (Exception e){ throw new UnsupportedOperationException(); @@ -169,12 +169,12 @@ public String formatting(){ "name: Bread seen: " + findGroceries("bread") + " times\n" + "============== ==============\n" + - "Price: 1.23 seen: " + findGroceries("price:1.23") + " times\n\n" + + "Price: 1.23 seen: " + findGroceries("bread") + " times\n\n" + "-------------- ---------------\n" + "name: Cookies seen: " + findGroceries("cookies") + " times\n" + "=============== ===============\n" + - "Price: 2.25 seen: " + findGroceries("price:2.25") + " times\n" + + "Price: 2.25 seen: " + findGroceries("cookies") + " times\n" + "--------------- ---------------\n" + "name: Apples seen: " + findGroceries("apples") + " times\n" + diff --git a/target/classes/Main.class b/target/classes/Main.class index c1bed94ae9ed0c4dfed6488cdb4d7e994171a463..05702cf5f8c8b4c4ef1eb5702f97042857d3be00 100644 GIT binary patch literal 7376 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 GNB#?Fv@#R` literal 7083 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