From 2c8cd3e3af5246c5cea6c4c94242ddf8fef11bcf Mon Sep 17 00:00:00 2001 From: JeremyMccray Date: Fri, 6 Mar 2020 10:40:41 -0500 Subject: [PATCH 1/2] moving on --- .../assessment2/part1/BasicUtilities.java | 16 +++-- .../part1/IntegerArrayUtilities.java | 17 ++++-- .../assessment2/part1/WuTangConcatenator.java | 17 +++++- .../assessment2/part2/ArrayUtility.java | 60 +++++++++++++++++-- .../assessment2/part2/ListUtility.java | 15 ++++- 5 files changed, 107 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index 1402353..5b985c4 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,26 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - return null; + return value >= 5; } public Boolean isLessThan7(Integer value) { - return null; + + return value <=7; } public Boolean isBetween5And7(Integer valueToEvaluate) { - return null; + if(valueToEvaluate >=5 && valueToEvaluate<= 7){ + return true; + + } return false; } public Boolean startsWith(String string, Character character) { - return null; + Character chare = Character.toUpperCase(character); + if (string.charAt(0) == chare){ + return true; + + } return false; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index a360000..5b14e34 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -2,18 +2,27 @@ public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + if(array.length%2 == 0){ + return true; + + } return false; } public Integer[] range(int start, int stop) { - return null; + Integer[] answer = new Integer[stop-start+1]; + for (int i = 0; i < answer.length ; i++) { + answer[i] = start+i; + } + return answer; } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + + return array[0]+array[1]; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + + return array[array.length-1]*array[array.length-2]; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..41e8c00 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,29 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + Integer numToCheck; public WuTangConcatenator(Integer input) { + this.numToCheck = input; } public Boolean isWu() { - return null; + if(numToCheck % 3 == 0){ + return true; + } + return false; } public Boolean isTang() { - return null; + if(numToCheck % 5 == 0){ + return true; + } + return false; } public Boolean isWuTang() { - return null; + if(isWu() && isTang()){ + return true; + } + return false; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index de2f799..1be37c3 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,19 +1,71 @@ package com.zipcodewilmington.assessment2.part2; + +import java.util.Arrays; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] answer = new Integer[array1.length + array2.length]; + int counter = 0; + for (int i = 0; i countAgainst){ + answer = array[j]; + } + } + + } + counter=0; + } + + + return answer; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..5424ca6 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,14 +1,18 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.ArrayList; import java.util.List; public class ListUtility { + ArrayList testList = new ArrayList<>(); + public Boolean add(int i) { - return null; + testList.add(i); + return testList.contains(i); } public Integer size() { - return null; + return testList.size(); } public List getUnique() { @@ -24,6 +28,11 @@ public Integer mostCommon() { } public Boolean contains(Integer valueToAdd) { - return null; + if(!valueToAdd.equals(null)) { + if (testList.contains(valueToAdd)) { + return true; + } + } + return false; } } From bf90f4028dbc0b802777e7c48155e604187f47bd Mon Sep 17 00:00:00 2001 From: JeremyMccray Date: Fri, 6 Mar 2020 11:29:27 -0500 Subject: [PATCH 2/2] this test is busted --- .../assessment2/part2/ListUtility.java | 47 +++++++++++++++---- .../assessment2/part2/Router.java | 16 ++++++- .../assessment2/part3/Bird.java | 12 ++++- .../assessment2/part3/BlueJay.java | 12 ++++- .../assessment2/part3/Horse.java | 16 ++++++- .../assessment2/part3/RedRobin.java | 23 ++++++++- .../assessment2/part3/SpeedComparator.java | 14 +++++- .../part2/router/ToStringTest.java | 3 +- 8 files changed, 126 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index 5424ca6..027cb7d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,14 +1,16 @@ package com.zipcodewilmington.assessment2.part2; + import java.util.ArrayList; +import java.util.HashSet; import java.util.List; - public class ListUtility { ArrayList testList = new ArrayList<>(); - public Boolean add(int i) { - testList.add(i); - return testList.contains(i); + public Boolean add(Integer i) { + Integer j = i; + testList.add(j); + return testList.contains(j); } public Integer size() { @@ -16,23 +18,50 @@ public Integer size() { } public List getUnique() { - return null; + HashSet test = new HashSet<>(this.testList); + ArrayList answer = new ArrayList<>(test); + return answer; } public String join() { - return null; + String answer =""; + for (int i = 0; i countAgainst){ + countAgainst=counter; + answer = testList.get(j); + } + } + + } + counter=0; + } + + + return answer; } public Boolean contains(Integer valueToAdd) { - if(!valueToAdd.equals(null)) { + if (testList.contains(valueToAdd)) { return true; } - } + return false; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java index 2267425..9408322 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,20 +1,32 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.Hashtable; + public class Router { + Hashtable test = new Hashtable<>(); public void add(String path, String controller) { + test.put(path,controller); } public Integer size() { - return null; + return test.size(); } public String getController(String path) { - return null; + + return test.get(path); } public void update(String path, String studentController) { + test.replace(path,studentController); } public void remove(String path) { + test.remove(path); + } + + @Override + public String toString() { + return ""+ test.keySet() ; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java index ee230c5..c3a47f6 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java @@ -1,7 +1,17 @@ package com.zipcodewilmington.assessment2.part3; -public class Bird { +public class Bird implements Animal{ public String move() { + return "fly"; + } + + @Override + public int getSpeed() { + return 0; + } + + @Override + public String color() { return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java index f18d13a..3006221 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java @@ -1,4 +1,14 @@ package com.zipcodewilmington.assessment2.part3; -public class BlueJay { +public class BlueJay extends Bird { + @Override + public String color(){ + return "blue"; + + } + + @Override + public int getSpeed() { + return 13; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java index e78cf2b..e033c1c 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java @@ -1,4 +1,18 @@ package com.zipcodewilmington.assessment2.part3; -public class Horse{ +public class Horse implements Animal{ + @Override + public String move() { + return "gallop"; + } + + @Override + public int getSpeed() { + return 40; + } + + @Override + public String color() { + return "brown"; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java index c1e85f2..5bd9fdb 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,25 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird{ +String migrationMonth; + + public void setMigrationMonth(String month){ + this.migrationMonth=month; + } + + public String getMigrationMonth(){ + return this.migrationMonth; + } + @Override + public int getSpeed() { + return 10; + } + + @Override + public String color(){ + return "red"; + + } + + } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java index 532e766..dc5e4b6 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java @@ -1,4 +1,16 @@ package com.zipcodewilmington.assessment2.part3; -public class SpeedComparator { +import java.util.Comparator; + +public class SpeedComparator implements Comparator { + @Override + public int compare(Animal o1, Animal o2) { + if(o1.getSpeed() == o2.getSpeed()) { + return 0; + } + if(o1.getSpeed()> o2.getSpeed()){ + return -1; + } + return 1; + } } diff --git a/src/test/java/com/zipcodewilmington/assessment2/part2/router/ToStringTest.java b/src/test/java/com/zipcodewilmington/assessment2/part2/router/ToStringTest.java index b199783..6d2998a 100644 --- a/src/test/java/com/zipcodewilmington/assessment2/part2/router/ToStringTest.java +++ b/src/test/java/com/zipcodewilmington/assessment2/part2/router/ToStringTest.java @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; + public class ToStringTest { @Test public void test1() { @@ -36,7 +37,7 @@ public void test4() { new Pair<>("/instructors", "InstructorController")); } - @Test + public void test(Pair... pairs) { // given StringBuilder expectedString = new StringBuilder();