merge conflicts

.gitignore

@@ -1,57 +1,6 @@
-er-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# CMake
-cmake-build-debug/
-
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-.idea/sonarlint
+/target/
+.DS_Store
+.classpath
+#.project
+.settings
+.idea/

.idea/.name

@@ -1 +0,0 @@
-ChapterOneMicro

.idea/compiler.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="ChapterOneMicro" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="ChapterOneMicro" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/misc.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ChapterOneMicro.iml" filepath="$PROJECT_DIR$/ChapterOneMicro.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

README.md

@@ -1,38 +1,38 @@
 # Java Fundamentals
 
-* **Objective:**
-    * To complete the method stubs in each of the provided classes
-        * `MathUtilities`
-    	* `PredicateUtilities`
-    	* `StringUtilities`
-
-* **Purpose:**
-    * To establish familiarity with
-        * [primitive data-types](http://cs.fit.edu/~ryan/java/language/java-data.html)
-        * [method signatures and return statements](http://www.homeandlearn.co.uk/java/java_methods.html)
-        * [String operations](https://www.tutorialspoint.com/java/java_strings.htm)
-    
-* **Classes to be completed:**
+### **Objective:**
+* To complete the method stubs in each of the provided classes
 	* `MathUtilities`
 	* `PredicateUtilities`
 	* `StringUtilities`
+
+### **Purpose:**
+* To establish familiarity with
+    * [primitive data-types](http://cs.fit.edu/~ryan/java/language/java-data.html)
+    * [method signatures and return statements](http://www.homeandlearn.co.uk/java/java_methods.html)
+    * [String operations](https://www.tutorialspoint.com/java/java_strings.htm)
+    
+### **Classes to be completed:**
+* `MathUtilities`
+* `PredicateUtilities`
+* `StringUtilities`
 	
-* **Instructions**
+### **Instructions:**
 
-    1. Fork this Repository
-        * [fork](https://help.github.com/articles/fork-a-repo/) this repository to your personal github account 
-        * [clone](https://help.github.com/articles/cloning-a-repository/) **your** `forked` repository to your local machine.
-        * Complete steps 2 and 3  
-        * `git add` your changes to the list of your `commited` files.
-        * `git commit` your added files to the list of your `staged` files.
-        * `git push` your staged files to your remote repository.
-        * submit a `pull request` which compares Zipcoder `master` to your `master`.
-    2. Begin by first ensuring the `main` method in your `ZipcodeRocks` class prints `"Zipcode Rocks!"` upon execution.  
-    3. Complete each of the method stubs in each of the `main` classes provided.
-        * `main` classes are located in `src.main.java.com.zipcodewilmington.danny_do_better_exercises`
-        * There are comments above each method stub to describe the expected behavior.
-    4. Upon completion, open and run the `TestSuite` class to ensure that all tests have 100% success.
-        * `TestSuite` is located in `src.test.java.com.zipcodewilmington.danny_do_better_exercises`
+1. Fork this Repository
+    * [fork](https://help.github.com/articles/fork-a-repo/) this repository to your personal github account 
+    * [clone](https://help.github.com/articles/cloning-a-repository/) **your** `forked` repository to your local machine.
+    * Complete steps 2 and 3  
+    * `git add` your changes to the list of your `commited` files.
+    * `git commit` your added files to the list of your `staged` files.
+    * `git push` your staged files to your remote repository.
+    * submit a `pull request` which compares Zipcoder `master` to your `master`.
+2. Begin by first ensuring the `main` method in your `ZipcodeRocks` class prints `"Zipcode Rocks!"` upon execution.  
+3. Complete each of the method stubs in each of the `main` classes provided.
+    * `main` classes are located in `src.main.java.com.zipcodewilmington.danny_do_better_exercises`
+    * There are comments above each method stub to describe the expected behavior.
+4. Upon completion, open and run the `TestSuite` class to ensure that all tests have 100% success.
+    * `TestSuite` is located in `src.test.java.com.zipcodewilmington.danny_do_better_exercises`
 
 ## Predicate Utilities
 * A _predicate_ is a clause which states something about a subject. (_e.g., **is assigning**_ in _"Leon **is assigning** homework"_)
@@ -86,7 +86,7 @@
 	* `Character getMiddleCharacter(String)`
 	* `String getFirstWord(String)`
 	* `String getSecondWord(String)`
-	* `String reverseTheTwo(String)`
+	* `String reverse(String)`
 	
 	
 ## Whats next?

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

@@ -93,11 +93,17 @@ public class StringUtilities {
      * @param stringToReverse
      * @return an identical string with characters in reverse order.
      */
-    public static String reverseTheTwo(String stringToReverse){
+
+    public static String reverseTheTwo(String stringToReverse) {
         String reverse = "";
-        for(int i = stringToReverse.length()-1; i >= 0; i--) {
+        for (int i = stringToReverse.length() - 1; i >= 0; i--) {
             reverse += stringToReverse.charAt(i);
         }
         return reverse;
     }
+
+    public static String reverse(String stringToReverse){
+        return null;
+
+    }
 }

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.005);
     }
     @Test
     public void testSubtractions5() {

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

@@ -1,7 +1,9 @@
 package com.zipcodewilmington.danny_do_better_exercises;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
+
 /**
  * Created by dan on 6/14/17.
  */
@@ -9,7 +11,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,7 +26,7 @@ public class TestPredicateUtilities {
 
 
     @Test
-    public void testGreaterThanFalse(){
+    public void testGreaterThanFalse() {
         // : Given
         int greaterValue = 350;
         int lesserValue = 350;
@@ -33,12 +35,12 @@ public class TestPredicateUtilities {
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
 
         // : Then
-        assertTrue(outcome);
+        assertFalse(outcome);
     }
 
 
     @Test
-    public void testLessThanTrue(){
+    public void testLessThanTrue() {
         // : Given
         int greaterValue = 450;
         int lesserValue = 350;
@@ -51,9 +53,8 @@ public class TestPredicateUtilities {
     }
 
 
-
     @Test
-    public void testLessThan1(){
+    public void testLessThan1() {
         // : Given
         int greaterValue = 450;
         int lesserValue = 350;
@@ -62,12 +63,12 @@ public class TestPredicateUtilities {
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
 
         // : Then
-        assertTrue(outcome);
+        assertFalse(outcome);
     }
 
 
     @Test
-    public void testLessOrEqual1(){
+    public void testLessOrEqual1() {
         // : Given
         int greaterValue = 3;
         int lesserValue = 3;
@@ -80,7 +81,7 @@ public class TestPredicateUtilities {
     }
 
     @Test
-    public void testLessOrEqual2(){
+    public void testLessOrEqual2() {
         // : Given
         int greaterValue = 3;
         int lesserValue = 6;
@@ -93,7 +94,7 @@ public class TestPredicateUtilities {
     }
 
     @Test
-    public void testGreaterOrEqual1(){
+    public void testGreaterOrEqual1() {
         // : Given
         int greaterValue = 4;
         int lesserValue = 4;
@@ -107,7 +108,7 @@ public class TestPredicateUtilities {
 
 
     @Test
-    public void testGreaterOrEqual2(){
+    public void testGreaterOrEqual2() {
         // : Given
         int greaterValue = 8;
         int lesserValue = 15;
@@ -116,6 +117,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);
@@ -109,13 +109,13 @@ public class TestStringUtilities {
     public void getTheMiddleChar1(){
         // : Given
         String input = "Zipcode";
-        char expected = 'c';
+        Character expected = 'c';
 
         // : When
-        char actual = StringUtilities.getMiddleCharacter(input);
+        Character actual = StringUtilities.getMiddleCharacter(input);
 
         // : Then
-        Assert.assertEquals(expected, actual);
+        Assert.assertEquals(expected.toString(), actual.toString());
     }
 
 
@@ -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);
@@ -168,7 +168,7 @@ public class TestStringUtilities {
 
 
         // : When
-        String actual = StringUtilities.reverseTheTwo(input);
+        String actual = StringUtilities.reverse(input);
 
         // : Then
         assertEquals(expected, actual);