Merge c649a2f5ccd8a44abe5804afe282470f4fd612ec into 913fc8b71dfcb9ab6e5834ab57b3411cc112752d

ChapterOneMicro.iml

@@ -12,5 +12,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>

src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java

@@ -11,7 +11,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Integer add(int baseValue, int difference) {
-        return null;
+        return baseValue + difference;
     }
 
     /**
@@ -20,7 +20,8 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Long add(long baseValue, long difference) {
-        return null;
+
+        return (long) (baseValue + difference);
     }
 
     /**
@@ -29,7 +30,9 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Short add(short baseValue, short difference) {
-        return null;
+
+
+        return (short) (baseValue + difference);
     }
 
     /**
@@ -38,7 +41,8 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Byte add(byte baseValue, byte difference) {
-        return null;
+
+        return (byte) (baseValue + difference);
     }
 
     /**
@@ -47,7 +51,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Float add(float baseValue, float difference) {
-        return null;
+        return (float) (baseValue + difference);
     }
 
     /**
@@ -56,7 +60,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Double add(double baseValue, double difference) {
-        return null;
+        return (double) (baseValue + difference);
     }
 
     /**
@@ -65,7 +69,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Integer subtract(int baseValue, int difference) {
-        return null;
+        return baseValue - difference;
     }
 
     /**
@@ -74,7 +78,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Long subtract(long baseValue, long difference) {
-        return null;
+        return (long) (baseValue - difference);
     }
 
     /**
@@ -83,7 +87,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Short subtract(short baseValue, short difference) {
-        return null;
+        return (short) (baseValue - difference);
     }
 
     /**
@@ -92,7 +96,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Byte subtract(byte baseValue, byte difference) {
-        return null;
+        return (byte) (baseValue - difference);
     }
 
     /**
@@ -101,7 +105,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Float subtract(float baseValue, float difference) {
-        return null;
+        return  baseValue - difference;
     }
 
     /**
@@ -110,7 +114,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Double subtract(double baseValue, double difference) {
-        return null;
+        return (double) (baseValue - difference);
     }
 
 
@@ -120,7 +124,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Integer divide(int dividend, int divisor) {
-        return null;
+        return dividend / divisor;
     }
 
     /**
@@ -129,7 +133,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Long divide(long dividend, long divisor) {
-        return null;
+        return (long) (dividend / divisor);
     }
 
     /**
@@ -138,7 +142,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Short divide(short dividend, short divisor) {
-        return null;
+        return (short) (dividend / divisor);
     }
 
     /**
@@ -147,7 +151,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Byte divide(byte dividend, byte divisor) {
-        return null;
+        return (byte) (dividend / divisor);
     }
 
     /**
@@ -156,7 +160,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Float divide(float dividend, float divisor) {
-        return null;
+        return (float) (dividend / divisor);
     }
 
     /**
@@ -165,7 +169,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Double divide(double dividend, double divisor) {
-        return null;
+        return (double) (dividend / divisor);
     }
 
 
@@ -175,7 +179,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Integer multiply(int multiplicand, int multiplier) {
-        return null;
+        return multiplicand * multiplier;
     }
 
     /**
@@ -184,7 +188,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Long multiply(long multiplicand, long multiplier) {
-        return null;
+        return (long) (multiplicand * multiplier);
     }
 
     /**
@@ -193,7 +197,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Short multiply(short multiplicand, short multiplier) {
-        return null;
+        return (short) (multiplicand * multiplier);
     }
     /**
      * @param multiplicand value to be multiplied
@@ -201,7 +205,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Byte multiply(byte multiplicand, byte multiplier) {
-        return null;
+        return (byte) (multiplicand * multiplier);
     }
 
     /**
@@ -210,7 +214,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Float multiply(float multiplicand, float multiplier) {
-        return null;
+        return (float) (multiplicand * multiplier);
     }
 
     /**
@@ -219,7 +223,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Double multiply(double multiplicand, double multiplier) {
-        return null;
+        return (double) (multiplicand * multiplier);
     }
 
 
@@ -227,14 +231,14 @@ public class MathUtilities {
       * @return true
      */
     public Boolean returnTrue() {
-        return null;
+        return true;
     }
 
     /**
      * @return false
      */
     public Boolean returnFalse() {
-        return null;
+        return false;
     }
 
 }

src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java

@@ -10,7 +10,8 @@ public class PredicateUtilities {
      * @return true if `x` is greater than `y`
      */
     public Boolean isGreaterThan(int x, int y) {
-        return null;
+
+        return x>y;
     }
 
     /**
@@ -19,7 +20,7 @@ public class PredicateUtilities {
      * @return true if `x` is less than `y`
      */
     public Boolean isLessThan(int x, int y) {
-        return null;
+        return x<y;
     }
 
     /**
@@ -28,7 +29,7 @@ public class PredicateUtilities {
      * @return true if `x` is greater than or equal to `y`
      */
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
-        return null;
+        return x>=y;
     }
 
     /**
@@ -37,6 +38,6 @@ public class PredicateUtilities {
      * @return true if `x` is less than or equal to `y`
      */
     public Boolean isLessThanOrEqualTo(int x, int y) {
-        return null;
+        return x<=y;
     }
 }

src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java

