From a963110d7a817ab67143c43d3454d2ba441215b5 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Mon, 3 Jul 2017 22:42:31 -0400 Subject: [PATCH 01/26] Removed KindergartenGarden stubs, commented out tests. --- .../src/main/java/KindergartenGarden.java | 14 +- .../src/main/java/Plant.java | 21 -- .../src/test/java/KindergartenGardenTest.java | 216 +++++++++--------- 3 files changed, 109 insertions(+), 142 deletions(-) delete mode 100644 exercises/kindergarten-garden/src/main/java/Plant.java diff --git a/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java b/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java index ad766e109..54a2a7455 100644 --- a/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java +++ b/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java @@ -1,15 +1,3 @@ -import java.util.List; - public class KindergartenGarden { - public KindergartenGarden(String garden, String[] students) { - throw new UnsupportedOperationException("Delete this statement and write your own implementation."); - } - - public KindergartenGarden(String garden) { - throw new UnsupportedOperationException("Delete this statement and write your own implementation."); - } - - public List getPlantsOfStudent(String student) { - throw new UnsupportedOperationException("Delete this statement and write your own implementation."); - } + } \ No newline at end of file diff --git a/exercises/kindergarten-garden/src/main/java/Plant.java b/exercises/kindergarten-garden/src/main/java/Plant.java deleted file mode 100644 index d51541c71..000000000 --- a/exercises/kindergarten-garden/src/main/java/Plant.java +++ /dev/null @@ -1,21 +0,0 @@ -public enum Plant { - VIOLETS, - RADISHES, - CLOVER, - GRASS; - - public static Plant getPlant(char plantCode) { - switch (plantCode) { - case 'G': - return GRASS; - case 'C': - return CLOVER; - case 'R': - return RADISHES; - case 'V': - return VIOLETS; - } - - return null; - } -} \ No newline at end of file diff --git a/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java b/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java index 5957a91f6..a002b9b64 100644 --- a/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java +++ b/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java @@ -10,173 +10,173 @@ public class KindergartenGardenTest { @Test public void singleStudent() { - String student = "Alice"; - String plants = "RC\nGG"; - List expected = Arrays.asList(Plant.RADISHES, Plant.CLOVER, Plant.GRASS, Plant.GRASS); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Alice"; +// String plants = "RC\nGG"; +// List expected = Arrays.asList(Plant.RADISHES, Plant.CLOVER, Plant.GRASS, Plant.GRASS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void singleStudent2() { - String student = "Alice"; - String plants = "VC\nRC"; - List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.CLOVER); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Alice"; +// String plants = "VC\nRC"; +// List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.CLOVER); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void twoStudents() { - String student = "Bob"; - String plants = "VVCG\nVVRC"; - List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.RADISHES, Plant.CLOVER); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Bob"; +// String plants = "VVCG\nVVRC"; +// List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.RADISHES, Plant.CLOVER); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void oneGardenSecondStudent() { - String student = "Bob"; - String plants = "VVCCGG\nVVCCGG"; - List expected = Arrays.asList(Plant.CLOVER, Plant.CLOVER, Plant.CLOVER, Plant.CLOVER); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Bob"; +// String plants = "VVCCGG\nVVCCGG"; +// List expected = Arrays.asList(Plant.CLOVER, Plant.CLOVER, Plant.CLOVER, Plant.CLOVER); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void oneGardenThirdStudent() { - String student = "Charlie"; - String plants = "VVCCGG\nVVCCGG"; - List expected = Arrays.asList(Plant.GRASS, Plant.GRASS, Plant.GRASS, Plant.GRASS); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Charlie"; +// String plants = "VVCCGG\nVVCCGG"; +// List expected = Arrays.asList(Plant.GRASS, Plant.GRASS, Plant.GRASS, Plant.GRASS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void fullGardenFirstStudent() { - String student = "Alice"; - String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; - List expected = Arrays.asList(Plant.VIOLETS, Plant.RADISHES, Plant.VIOLETS, Plant.RADISHES); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Alice"; +// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; +// List expected = Arrays.asList(Plant.VIOLETS, Plant.RADISHES, Plant.VIOLETS, Plant.RADISHES); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void fullGardenSecondStudent() { - String student = "Bob"; - String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; - List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.CLOVER, Plant.CLOVER); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Bob"; +// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; +// List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.CLOVER, Plant.CLOVER); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void fullGardenSecondToLastStudent() { - String student = "Kincaid"; - String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; - List expected = Arrays.asList(Plant.GRASS, Plant.CLOVER, Plant.CLOVER, Plant.GRASS); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Kincaid"; +// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; +// List expected = Arrays.asList(Plant.GRASS, Plant.CLOVER, Plant.CLOVER, Plant.GRASS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void fullGardenLastStudent() { - String student = "Larry"; - String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; - List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.VIOLETS); - - assertEquals( - expected, - new KindergartenGarden(plants).getPlantsOfStudent(student) - ); +// String student = "Larry"; +// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; +// List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.VIOLETS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void customStudentGardenFirstStudentInAlphabeticalOrder() { - String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; - String student = "Patricia"; - String plants = "VCRRGVRG\nRVGCCGCV"; - List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.VIOLETS); - - assertEquals( - expected, - new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) - ); +// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; +// String student = "Patricia"; +// String plants = "VCRRGVRG\nRVGCCGCV"; +// List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.VIOLETS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void customStudentGardenSecondStudentInAlphabeticalOrder() { - String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; - String student = "Roger"; - String plants = "VCRRGVRG\nRVGCCGCV"; - List expected = Arrays.asList(Plant.RADISHES, Plant.RADISHES, Plant.GRASS, Plant.CLOVER); - - assertEquals( - expected, - new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) - ); +// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; +// String student = "Roger"; +// String plants = "VCRRGVRG\nRVGCCGCV"; +// List expected = Arrays.asList(Plant.RADISHES, Plant.RADISHES, Plant.GRASS, Plant.CLOVER); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void customStudentGardenThirdStudentInAlphabeticalOrder() { - String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; - String student = "Samantha"; - String plants = "VCRRGVRG\nRVGCCGCV"; - List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.GRASS); - - assertEquals( - expected, - new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) - ); +// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; +// String student = "Samantha"; +// String plants = "VCRRGVRG\nRVGCCGCV"; +// List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.GRASS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) +// ); } @Ignore("Remove to run test") @Test public void customStudentGardenFourthStudentInAlphabeticalOrder() { - String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; - String student = "Xander"; - String plants = "VCRRGVRG\nRVGCCGCV"; - List expected = Arrays.asList(Plant.RADISHES, Plant.GRASS, Plant.CLOVER, Plant.VIOLETS); - - assertEquals( - expected, - new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) - ); +// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; +// String student = "Xander"; +// String plants = "VCRRGVRG\nRVGCCGCV"; +// List expected = Arrays.asList(Plant.RADISHES, Plant.GRASS, Plant.CLOVER, Plant.VIOLETS); +// +// assertEquals( +// expected, +// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) +// ); } } From 4a8540d1229fdbbf9888668f884ac2185b84891a Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Mon, 3 Jul 2017 22:43:37 -0400 Subject: [PATCH 02/26] Removed Collatz-Conjecture stubs and commented out tests. --- .../src/main/java/CollatzCalculator.java | 4 ---- .../src/test/java/CollatzCalculatorTest.java | 24 +++++++++---------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java b/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java index 6558907cd..447166445 100644 --- a/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java +++ b/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java @@ -1,7 +1,3 @@ class CollatzCalculator { - int computeStepCount(int start) { - throw new UnsupportedOperationException("Delete this statement and write your own implementation."); - } - } diff --git a/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java b/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java index fe178d8b5..7e0c61fcd 100644 --- a/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java +++ b/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java @@ -23,43 +23,43 @@ public void setUp() { @Test public void testZeroStepsRequiredWhenStartingFrom1() { - assertEquals(0, collatzCalculator.computeStepCount(1)); +// assertEquals(0, collatzCalculator.computeStepCount(1)); } @Ignore("Remove to run test") @Test public void testCorrectNumberOfStepsWhenAllStepsAreDivisions() { - assertEquals(4, collatzCalculator.computeStepCount(16)); +// assertEquals(4, collatzCalculator.computeStepCount(16)); } @Ignore("Remove to run test") @Test public void testCorrectNumberOfStepsWhenBothStepTypesAreNeeded() { - assertEquals(9, collatzCalculator.computeStepCount(12)); +// assertEquals(9, collatzCalculator.computeStepCount(12)); } @Ignore("Remove to run test") @Test public void testAVeryLargeInput() { - assertEquals(152, collatzCalculator.computeStepCount(1000000)); +// assertEquals(152, collatzCalculator.computeStepCount(1000000)); } @Ignore("Remove to run test") @Test public void testZeroIsConsideredInvalidInput() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Only natural numbers are allowed"); - - collatzCalculator.computeStepCount(0); +// expectedException.expect(IllegalArgumentException.class); +// expectedException.expectMessage("Only natural numbers are allowed"); +// +// collatzCalculator.computeStepCount(0); } @Ignore("Remove to run test") @Test public void testNegativeIntegerIsConsideredInvalidInput() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Only natural numbers are allowed"); - - collatzCalculator.computeStepCount(-15); +// expectedException.expect(IllegalArgumentException.class); +// expectedException.expectMessage("Only natural numbers are allowed"); +// +// collatzCalculator.computeStepCount(-15); } } From 0deaff1e4b9ba4e77b765cccfab4a1ec675a6dd1 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 14:45:57 -0400 Subject: [PATCH 03/26] Addressed pull request comments: - Classes as a whole removed, not just method/constructor stubs - Commenting out tests undone per discussion, #683 - Enum 'Plant' re-added to Kindergarten Garden per discussion - .keep added to empty source folders --- .../collatz-conjecture/src/main/java/.keep | 0 .../src/main/java/CollatzCalculator.java | 3 - .../src/test/java/CollatzCalculatorTest.java | 24 +- .../src/main/java/KindergartenGarden.java | 3 - .../src/main/java/Plant.java | 21 ++ .../src/test/java/KindergartenGardenTest.java | 216 +++++++++--------- 6 files changed, 141 insertions(+), 126 deletions(-) create mode 100644 exercises/collatz-conjecture/src/main/java/.keep delete mode 100644 exercises/collatz-conjecture/src/main/java/CollatzCalculator.java delete mode 100644 exercises/kindergarten-garden/src/main/java/KindergartenGarden.java create mode 100644 exercises/kindergarten-garden/src/main/java/Plant.java diff --git a/exercises/collatz-conjecture/src/main/java/.keep b/exercises/collatz-conjecture/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java b/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java deleted file mode 100644 index 447166445..000000000 --- a/exercises/collatz-conjecture/src/main/java/CollatzCalculator.java +++ /dev/null @@ -1,3 +0,0 @@ -class CollatzCalculator { - -} diff --git a/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java b/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java index 7e0c61fcd..fe178d8b5 100644 --- a/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java +++ b/exercises/collatz-conjecture/src/test/java/CollatzCalculatorTest.java @@ -23,43 +23,43 @@ public void setUp() { @Test public void testZeroStepsRequiredWhenStartingFrom1() { -// assertEquals(0, collatzCalculator.computeStepCount(1)); + assertEquals(0, collatzCalculator.computeStepCount(1)); } @Ignore("Remove to run test") @Test public void testCorrectNumberOfStepsWhenAllStepsAreDivisions() { -// assertEquals(4, collatzCalculator.computeStepCount(16)); + assertEquals(4, collatzCalculator.computeStepCount(16)); } @Ignore("Remove to run test") @Test public void testCorrectNumberOfStepsWhenBothStepTypesAreNeeded() { -// assertEquals(9, collatzCalculator.computeStepCount(12)); + assertEquals(9, collatzCalculator.computeStepCount(12)); } @Ignore("Remove to run test") @Test public void testAVeryLargeInput() { -// assertEquals(152, collatzCalculator.computeStepCount(1000000)); + assertEquals(152, collatzCalculator.computeStepCount(1000000)); } @Ignore("Remove to run test") @Test public void testZeroIsConsideredInvalidInput() { -// expectedException.expect(IllegalArgumentException.class); -// expectedException.expectMessage("Only natural numbers are allowed"); -// -// collatzCalculator.computeStepCount(0); + expectedException.expect(IllegalArgumentException.class); + expectedException.expectMessage("Only natural numbers are allowed"); + + collatzCalculator.computeStepCount(0); } @Ignore("Remove to run test") @Test public void testNegativeIntegerIsConsideredInvalidInput() { -// expectedException.expect(IllegalArgumentException.class); -// expectedException.expectMessage("Only natural numbers are allowed"); -// -// collatzCalculator.computeStepCount(-15); + expectedException.expect(IllegalArgumentException.class); + expectedException.expectMessage("Only natural numbers are allowed"); + + collatzCalculator.computeStepCount(-15); } } diff --git a/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java b/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java deleted file mode 100644 index 54a2a7455..000000000 --- a/exercises/kindergarten-garden/src/main/java/KindergartenGarden.java +++ /dev/null @@ -1,3 +0,0 @@ -public class KindergartenGarden { - -} \ No newline at end of file diff --git a/exercises/kindergarten-garden/src/main/java/Plant.java b/exercises/kindergarten-garden/src/main/java/Plant.java new file mode 100644 index 000000000..d51541c71 --- /dev/null +++ b/exercises/kindergarten-garden/src/main/java/Plant.java @@ -0,0 +1,21 @@ +public enum Plant { + VIOLETS, + RADISHES, + CLOVER, + GRASS; + + public static Plant getPlant(char plantCode) { + switch (plantCode) { + case 'G': + return GRASS; + case 'C': + return CLOVER; + case 'R': + return RADISHES; + case 'V': + return VIOLETS; + } + + return null; + } +} \ No newline at end of file diff --git a/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java b/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java index a002b9b64..5957a91f6 100644 --- a/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java +++ b/exercises/kindergarten-garden/src/test/java/KindergartenGardenTest.java @@ -10,173 +10,173 @@ public class KindergartenGardenTest { @Test public void singleStudent() { -// String student = "Alice"; -// String plants = "RC\nGG"; -// List expected = Arrays.asList(Plant.RADISHES, Plant.CLOVER, Plant.GRASS, Plant.GRASS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Alice"; + String plants = "RC\nGG"; + List expected = Arrays.asList(Plant.RADISHES, Plant.CLOVER, Plant.GRASS, Plant.GRASS); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void singleStudent2() { -// String student = "Alice"; -// String plants = "VC\nRC"; -// List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.CLOVER); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Alice"; + String plants = "VC\nRC"; + List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.CLOVER); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void twoStudents() { -// String student = "Bob"; -// String plants = "VVCG\nVVRC"; -// List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.RADISHES, Plant.CLOVER); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Bob"; + String plants = "VVCG\nVVRC"; + List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.RADISHES, Plant.CLOVER); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void oneGardenSecondStudent() { -// String student = "Bob"; -// String plants = "VVCCGG\nVVCCGG"; -// List expected = Arrays.asList(Plant.CLOVER, Plant.CLOVER, Plant.CLOVER, Plant.CLOVER); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Bob"; + String plants = "VVCCGG\nVVCCGG"; + List expected = Arrays.asList(Plant.CLOVER, Plant.CLOVER, Plant.CLOVER, Plant.CLOVER); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void oneGardenThirdStudent() { -// String student = "Charlie"; -// String plants = "VVCCGG\nVVCCGG"; -// List expected = Arrays.asList(Plant.GRASS, Plant.GRASS, Plant.GRASS, Plant.GRASS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Charlie"; + String plants = "VVCCGG\nVVCCGG"; + List expected = Arrays.asList(Plant.GRASS, Plant.GRASS, Plant.GRASS, Plant.GRASS); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void fullGardenFirstStudent() { -// String student = "Alice"; -// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; -// List expected = Arrays.asList(Plant.VIOLETS, Plant.RADISHES, Plant.VIOLETS, Plant.RADISHES); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Alice"; + String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; + List expected = Arrays.asList(Plant.VIOLETS, Plant.RADISHES, Plant.VIOLETS, Plant.RADISHES); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void fullGardenSecondStudent() { -// String student = "Bob"; -// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; -// List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.CLOVER, Plant.CLOVER); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Bob"; + String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; + List expected = Arrays.asList(Plant.CLOVER, Plant.GRASS, Plant.CLOVER, Plant.CLOVER); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void fullGardenSecondToLastStudent() { -// String student = "Kincaid"; -// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; -// List expected = Arrays.asList(Plant.GRASS, Plant.CLOVER, Plant.CLOVER, Plant.GRASS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Kincaid"; + String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; + List expected = Arrays.asList(Plant.GRASS, Plant.CLOVER, Plant.CLOVER, Plant.GRASS); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void fullGardenLastStudent() { -// String student = "Larry"; -// String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; -// List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.VIOLETS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants).getPlantsOfStudent(student) -// ); + String student = "Larry"; + String plants = "VRCGVVRVCGGCCGVRGCVCGCGV\nVRCCCGCRRGVCGCRVVCVGCGCV"; + List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.VIOLETS); + + assertEquals( + expected, + new KindergartenGarden(plants).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void customStudentGardenFirstStudentInAlphabeticalOrder() { -// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; -// String student = "Patricia"; -// String plants = "VCRRGVRG\nRVGCCGCV"; -// List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.VIOLETS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) -// ); + String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; + String student = "Patricia"; + String plants = "VCRRGVRG\nRVGCCGCV"; + List expected = Arrays.asList(Plant.VIOLETS, Plant.CLOVER, Plant.RADISHES, Plant.VIOLETS); + + assertEquals( + expected, + new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void customStudentGardenSecondStudentInAlphabeticalOrder() { -// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; -// String student = "Roger"; -// String plants = "VCRRGVRG\nRVGCCGCV"; -// List expected = Arrays.asList(Plant.RADISHES, Plant.RADISHES, Plant.GRASS, Plant.CLOVER); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) -// ); + String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; + String student = "Roger"; + String plants = "VCRRGVRG\nRVGCCGCV"; + List expected = Arrays.asList(Plant.RADISHES, Plant.RADISHES, Plant.GRASS, Plant.CLOVER); + + assertEquals( + expected, + new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void customStudentGardenThirdStudentInAlphabeticalOrder() { -// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; -// String student = "Samantha"; -// String plants = "VCRRGVRG\nRVGCCGCV"; -// List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.GRASS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) -// ); + String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; + String student = "Samantha"; + String plants = "VCRRGVRG\nRVGCCGCV"; + List expected = Arrays.asList(Plant.GRASS, Plant.VIOLETS, Plant.CLOVER, Plant.GRASS); + + assertEquals( + expected, + new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) + ); } @Ignore("Remove to run test") @Test public void customStudentGardenFourthStudentInAlphabeticalOrder() { -// String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; -// String student = "Xander"; -// String plants = "VCRRGVRG\nRVGCCGCV"; -// List expected = Arrays.asList(Plant.RADISHES, Plant.GRASS, Plant.CLOVER, Plant.VIOLETS); -// -// assertEquals( -// expected, -// new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) -// ); + String[] studentArray = {"Samantha", "Patricia", "Xander", "Roger"}; + String student = "Xander"; + String plants = "VCRRGVRG\nRVGCCGCV"; + List expected = Arrays.asList(Plant.RADISHES, Plant.GRASS, Plant.CLOVER, Plant.VIOLETS); + + assertEquals( + expected, + new KindergartenGarden(plants, studentArray).getPlantsOfStudent(student) + ); } } From 4194008f4c1ff31592cdeb4fc40e19680c33a130 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 14:54:19 -0400 Subject: [PATCH 04/26] nth prime correct as is. saddle point stubs removed. --- exercises/saddle-points/src/main/java/.keep | 0 .../saddle-points/src/main/java/Matrix.java | 5 --- .../src/main/java/MatrixCoordinate.java | 31 ------------------- 3 files changed, 36 deletions(-) create mode 100644 exercises/saddle-points/src/main/java/.keep delete mode 100644 exercises/saddle-points/src/main/java/Matrix.java delete mode 100644 exercises/saddle-points/src/main/java/MatrixCoordinate.java diff --git a/exercises/saddle-points/src/main/java/.keep b/exercises/saddle-points/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/saddle-points/src/main/java/Matrix.java b/exercises/saddle-points/src/main/java/Matrix.java deleted file mode 100644 index ea603d509..000000000 --- a/exercises/saddle-points/src/main/java/Matrix.java +++ /dev/null @@ -1,5 +0,0 @@ -class Matrix { - - - -} diff --git a/exercises/saddle-points/src/main/java/MatrixCoordinate.java b/exercises/saddle-points/src/main/java/MatrixCoordinate.java deleted file mode 100644 index 6c35e9ab2..000000000 --- a/exercises/saddle-points/src/main/java/MatrixCoordinate.java +++ /dev/null @@ -1,31 +0,0 @@ -class MatrixCoordinate { - - private final int row; - - private final int col; - - MatrixCoordinate(final int row, final int col) { - this.row = row; - this.col = col; - } - - // Generated equals and hashcode. - - @Override - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - final MatrixCoordinate that = (MatrixCoordinate) o; - - return row == that.row && col == that.col; - } - - @Override - public int hashCode() { - int result = row; - result = 31 * result + col; - return result; - } - -} From 1e69bcfb83f0072e25cc899ec1987ccdce7e47f1 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 14:58:50 -0400 Subject: [PATCH 05/26] diamond stubs removed --- exercises/diamond/src/main/java/.keep | 0 exercises/diamond/src/main/java/DiamondPrinter.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/diamond/src/main/java/.keep delete mode 100644 exercises/diamond/src/main/java/DiamondPrinter.java diff --git a/exercises/diamond/src/main/java/.keep b/exercises/diamond/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/diamond/src/main/java/DiamondPrinter.java b/exercises/diamond/src/main/java/DiamondPrinter.java deleted file mode 100644 index bdcc9d743..000000000 --- a/exercises/diamond/src/main/java/DiamondPrinter.java +++ /dev/null @@ -1,5 +0,0 @@ -class DiamondPrinter { - - - -} From 9420b7aaba9f1d125ed588dcca65fa88855b48a3 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 15:00:24 -0400 Subject: [PATCH 06/26] isogram correct as is. flatten array stubs removed --- exercises/flatten-array/src/main/java/.keep | 0 exercises/flatten-array/src/main/java/Flattener.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/flatten-array/src/main/java/.keep delete mode 100644 exercises/flatten-array/src/main/java/Flattener.java diff --git a/exercises/flatten-array/src/main/java/.keep b/exercises/flatten-array/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/flatten-array/src/main/java/Flattener.java b/exercises/flatten-array/src/main/java/Flattener.java deleted file mode 100644 index 1b120ba7a..000000000 --- a/exercises/flatten-array/src/main/java/Flattener.java +++ /dev/null @@ -1,5 +0,0 @@ -class Flattener { - - - -} From fa13279fd604c40ee918356ee4f75b361ac9bfb7 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 15:02:15 -0400 Subject: [PATCH 07/26] pig-latin and phone number correct as is. nucleotide count stubs removed --- exercises/nucleotide-count/src/main/java/.keep | 0 exercises/nucleotide-count/src/main/java/DNA.java | 2 -- 2 files changed, 2 deletions(-) create mode 100644 exercises/nucleotide-count/src/main/java/.keep delete mode 100644 exercises/nucleotide-count/src/main/java/DNA.java diff --git a/exercises/nucleotide-count/src/main/java/.keep b/exercises/nucleotide-count/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/nucleotide-count/src/main/java/DNA.java b/exercises/nucleotide-count/src/main/java/DNA.java deleted file mode 100644 index e2350ad4f..000000000 --- a/exercises/nucleotide-count/src/main/java/DNA.java +++ /dev/null @@ -1,2 +0,0 @@ -public class DNA { -} From 932964619b2fce3620535183b2f0f55dd4e27b58 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 15:04:18 -0400 Subject: [PATCH 08/26] word count stubs removed --- exercises/word-count/src/main/java/.keep | 0 exercises/word-count/src/main/java/WordCount.java | 2 -- 2 files changed, 2 deletions(-) create mode 100644 exercises/word-count/src/main/java/.keep delete mode 100644 exercises/word-count/src/main/java/WordCount.java diff --git a/exercises/word-count/src/main/java/.keep b/exercises/word-count/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/word-count/src/main/java/WordCount.java b/exercises/word-count/src/main/java/WordCount.java deleted file mode 100644 index 167b5a976..000000000 --- a/exercises/word-count/src/main/java/WordCount.java +++ /dev/null @@ -1,2 +0,0 @@ -public class WordCount { -} From 3a41b31280fd7726ed4d617382054443b4d0cb7c Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 15:05:02 -0400 Subject: [PATCH 09/26] run length encoding stubs removed --- exercises/run-length-encoding/src/main/java/.keep | 0 .../src/main/java/RunLengthEncoding.java | 9 --------- 2 files changed, 9 deletions(-) create mode 100644 exercises/run-length-encoding/src/main/java/.keep delete mode 100644 exercises/run-length-encoding/src/main/java/RunLengthEncoding.java diff --git a/exercises/run-length-encoding/src/main/java/.keep b/exercises/run-length-encoding/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/run-length-encoding/src/main/java/RunLengthEncoding.java b/exercises/run-length-encoding/src/main/java/RunLengthEncoding.java deleted file mode 100644 index d243a2658..000000000 --- a/exercises/run-length-encoding/src/main/java/RunLengthEncoding.java +++ /dev/null @@ -1,9 +0,0 @@ -public class RunLengthEncoding { - public String encode(String data) { - throw new UnsupportedOperationException("Method has not been implemented yet."); - } - - public String decode(String encodedData) { - throw new UnsupportedOperationException("Method has not been implemented yet."); - } -} From 02e228867ed2b540e1299d284b378c5e7033853e Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Tue, 4 Jul 2017 15:18:08 -0400 Subject: [PATCH 10/26] robot name, prime factors correct as is. Allergen enum left on allergies. bob, pascals triangle correct as is. bracket push stubs removed --- exercises/bracket-push/src/main/java/.keep | 0 exercises/bracket-push/src/main/java/BracketChecker.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/bracket-push/src/main/java/.keep delete mode 100644 exercises/bracket-push/src/main/java/BracketChecker.java diff --git a/exercises/bracket-push/src/main/java/.keep b/exercises/bracket-push/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/bracket-push/src/main/java/BracketChecker.java b/exercises/bracket-push/src/main/java/BracketChecker.java deleted file mode 100644 index 7fbc9636d..000000000 --- a/exercises/bracket-push/src/main/java/BracketChecker.java +++ /dev/null @@ -1,5 +0,0 @@ -class BracketChecker { - - - -} From db4a98b429669dc405882e3d616cf57d82aae463 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:29:22 -0400 Subject: [PATCH 11/26] series stubs removed --- exercises/series/src/main/java/.keep | 0 exercises/series/src/main/java/Series.java | 3 --- 2 files changed, 3 deletions(-) create mode 100644 exercises/series/src/main/java/.keep delete mode 100644 exercises/series/src/main/java/Series.java diff --git a/exercises/series/src/main/java/.keep b/exercises/series/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/series/src/main/java/Series.java b/exercises/series/src/main/java/Series.java deleted file mode 100644 index ca338ff6c..000000000 --- a/exercises/series/src/main/java/Series.java +++ /dev/null @@ -1,3 +0,0 @@ -public class Series { - -} From ba2ee1a4d3c88ccc741806c05385e03623904cc9 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:31:56 -0400 Subject: [PATCH 12/26] atbash cipher, roman numerals, transpose, and food chain correct as is. beer song stubs removed. --- exercises/beer-song/src/main/java/.keep | 0 exercises/beer-song/src/main/java/BeerSong.java | 3 --- 2 files changed, 3 deletions(-) create mode 100644 exercises/beer-song/src/main/java/.keep delete mode 100644 exercises/beer-song/src/main/java/BeerSong.java diff --git a/exercises/beer-song/src/main/java/.keep b/exercises/beer-song/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/beer-song/src/main/java/BeerSong.java b/exercises/beer-song/src/main/java/BeerSong.java deleted file mode 100644 index c34fbe61f..000000000 --- a/exercises/beer-song/src/main/java/BeerSong.java +++ /dev/null @@ -1,3 +0,0 @@ -public class BeerSong { - -} \ No newline at end of file From e677e6f238a25d01e1abe879bb156ec977efb6a8 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:32:44 -0400 Subject: [PATCH 13/26] queen attack stubs removed --- exercises/queen-attack/src/main/java/.keep | 0 exercises/queen-attack/src/main/java/BoardCoordinate.java | 5 ----- .../queen-attack/src/main/java/QueenAttackCalculator.java | 5 ----- 3 files changed, 10 deletions(-) create mode 100644 exercises/queen-attack/src/main/java/.keep delete mode 100644 exercises/queen-attack/src/main/java/BoardCoordinate.java delete mode 100644 exercises/queen-attack/src/main/java/QueenAttackCalculator.java diff --git a/exercises/queen-attack/src/main/java/.keep b/exercises/queen-attack/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/queen-attack/src/main/java/BoardCoordinate.java b/exercises/queen-attack/src/main/java/BoardCoordinate.java deleted file mode 100644 index 7fa4a83f7..000000000 --- a/exercises/queen-attack/src/main/java/BoardCoordinate.java +++ /dev/null @@ -1,5 +0,0 @@ -public class BoardCoordinate { - - - -} diff --git a/exercises/queen-attack/src/main/java/QueenAttackCalculator.java b/exercises/queen-attack/src/main/java/QueenAttackCalculator.java deleted file mode 100644 index b3d08cee4..000000000 --- a/exercises/queen-attack/src/main/java/QueenAttackCalculator.java +++ /dev/null @@ -1,5 +0,0 @@ -public class QueenAttackCalculator { - - - -} From fd123190d83f29a9b6ff63465fe4a13fff03bd9a Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:34:50 -0400 Subject: [PATCH 14/26] etl has a complicated method structure for its stub, leaving in place with starter throw. --- exercises/etl/src/main/java/Etl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/etl/src/main/java/Etl.java b/exercises/etl/src/main/java/Etl.java index 584d364c4..9af92312b 100644 --- a/exercises/etl/src/main/java/Etl.java +++ b/exercises/etl/src/main/java/Etl.java @@ -3,6 +3,6 @@ public class Etl { public Map transform(Map> old) { - return null; + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); } } From 7c8b90c9f4bafe796c027ebe43323f776e1ebe06 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:39:38 -0400 Subject: [PATCH 15/26] linked list, grade school correct as is. Robot Simulator provides an enum and very specific Grid Position with non-standard equals, leaving those in while removing other stub. --- exercises/robot-simulator/src/main/java/Robot.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 exercises/robot-simulator/src/main/java/Robot.java diff --git a/exercises/robot-simulator/src/main/java/Robot.java b/exercises/robot-simulator/src/main/java/Robot.java deleted file mode 100644 index ab9069894..000000000 --- a/exercises/robot-simulator/src/main/java/Robot.java +++ /dev/null @@ -1,5 +0,0 @@ -class Robot { - - - -} From d1fb762da44e3ef8e6cf03123aa2c9002d76e73b Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:40:37 -0400 Subject: [PATCH 16/26] binary search stubs removed --- exercises/binary-search/src/main/java/.keep | 0 exercises/binary-search/src/main/java/BinarySearch.java | 4 ---- 2 files changed, 4 deletions(-) create mode 100644 exercises/binary-search/src/main/java/.keep delete mode 100644 exercises/binary-search/src/main/java/BinarySearch.java diff --git a/exercises/binary-search/src/main/java/.keep b/exercises/binary-search/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/binary-search/src/main/java/BinarySearch.java b/exercises/binary-search/src/main/java/BinarySearch.java deleted file mode 100644 index ea600669c..000000000 --- a/exercises/binary-search/src/main/java/BinarySearch.java +++ /dev/null @@ -1,4 +0,0 @@ - -public class BinarySearch { - -} From 5688a18a93edf3297bf54c9a3ac78a2e53ff6449 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:41:13 -0400 Subject: [PATCH 17/26] minesweeper stubs removed --- exercises/minesweeper/src/main/java/.keep | 0 exercises/minesweeper/src/main/java/MinesweeperBoard.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/minesweeper/src/main/java/.keep delete mode 100644 exercises/minesweeper/src/main/java/MinesweeperBoard.java diff --git a/exercises/minesweeper/src/main/java/.keep b/exercises/minesweeper/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/minesweeper/src/main/java/MinesweeperBoard.java b/exercises/minesweeper/src/main/java/MinesweeperBoard.java deleted file mode 100644 index cfdf1039d..000000000 --- a/exercises/minesweeper/src/main/java/MinesweeperBoard.java +++ /dev/null @@ -1,5 +0,0 @@ -public class MinesweeperBoard { - - - -} From 02d2adad8cd7898ea4eae9e5633959f8bfb28673 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:41:48 -0400 Subject: [PATCH 18/26] wordy stubs removed. --- exercises/wordy/src/main/java/.keep | 0 exercises/wordy/src/main/java/WordProblemSolver.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/wordy/src/main/java/.keep delete mode 100644 exercises/wordy/src/main/java/WordProblemSolver.java diff --git a/exercises/wordy/src/main/java/.keep b/exercises/wordy/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/wordy/src/main/java/WordProblemSolver.java b/exercises/wordy/src/main/java/WordProblemSolver.java deleted file mode 100644 index 35acb88e0..000000000 --- a/exercises/wordy/src/main/java/WordProblemSolver.java +++ /dev/null @@ -1,5 +0,0 @@ -class WordProblemSolver { - - - -} From a74681d9ac51c4c206025918d3acd15d1320bbad Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:42:30 -0400 Subject: [PATCH 19/26] all your base stubs removed --- exercises/all-your-base/src/main/java/.keep | 0 exercises/all-your-base/src/main/java/BaseConverter.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/all-your-base/src/main/java/.keep delete mode 100644 exercises/all-your-base/src/main/java/BaseConverter.java diff --git a/exercises/all-your-base/src/main/java/.keep b/exercises/all-your-base/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/all-your-base/src/main/java/BaseConverter.java b/exercises/all-your-base/src/main/java/BaseConverter.java deleted file mode 100644 index b1b424e71..000000000 --- a/exercises/all-your-base/src/main/java/BaseConverter.java +++ /dev/null @@ -1,5 +0,0 @@ -class BaseConverter { - - - -} From 4e5e9db6bb5b95a243f1eec7ad8507335f75ab3f Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:46:07 -0400 Subject: [PATCH 20/26] bank account has user exercising concurrency, left provided bank exception in place. anagram stubs removed --- exercises/anagram/src/main/java/.keep | 0 exercises/anagram/src/main/java/Anagram.java | 2 -- 2 files changed, 2 deletions(-) create mode 100644 exercises/anagram/src/main/java/.keep delete mode 100644 exercises/anagram/src/main/java/Anagram.java diff --git a/exercises/anagram/src/main/java/.keep b/exercises/anagram/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/anagram/src/main/java/Anagram.java b/exercises/anagram/src/main/java/Anagram.java deleted file mode 100644 index 5de7c7c27..000000000 --- a/exercises/anagram/src/main/java/Anagram.java +++ /dev/null @@ -1,2 +0,0 @@ -public class Anagram { -} From 996714570631a60497133aa57ff4d66ee69d3731 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 09:46:56 -0400 Subject: [PATCH 21/26] sublist stubs removed, enum left in place --- exercises/sublist/src/main/java/RelationshipComputer.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 exercises/sublist/src/main/java/RelationshipComputer.java diff --git a/exercises/sublist/src/main/java/RelationshipComputer.java b/exercises/sublist/src/main/java/RelationshipComputer.java deleted file mode 100644 index e2e4c5c73..000000000 --- a/exercises/sublist/src/main/java/RelationshipComputer.java +++ /dev/null @@ -1,5 +0,0 @@ -class RelationshipComputer { - - - -} From ee5e3998601b0eddedb2c88a86410ffa30444b6e Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 10:00:10 -0400 Subject: [PATCH 22/26] Clock correct as is, OCR reader stubs removed --- exercises/ocr-numbers/src/main/java/.keep | 0 .../ocr-numbers/src/main/java/OpticalCharacterReader.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/ocr-numbers/src/main/java/.keep delete mode 100644 exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java diff --git a/exercises/ocr-numbers/src/main/java/.keep b/exercises/ocr-numbers/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java b/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java deleted file mode 100644 index 87b0bf7e9..000000000 --- a/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java +++ /dev/null @@ -1,5 +0,0 @@ -class OpticalCharacterReader { - - - -} From d5d1c714721e68081416678cc494a4a8878d754b Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 10:00:59 -0400 Subject: [PATCH 23/26] rectangles stubs removed --- exercises/rectangles/src/main/java/.keep | 0 exercises/rectangles/src/main/java/RectangleCounter.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/rectangles/src/main/java/.keep delete mode 100644 exercises/rectangles/src/main/java/RectangleCounter.java diff --git a/exercises/rectangles/src/main/java/.keep b/exercises/rectangles/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/rectangles/src/main/java/RectangleCounter.java b/exercises/rectangles/src/main/java/RectangleCounter.java deleted file mode 100644 index d2c4ad71c..000000000 --- a/exercises/rectangles/src/main/java/RectangleCounter.java +++ /dev/null @@ -1,5 +0,0 @@ -class RectangleCounter { - - - -} From 573a739751d3f14da86e1bd5daaf01c06a27d2d9 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 10:02:23 -0400 Subject: [PATCH 24/26] book store, simple cipher, complex numbers correct as is. change stubs removed. --- exercises/change/src/main/java/.keep | 0 exercises/change/src/main/java/ChangeCalculator.java | 5 ----- 2 files changed, 5 deletions(-) create mode 100644 exercises/change/src/main/java/.keep delete mode 100644 exercises/change/src/main/java/ChangeCalculator.java diff --git a/exercises/change/src/main/java/.keep b/exercises/change/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/change/src/main/java/ChangeCalculator.java b/exercises/change/src/main/java/ChangeCalculator.java deleted file mode 100644 index ce9714641..000000000 --- a/exercises/change/src/main/java/ChangeCalculator.java +++ /dev/null @@ -1,5 +0,0 @@ -class ChangeCalculator { - - - -} From c05a2d58064bcb2be3f6b088d1c5760bfe947ec2 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 10:03:54 -0400 Subject: [PATCH 25/26] palindrome products correct as is, pythagorean triplet stubs removed --- exercises/pythagorean-triplet/src/main/java/.keep | 0 .../pythagorean-triplet/src/main/java/PythagoreanTriplet.java | 3 --- 2 files changed, 3 deletions(-) create mode 100644 exercises/pythagorean-triplet/src/main/java/.keep delete mode 100644 exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java diff --git a/exercises/pythagorean-triplet/src/main/java/.keep b/exercises/pythagorean-triplet/src/main/java/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java b/exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java deleted file mode 100644 index 34a36d5c0..000000000 --- a/exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java +++ /dev/null @@ -1,3 +0,0 @@ - -public class PythagoreanTriplet { -} From e8c52fb2d0fc0e52fcf87e84241613a2d618bef2 Mon Sep 17 00:00:00 2001 From: redshirt4 Date: Wed, 5 Jul 2017 21:31:07 -0400 Subject: [PATCH 26/26] Review 2 changes - saddlepoint's MatrixCoordinate re-added to reduce complexity. --- exercises/saddle-points/src/main/java/.keep | 0 .../src/main/java/MatrixCoordinate.java | 31 +++++++++++++++++++ 2 files changed, 31 insertions(+) delete mode 100644 exercises/saddle-points/src/main/java/.keep create mode 100644 exercises/saddle-points/src/main/java/MatrixCoordinate.java diff --git a/exercises/saddle-points/src/main/java/.keep b/exercises/saddle-points/src/main/java/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/exercises/saddle-points/src/main/java/MatrixCoordinate.java b/exercises/saddle-points/src/main/java/MatrixCoordinate.java new file mode 100644 index 000000000..6c35e9ab2 --- /dev/null +++ b/exercises/saddle-points/src/main/java/MatrixCoordinate.java @@ -0,0 +1,31 @@ +class MatrixCoordinate { + + private final int row; + + private final int col; + + MatrixCoordinate(final int row, final int col) { + this.row = row; + this.col = col; + } + + // Generated equals and hashcode. + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + final MatrixCoordinate that = (MatrixCoordinate) o; + + return row == that.row && col == that.col; + } + + @Override + public int hashCode() { + int result = row; + result = 31 * result + col; + return result; + } + +}