first commit

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,159 @@ 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;
+        int add = baseValue + difference;
+        return add;
     }
 
-    /**
-     * @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;
+        long add = baseValue + difference;
+        return add;
     }
 
-    /**
-     * @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;
+        int sum = baseValue + difference;
+        short shortSum = (short) sum;
+        return shortSum;
     }
 
-    /**
-     * @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;
+        int sum = baseValue + difference;
+        byte byteSum = (byte) sum;
+        return byteSum;
     }
 
-    /**
-     * @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 add = baseValue + difference;
+        return add;
     }
 
-    /**
-     * @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;
+        double add = baseValue + difference;
+        return add;
     }
 
-    /**
-     * @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;
+        int subtract = baseValue - difference;
+        return subtract;
     }
 
-    /**
-     * @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;
+        long subtract = baseValue - difference;
+        return subtract;
     }
 
-    /**
-     * @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;
+        int sum = baseValue - difference;
+        short shortSum = (short) sum;
+        return shortSum;
+
     }
 
-    /**
-     * @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;
+        int sum = baseValue - difference;
+        byte byteSum = (byte) sum;
+        return byteSum;
+
     }
 
-    /**
-     * @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 subtract = baseValue - difference;
+        return subtract;
     }
 
-    /**
-     * @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;
+        double subtract = baseValue - difference;
+        return subtract;
     }
 
-
-    /**
-     * @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;
+        int divide = dividend / divisor;
+        return divide;
     }
 
-    /**
-     * @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;
+        long divide = dividend / divisor;
+        return divide;
+
     }
 
-    /**
-     * @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;
+        int sum = dividend / divisor;
+        short shortSum = (short) sum;
+        return shortSum;
+
     }
 
-    /**
-     * @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;
+        int sum = dividend / divisor;
+        byte byteSum = (byte) sum;
+        return byteSum;
+
     }
 
-    /**
-     * @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;
+        float divide = dividend / divisor;
+        return divide;
+
     }
 
-    /**
-     * @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;
-    }
+        double divide = dividend / divisor;
+        return divide;
 
+    }
 
-    /**
-     * @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;
+        int multiply = multiplicand * multiplier;
+        return multiply;
     }
 
-    /**
-     * @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;
+        long multiply = multiplicand * multiplier;
+        return multiply;
     }
 
-    /**
-     * @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;
+        int sum = multiplicand * multiplier;
+        short shortSum = (short) sum;
+        return shortSum;
     }
-    /**
-     * @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;
+        int sum = multiplicand * multiplier;
+        byte byteSum = (byte) sum;
+        return byteSum;
     }
 
-    /**
-     * @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 multiply = multiplicand * multiplier;
+        return multiply;
     }
 
-    /**
-     * @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 multiply = multiplicand * multiplier;
+        return multiply;
 
+    }
 
-    /**
-      * @return true
-     */
     public Boolean returnTrue() {
-        return null;
+        if (20 < 100) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
 
-    /**
-     * @return false
-     */
     public Boolean returnFalse() {
-        return null;
+        if (69 >= 9000) {
+            return true;
+        } else {
+            return false;
+        }
+
     }
 
 }

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

@@ -4,39 +4,41 @@ 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;
+
+        if (x > y) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
 
-    /**
-     * @param x
-     * @param y
-     * @return true if `x` is less than `y`
-     */
     public Boolean isLessThan(int x, int y) {
-        return null;
+        if (x < y) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
 
-    /**
-     * @param x
-     * @param y
-     * @return true if `x` is greater than or equal to `y`
-     */
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
-        return null;
+        if (x >= y) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
 
-    /**
-     * @param x
-     * @param y
-     * @return true if `x` is less than or equal to `y`
-     */
     public Boolean isLessThanOrEqualTo(int x, int y) {
-        return null;
+        if (x <= y) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
-}
+}

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

@@ -4,54 +4,35 @@ 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;
+
+        return "Hello World";
     }
 
-    /**
-     * @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;
+
+        return firstSegment + secondSegment;
     }
 
-    /**
-     * @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;
+
+        return firstSegment + 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;
+
+        return input.substring(2);
     }
 
-    /**
-     * @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 inputValue.equals(comparableValue) ;
     }
 
     /**
@@ -59,7 +40,8 @@ public class StringUtilities {
      * @return the middle character of `inputValue`
      */
     public static Character getMiddleCharacter(String inputValue){
-        return null;
+
+        return input;
     }
 
     /**

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
@@ -142,7 +142,7 @@ public class TestMathUtilities {
         // : Given
         float baseValue = 750.585F;
         float difference = 795.0F;
-        float expectedFloat = -44.415F;
+        float expectedFloat = -44.414978F;
         // : When
         float actualFloat = primativeTypes.subtract(baseValue,difference);
         // : 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

@@ -9,7 +9,7 @@ public class TestPredicateUtilities {
     private static volatile PredicateUtilities math = new PredicateUtilities();
 
     @Test
-    public void testGreaterThanTrue(){
+    public void testGreaterThanTrue() {
         // : Given
         int greaterValue = 450;
         int lesserValue = 350;
@@ -24,9 +24,9 @@ public class TestPredicateUtilities {
 
 
     @Test
-    public void testGreaterThanFalse(){
+    public void testGreaterThanFalse() {
         // : Given
-        int greaterValue = 350;
+        int greaterValue = 550;
         int lesserValue = 350;
 
         // : When
@@ -38,7 +38,7 @@ public class TestPredicateUtilities {
 
 
     @Test
-    public void testLessThanTrue(){
+    public void testLessThanTrue() {
         // : Given
         int greaterValue = 450;
         int lesserValue = 350;
@@ -53,21 +53,7 @@ public class TestPredicateUtilities {
 
 
     @Test
-    public void testLessThan1(){
-        // : Given
-        int greaterValue = 450;
-        int lesserValue = 350;
-
-        // : When
-        boolean outcome = math.isLessThan(greaterValue, lesserValue);
-
-        // : Then
-        assertTrue(outcome);
-    }
-
-
-    @Test
-    public void testLessOrEqual1(){
+    public void testLessOrEqual1() {
         // : Given
         int greaterValue = 3;
         int lesserValue = 3;
@@ -80,7 +66,7 @@ public class TestPredicateUtilities {
     }
 
     @Test
-    public void testLessOrEqual2(){
+    public void testLessOrEqual2() {
         // : Given
         int greaterValue = 3;
         int lesserValue = 6;
@@ -93,7 +79,7 @@ public class TestPredicateUtilities {
     }
 
     @Test
-    public void testGreaterOrEqual1(){
+    public void testGreaterOrEqual1() {
         // : Given
         int greaterValue = 4;
         int lesserValue = 4;
@@ -104,18 +90,6 @@ public class TestPredicateUtilities {
         // : ThenP
         assertTrue(outcome);
     }
+}
 
 
-    @Test
-    public void testGreaterOrEqual2(){
-        // : Given
-        int greaterValue = 8;
-        int lesserValue = 15;
-
-        // : When
-        boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
-
-        // : Then
-        assertTrue(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);