Commiting Changes for Lab

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,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Long add(long baseValue, long difference) {
-        return null;
+        return baseValue + difference;
     }
 
     /**
@@ -29,7 +29,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Short add(short baseValue, short difference) {
-        return null;
+        return (short)(baseValue + difference);
     }
 
     /**
@@ -38,7 +38,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Byte add(byte baseValue, byte difference) {
-        return null;
+        return (byte)(baseValue + difference);
     }
 
     /**
@@ -47,7 +47,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 +56,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 +65,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Integer subtract(int baseValue, int difference) {
-        return null;
+        return baseValue - difference;
     }
 
     /**
@@ -74,7 +74,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 +83,8 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Short subtract(short baseValue, short difference) {
-        return null;
+
+        return (short)(baseValue - difference);
     }
 
     /**
@@ -92,7 +93,8 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Byte subtract(byte baseValue, byte difference) {
-        return null;
+
+        return (byte)(baseValue - difference);
     }
 
     /**
@@ -101,7 +103,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Float subtract(float baseValue, float difference) {
-        return null;
+        return (float)(baseValue - difference);
     }
 
     /**
@@ -110,7 +112,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 +122,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Integer divide(int dividend, int divisor) {
-        return null;
+        return dividend / divisor;
     }
 
     /**
@@ -129,7 +131,8 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Long divide(long dividend, long divisor) {
-        return null;
+
+        return (long)dividend / divisor;
     }
 
     /**
@@ -138,7 +141,8 @@ 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,8 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Byte divide(byte dividend, byte divisor) {
-        return null;
+
+        return (byte)(dividend / divisor);
     }
 
     /**
@@ -156,7 +161,8 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Float divide(float dividend, float divisor) {
-        return null;
+
+        return (float)(dividend / divisor);
     }
 
     /**
@@ -165,7 +171,8 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Double divide(double dividend, double divisor) {
-        return null;
+
+        return (double)(dividend / divisor);
     }
 
 
@@ -175,7 +182,8 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Integer multiply(int multiplicand, int multiplier) {
-        return null;
+
+        return multiplicand * multiplier;
     }
 
     /**
@@ -184,7 +192,8 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Long multiply(long multiplicand, long multiplier) {
-        return null;
+
+        return (long)(multiplicand * multiplier);
     }
 
     /**
@@ -193,7 +202,8 @@ 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 +211,8 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Byte multiply(byte multiplicand, byte multiplier) {
-        return null;
+
+        return (byte)(multiplicand * multiplier);
     }
 
     /**
@@ -210,7 +221,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 +230,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 +238,16 @@ 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

@@ -3,14 +3,16 @@ 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;
     }
 
     /**
@@ -19,7 +21,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 +30,8 @@ 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 +40,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,8 @@ public class StringUtilities {
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
      */
     public static String concatenation(String firstSegment, String secondSegment){
-        return null;
+
+        return (firstSegment + secondSegment);
     }
 
     /**
@@ -26,7 +28,8 @@ public class StringUtilities {
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
      */
     public static String concatenation(int firstSegment, String secondSegment){
-        return null;
+
+        return (firstSegment + secondSegment);
     }
 
     /**
@@ -34,7 +37,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 +46,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);
     }
 
     /**
@@ -51,23 +56,26 @@ 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);
     }
 
     /**
      * @param inputValue the value input from user
      * @return the middle character of `inputValue`
      */
-    public static Character getMiddleCharacter(String inputValue){
-        return null;
-    }
+    public static Character getMiddleCharacter(String inputValue)
+
+        {
+            
+        }
 
     /**
      * @param spaceDelimitedString a string, representative of a sentence, containing spaces
      * @return the first sequence of characters
      */
     public static String getFirstWord(String spaceDelimitedString){
-        return null;
+        return spaceDelimitedString.substring(spaceDelimitedString.lastIndexOf(" ")+1);
     }
 
     /**
@@ -75,7 +83,7 @@ public class StringUtilities {
      * @return the second word of a string delimited by spaces.
      */
     public static String getSecondWord(String spaceDelimitedString){
-        return null;
+        return spaceDelimitedString.trim();
     }
 
     /**
@@ -83,6 +91,8 @@ public class StringUtilities {
      * @return an identical string with characters in reverse order.
      */
     public static String reverseTheTwo(String stringToReverse){
-        return null;
+        return new StringBuilder(stringToReverse).reverse().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,9 +36,9 @@ public class TestMathUtilities {
         // : Given
         short baseValue = 16384;
         short addedValue = 7;
-        short expected = 32767;
+        short expected = 16391;
         // : When
-        short actual = primativeTypes.add(baseValue, addedValue);
+        short actual = (short) primativeTypes.add(baseValue, addedValue);
         // : Then
         assertEquals(expected,actual);
     }
@@ -146,7 +146,7 @@ public class TestMathUtilities {
         // : When
         float actualFloat = primativeTypes.subtract(baseValue,difference);
         // : Then
-        assertEquals(expectedFloat,actualFloat, 0);
+        assertEquals(expectedFloat,actualFloat, 0.005);
     }
     @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);