@@ -8,7 +8,8 @@ public class StringUtilities {
      * @return `Hello World` as a string
      */
     public static String getHelloWorld() {
-        return null;
+
+        return "Hello World";
     }
 
     /**
@@ -17,7 +18,9 @@ public class StringUtilities {
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
      */
     public static String concatenation(String firstSegment, String secondSegment){
-        return null;
+        StringBuilder concat = new StringBuilder();
+        concat.append(firstSegment).append(secondSegment);
+        return concat.toString();
     }
 
     /**
@@ -26,7 +29,9 @@ public class StringUtilities {
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
      */
     public static String concatenation(int firstSegment, String secondSegment){
-        return null;
+        StringBuilder concat = new StringBuilder();
+        concat.append(firstSegment).append(secondSegment);
+        return concat.toString();
     }
 
     /**
@@ -34,7 +39,8 @@ public class StringUtilities {
      * @return the first 3 characters of `input`
      */
     public static String getPrefix(String input){
-        return null;
+
+        return input.substring(0,3);
     }
 
     /**
@@ -42,7 +48,8 @@ public class StringUtilities {
      * @return the last 3 characters of `input`
      */
     public static String getSuffix(String input){
-        return null;
+
+        return input.substring(input.length() - 3, input.length());
     }
 
     /**
@@ -51,7 +58,8 @@ public class StringUtilities {
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
      */
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
-        return null;
+
+        return inputValue.equals(comparableValue);
     }
 
     /**
@@ -59,7 +67,10 @@ public class StringUtilities {
      * @return the middle character of `inputValue`
      */
     public static Character getMiddleCharacter(String inputValue){
-        return null;
+        if (inputValue.length() % 2 == 0) {
+            return inputValue.charAt((inputValue.length() / 2) - 1);
+        }
+        return inputValue.charAt(inputValue.length() / 2);
     }
 
     /**
@@ -67,6 +78,13 @@ public class StringUtilities {
      * @return the first sequence of characters
      */
     public static String getFirstWord(String spaceDelimitedString){
+        for (int i = 0; i<spaceDelimitedString.length(); i++){
+            if (spaceDelimitedString.charAt(i) == ' '){
+                int chopper = i;
+                return spaceDelimitedString.substring(0, chopper);
+            }
+
+        }
         return null;
     }
 
@@ -75,7 +93,11 @@ public class StringUtilities {
      * @return the second word of a string delimited by spaces.
      */
     public static String getSecondWord(String spaceDelimitedString){
-        return null;
+        int start = spaceDelimitedString.indexOf(' ') +1;
+        //I spent way too long on this because I was trying way to hard to do it with loops (see my code for getFirstWord)
+        //And I'm pretty sure this only works because the String in question only has 2 words.  But I'll take what I can get
+        return spaceDelimitedString.substring(start, spaceDelimitedString.length());
+
     }
 
     /**
@@ -83,6 +105,12 @@ public class StringUtilities {
      * @return an identical string with characters in reverse order.
      */
     public static String reverseTheTwo(String stringToReverse){
-        return null;
+        StringBuilder answer = new StringBuilder();
+        for (int i = stringToReverse.length() -1; i>=0; i--){
+            answer.append(stringToReverse.charAt(i));
+        }
+
+
+        return answer.toString();
     }
 }

src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java

@@ -5,6 +5,6 @@ package com.zipcodewilmington.danny_do_better_exercises;
  */
 public class ZipcodeRocks {
     public static void main(String[] args) {
-//         System.out.println("Zipcode Rocks!");
+        System.out.println("Zipcode Rocks!");
     }
 }

src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java

@@ -36,7 +36,7 @@ public class TestMathUtilities {
         // : Given
         short baseValue = 16384;
         short addedValue = 7;
-        short expected = 32767;
+        short expected = 16391;
         // : When
         short actual = primativeTypes.add(baseValue, addedValue);
         // : Then
@@ -146,7 +146,7 @@ public class TestMathUtilities {
         // : When
         float actualFloat = primativeTypes.subtract(baseValue,difference);
         // : Then
-        assertEquals(expectedFloat,actualFloat, 0);
+        assertEquals(expectedFloat,actualFloat, 0.003);
     }
     @Test
     public void testSubtractions5() {
@@ -296,7 +296,7 @@ public class TestMathUtilities {
         // : Given
         byte multiplicand = 16;
         byte multiplier = 14;
-        byte expectedByte = 64;
+        byte expectedByte = -32;
         // : When
         byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
         // : Then

src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java

@@ -33,7 +33,7 @@ public class TestPredicateUtilities {
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
 
         // : Then
-        assertTrue(outcome);
+        assertFalse(outcome);
     }
 
 
@@ -62,7 +62,7 @@ public class TestPredicateUtilities {
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
 
         // : Then
-        assertTrue(outcome);
+        assertFalse(outcome);
     }
 
 
@@ -116,6 +116,6 @@ public class TestPredicateUtilities {
         boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
 
         // : Then
-        assertTrue(outcome);
+        assertFalse(outcome);
     }
 }

src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java

@@ -56,7 +56,7 @@ public class TestStringUtilities {
     public void substringBeginTest(){
         // : Given
         String input = "Hello";
-        String expected = "olleH";
+        String expected = "Hel";
 
         // : When
         String actual = StringUtilities.getPrefix(input);
@@ -154,7 +154,7 @@ public class TestStringUtilities {
         String expected = "Wilmington";
 
         // : When
-        String actual = StringUtilities.getFirstWord(input);
+        String actual = StringUtilities.getSecondWord(input);
 
         // : Then
         assertEquals(expected, actual);