Merge c7d24f144ca4b1569fcb5dabd1058ff936c7f51a 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,7 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Long add(long baseValue, long difference) {
-        return null;
+        return (Long) 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 (int) (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,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 +92,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 +101,7 @@ public class MathUtilities {
      * @return difference between `baseValue` and `difference`
      */
     public Float subtract(float baseValue, float difference) {
-        return null;
+        return (baseValue - difference);
     }
 
     /**
@@ -110,7 +110,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 +120,7 @@ public class MathUtilities {
      * @return division of `dividend` by `divisor
      */
     public Integer divide(int dividend, int divisor) {
-        return null;
+        return (int) (dividend / divisor);
     }
 
     /**
@@ -129,7 +129,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 +138,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 +147,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 +156,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 +165,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 +175,7 @@ public class MathUtilities {
      * @return product of `multiplicand` by `multiplier`
      */
     public Integer multiply(int multiplicand, int multiplier) {
-        return null;
+        return (int) (multiplicand * multiplier);
     }
 
     /**
@@ -184,7 +184,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 +193,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 +201,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 +211,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 +220,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 +228,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,12 @@ public class PredicateUtilities {
      * @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;
+        }
     }
 
     /**
@@ -19,7 +24,12 @@ public class PredicateUtilities {
      * @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;
+       }
     }
 
     /**
@@ -28,7 +38,12 @@ public class PredicateUtilities {
      * @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;
+        }
     }
 
     /**
@@ -37,6 +52,10 @@ public class PredicateUtilities {
      * @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

@@ -8,81 +8,98 @@ 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 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;
+    public static String concatenation(String firstSegment, String secondSegment) {
+        return firstSegment + secondSegment;
+
     }
 
     /**
-     * @param firstSegment a string to be added to
+     * @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;
+    public static String concatenation(int firstSegment, String secondSegment) {
+        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;
+    public static String getPrefix(String input) {
+        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;
+    public static String getSuffix(String input) {
+        return input.substring(input.length() - 3);
     }
 
     /**
-     * @param inputValue the value to be compared
+     * @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;
+    public static Boolean compareTwoStrings(String inputValue, String comparableValue) {
+        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) {
+        double mid = inputValue.length() / 2;
+        int i = (int) mid;
+        if (inputValue.length() % 2 != 0) {
+            return inputValue.charAt(i);
+        } else {
+            return inputValue.charAt(i - 1);
+        }
     }
 
     /**
      * @param spaceDelimitedString a string, representative of a sentence, containing spaces
      * @return the first sequence of characters
      */
-    public static String getFirstWord(String spaceDelimitedString){
-        return null;
+    public static String getFirstWord(String spaceDelimitedString) {
+        String [] stringArray = spaceDelimitedString.split(" ", 0);
+        return stringArray[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;
+    public static String getSecondWord(String spaceDelimitedString) {
+        String [] stringArray2 = spaceDelimitedString.split(" ",0);
+        return stringArray2[1];
     }
 
     /**
      * @param stringToReverse
      * @return an identical string with characters in reverse order.
      */
-    public static String reverseTheTwo(String stringToReverse){
-        return null;
+    public static String reverseTheTwo(String stringToReverse) {
+        StringBuilder string1 = new StringBuilder(stringToReverse);
+
+        String string2 = string1.reverse().toString();
+
+        return String.valueOf(string2);
+        }
+
     }
-}
+

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() {
@@ -294,9 +294,9 @@ public class TestMathUtilities {
     @Test
     public void testMultiplication3() {
         // : Given
-        byte multiplicand = 16;
-        byte multiplier = 14;
-        byte expectedByte = 64;
+        byte multiplicand = -8;
+        byte multiplier = 4;
+        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

@@ -22,14 +22,14 @@ public class TestStringUtilities {
     }
 
     @Test
-    public void concatenationStringTest(){
+    public void concatenationStringTest() {
         // : Given
         String one = "Hello";
         String two = " Java";
         String expected = "Hello Java";
 
         // : When
-        String actual = StringUtilities.concatenation(one,two);
+        String actual = StringUtilities.concatenation(one, two);
 
 
         // : Then
@@ -38,14 +38,14 @@ public class TestStringUtilities {
 
 
     @Test
-    public void concatenationStringAndIntegerTest(){
+    public void concatenationStringAndIntegerTest() {
         // : Given
         int one = 1;
         String two = " Java";
         String expected = "1 Java";
 
         // : When
-        String actual = StringUtilities.concatenation(one,two);
+        String actual = StringUtilities.concatenation(one, two);
 
 
         // : Then
@@ -53,10 +53,10 @@ public class TestStringUtilities {
     }
 
     @Test
-    public void substringBeginTest(){
+    public void substringBeginTest() {
         // : Given
         String input = "Hello";
-        String expected = "olleH";
+        String expected = "Hel";
 
         // : When
         String actual = StringUtilities.getPrefix(input);
@@ -66,7 +66,7 @@ public class TestStringUtilities {
     }
 
     @Test
-    public void substringEndTest(){
+    public void substringEndTest() {
         // : Given
         String input = "Hello";
         String expected = "llo";
@@ -79,7 +79,7 @@ public class TestStringUtilities {
     }
 
     @Test
-    public void compareToTestEquals(){
+    public void compareToTestEquals() {
         // : Given
         String inputValue = "Zipcode";
         String comparableValue = "Zipcode";
@@ -93,7 +93,7 @@ public class TestStringUtilities {
 
 
     @Test
-    public void compareToTestNotEquals(){
+    public void compareToTestNotEquals() {
         // : Given
         String inputValue = "Zipcode";
         String comparableValue = "Zipcodee";
@@ -106,7 +106,7 @@ public class TestStringUtilities {
     }
 
     @Test
-    public void getTheMiddleChar1(){
+    public void getTheMiddleChar1() {
         // : Given
         String input = "Zipcode";
         char expected = 'c';
@@ -120,7 +120,7 @@ public class TestStringUtilities {
 
 
     @Test
-    public void getTheMiddleChar2(){
+    public void getTheMiddleChar2() {
         // : Given
         String input = "Zipcoder";
         Character expected = 'c';
@@ -134,7 +134,7 @@ public class TestStringUtilities {
 
 
     @Test
-    public void getTheFirstWord(){
+    public void getTheFirstWord() {
         // : Given
         String input = "Zipcode Wilmington";
         String expected = "Zipcode";
@@ -148,18 +148,17 @@ public class TestStringUtilities {
 
 
     @Test
-    public void getTheSecondWord(){
+    public void getTheSecondWord() {
         // : Given
         String input = "Zipcode Wilmington";
         String expected = "Wilmington";
 
         // : When
-        String actual = StringUtilities.getFirstWord(input);
+        String actual = StringUtilities.getSecondWord(input);
 
         // : Then
         assertEquals(expected, actual);
     }
-
     @Test
     public void reverseThem(){
         // : Given
@@ -174,3 +173,6 @@ public class TestStringUtilities {
         assertEquals(expected, actual);
     }
 }
+
+
+