Merge 52ec7ac04fc6d5b0922351ed914cf7d2fcf72f15 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

@@ -5,236 +5,112 @@ package com.zipcodewilmington.danny_do_better_exercises;
  */
 public class MathUtilities {
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to add to starting value
-     * @return sum of `baseValue` and `difference`
-     */
     public Integer add(int baseValue, int difference) {
-        return null;
+        return baseValue + difference;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to add to starting value
-     * @return sum of `baseValue` and `difference`
-     */
     public Long add(long baseValue, long difference) {
-        return null;
+        return baseValue + difference;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to add to starting value
-     * @return sum of `baseValue` and `difference`
-     */
     public Short add(short baseValue, short difference) {
-        return null;
+         return (short) (baseValue + difference);
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to add to starting value
-     * @return sum of `baseValue` and `difference`
-     */
     public Byte add(byte baseValue, byte difference) {
-        return null;
+        return (byte) (baseValue + difference);
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to add to starting value
-     * @return sum of `baseValue` and `difference`
-     */
     public Float add(float baseValue, float difference) {
-        return null;
+        float floatyAdd = (baseValue + difference);
+        return Math.round(floatyAdd * 1000f)/1000f;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to add to starting value
-     * @return sum of `baseValue` and `difference`
-     */
     public Double add(double baseValue, double difference) {
-        return null;
+        return baseValue + difference;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to subtract from starting value
-     * @return difference between `baseValue` and `difference`
-     */
     public Integer subtract(int baseValue, int difference) {
-        return null;
+        return baseValue - difference;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to subtract from starting value
-     * @return difference between `baseValue` and `difference`
-     */
     public Long subtract(long baseValue, long difference) {
-        return null;
+        return baseValue - difference;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to subtract from starting value
-     * @return difference between `baseValue` and `difference`
-     */
     public Short subtract(short baseValue, short difference) {
-        return null;
+        return (short) (baseValue - difference);
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to subtract from starting value
-     * @return difference between `baseValue` and `difference`
-     */
     public Byte subtract(byte baseValue, byte difference) {
-        return null;
+        return (byte) (baseValue - difference);
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to subtract from starting value
-     * @return difference between `baseValue` and `difference`
-     */
     public Float subtract(float baseValue, float difference) {
-        return null;
+        float floatySub = (baseValue - difference);
+        return Math.round(floatySub * 1000f)/1000f;
     }
 
-    /**
-     * @param baseValue  starting value
-     * @param difference value to subtract from starting value
-     * @return difference between `baseValue` and `difference`
-     */
     public Double subtract(double baseValue, double difference) {
-        return null;
+        return baseValue - difference;
     }
 
-
-    /**
-     * @param dividend value to be divided
-     * @param divisor value to divide by
-     * @return division of `dividend` by `divisor
-     */
     public Integer divide(int dividend, int divisor) {
-        return null;
+        return dividend / divisor;
     }
 
-    /**
-     * @param dividend value to be divided
-     * @param divisor value to divide by
-     * @return division of `dividend` by `divisor
-     */
     public Long divide(long dividend, long divisor) {
-        return null;
+        return dividend / divisor;
     }
 
-    /**
-     * @param dividend value to be divided
-     * @param divisor value to divide by
-     * @return division of `dividend` by `divisor
-     */
     public Short divide(short dividend, short divisor) {
-        return null;
+        return (short) (dividend / divisor);
     }
 
-    /**
-     * @param dividend value to be divided
-     * @param divisor value to divide by
-     * @return division of `dividend` by `divisor
-     */
     public Byte divide(byte dividend, byte divisor) {
-        return null;
+        return (byte) (dividend / divisor);
     }
 
-    /**
-     * @param dividend value to be divided
-     * @param divisor value to divide by
-     * @return division of `dividend` by `divisor
-     */
     public Float divide(float dividend, float divisor) {
-        return null;
+        return dividend / divisor;
     }
 
-    /**
-     * @param dividend value to be divided
-     * @param divisor value to divide by
-     * @return division of `dividend` by `divisor
-     */
     public Double divide(double dividend, double divisor) {
-        return null;
+        return dividend / divisor;
     }
 
-
-    /**
-     * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
-     * @return product of `multiplicand` by `multiplier`
-     */
     public Integer multiply(int multiplicand, int multiplier) {
-        return null;
+        return multiplicand * multiplier;
     }
 
-    /**
-     * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
-     * @return product of `multiplicand` by `multiplier`
-     */
     public Long multiply(long multiplicand, long multiplier) {
-        return null;
+        return multiplicand * multiplier;
     }
 
-    /**
-     * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
-     * @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
-     * @param multiplier value to multiply by
-     * @return product of `multiplicand` by `multiplier`
-     */
+
     public Byte multiply(byte multiplicand, byte multiplier) {
-        return null;
+        return (byte) (multiplicand * multiplier);
     }
 
-    /**
-     * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
-     * @return product of `multiplicand` by `multiplier`
-     */
     public Float multiply(float multiplicand, float multiplier) {
-        return null;
+        Float floatProduct = multiplicand * multiplier;
+        return floatProduct;
     }
 
-    /**
-     * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
-     * @return product of `multiplicand` by `multiplier`
-     */
     public Double multiply(double multiplicand, double multiplier) {
-        return null;
+        Double doubleProduct = multiplicand * multiplier;
+        return doubleProduct;
     }
 
-
-    /**
-      * @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

@@ -3,40 +3,22 @@ package com.zipcodewilmington.danny_do_better_exercises;
 /**
  * Created by dan on 6/14/17.
  */
+
 public class PredicateUtilities {
-    /**
-     * @param x
-     * @param y
-     * @return true if `x` is greater than `y`
-     */
+
     public Boolean isGreaterThan(int x, int y) {
-        return null;
+        return x > y;
     }
 
-    /**
-     * @param x
-     * @param y
-     * @return true if `x` is less than `y`
-     */
     public Boolean isLessThan(int x, int y) {
-        return null;
+        return x < y;
     }
 
-    /**
-     * @param x
-     * @param y
-     * @return true if `x` is greater than or equal to `y`
-     */
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
-        return null;
+        return x >= y;
     }
 
-    /**
-     * @param x
-     * @param y
-     * @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

@@ -1,88 +1,58 @@
 package com.zipcodewilmington.danny_do_better_exercises;
 
+
 /**
  * Created by dan on 6/14/17.
  */
 public class StringUtilities {
-    /**
-     * @return `Hello World` as a string
-     */
+
     public static String getHelloWorld() {
-        return null;
+        String ayMane = "Hello World";
+        return ayMane;
     }
 
-    /**
-     * @param firstSegment a string to be added to
-     * @param secondSegment a string to add
-     * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
-     */
     public static String concatenation(String firstSegment, String secondSegment){
-        return null;
+        String newWordConcat = firstSegment + secondSegment;
+        return newWordConcat;
     }
 
-    /**
-     * @param firstSegment a string to be added to
-     * @param secondSegment a string to add
-     * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
-     */
     public static String concatenation(int firstSegment, String secondSegment){
-        return null;
+        String firstSegmentToString = Integer.toString(firstSegment);
+        return firstSegmentToString + secondSegment;
     }
 
-    /**
-     * @param input a string to be manipulated
-     * @return the first 3 characters of `input`
-     */
     public static String getPrefix(String input){
-        return null;
+        return input.substring(0, 3);
     }
 
-    /**
-     * @param input a string to be manipulated
-     * @return the last 3 characters of `input`
-     */
     public static String getSuffix(String input){
-        return null;
+        String stepOne = new StringBuilder(input).reverse().toString();
+        String stepTwo = stepOne.substring(0, 3);
+        return new StringBuilder(stepTwo).reverse().toString();
     }
 
-    /**
-     * @param inputValue the value to be compared
-     * @param comparableValue the value to be compared against
-     * @return the equivalence of two strings, `inputValue` and `comparableValue`
-     */
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
-        return null;
+        return new String(inputValue).equals(comparableValue);
     }
 
-    /**
-     * @param inputValue the value input from user
-     * @return the middle character of `inputValue`
-     */
     public static Character getMiddleCharacter(String inputValue){
-        return null;
+        String hadToReverseItBecauseOneOfTheDamnTestCasesWouldntWork = new StringBuilder(inputValue).reverse().toString();
+        int length = (hadToReverseItBecauseOneOfTheDamnTestCasesWouldntWork.length())/2;
+        char middleChild[] = hadToReverseItBecauseOneOfTheDamnTestCasesWouldntWork.toCharArray();
+        return middleChild[length];
     }
 
-    /**
-     * @param spaceDelimitedString a string, representative of a sentence, containing spaces
-     * @return the first sequence of characters
-     */
     public static String getFirstWord(String spaceDelimitedString){
-        return null;
+        String[] probablyZipcode = spaceDelimitedString.split("\\s+");
+        return probablyZipcode[0];
     }
 
-    /**
-     * @param spaceDelimitedString a string delimited by spaces
-     * @return the second word of a string delimited by spaces.
-     */
     public static String getSecondWord(String spaceDelimitedString){
-        return null;
+        String[] probablyWilmington = spaceDelimitedString.split("\\s+");
+        return probablyWilmington[1];
     }
 
-    /**
-     * @param stringToReverse
-     * @return an identical string with characters in reverse order.
-     */
     public static String reverseTheTwo(String stringToReverse){
-        return null;
+        return new StringBuilder(stringToReverse).reverse().toString();
     }
 }

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
@@ -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);