updated junit tests; MathUtilitiesTest

src/test/java/com/zipcodewilmington/danny_do_better/HelloWorldTest.java

@@ -1,6 +1,5 @@
 package com.zipcodewilmington.danny_do_better;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -9,19 +8,12 @@ import static org.junit.Assert.assertEquals;
  * Created by leon on 2/1/18.
  */
 public class HelloWorldTest {
-
-    HelloWorld helloWorld;
-
-    @Before
-    public void initialize(){
-        helloWorld = new HelloWorld();
-    }
+    public static final HelloWorld helloWorld = new HelloWorld();
 
     @Test
     public void TestHelloWorld(){
         String expected = "Hello World";
-        String actual = this.helloWorld.helloWorld();
-
+        String actual = helloWorld.helloWorld();
         assertEquals(expected,actual);
     }
 

src/test/java/com/zipcodewilmington/danny_do_better/PrimativeTypesTest.java

@@ -11,52 +11,70 @@ public class PrimativeTypesTest {
 
     @Test
     public void testAdditions() {
+        // : Given
         int baseValue = 20;
         int addedValue = 7;
         int expected = 27;
+        // : When
         int actual = primativeTypes.add(baseValue, addedValue);
+        // : Then
         assertEquals(expected,actual);
     }
     @Test
     public void testAdditions1() {
+        // : Given
         long baseValue = 228437266;
         long difference = 228437265;
         long expected = 456874531;
+        // : When
         long actual = primativeTypes.add(baseValue, difference);
+        // : Then
         assertEquals(expected,actual);
     }
     @Test
     public void testAdditions2() {
+        // : Given
         short baseValue = 16384;
         short addedValue = 7;
         short expected = 32767;
+        // : When
         short actual = primativeTypes.add(baseValue, addedValue);
+        // : Then
         assertEquals(expected,actual);
     }
 
     @Test
     public void testAdditions4() {
+        // : Given
         byte baseValue = 63;
         byte addedValue = 64;
         byte expected = 127;
+        // : When
         byte actual = primativeTypes.add(baseValue, addedValue);
+        // : Then
         assertEquals(expected,actual);
     }
     @Test
     public void testAdditions5() {
+        // : Given
         float baseValue = 750.585F;
         float addedValue = 795.000F;
         float expected = 1545.585F;
+        // : When
         float actual = primativeTypes.add(baseValue, addedValue);
+        // : Then
         assertEquals(expected,actual, 0);
     }
 
     @Test
     public void testAdditions6() {
+        // : Given
         double baseValue = 225.25;
         double addedValue = 231;
         double expected = 456.25;
+        // : When
         double actual = primativeTypes.add(baseValue,addedValue);
+        // : Then
         assertEquals(expected,actual, 0);
     }
 
@@ -77,50 +95,68 @@ public class PrimativeTypesTest {
 
     @Test
     public void testSubtractions(){
+        // : Given
         int baseValue = 20;
         int difference = 7;
         int expectedInt = 13;
+        // : When
         int actualInt = primativeTypes.subtract(baseValue,difference);
+        // : Then
         assertEquals(expectedInt,actualInt);
     }
     @Test
     public void testSubtractions1() {
+        // : Given
         long baseValue = 228437266;
         long difference = 228437265;
         long expectedLong = 1;
+        // : When
         long actualLong = primativeTypes.subtract(baseValue, difference);
+        // : Then
         assertEquals(expectedLong,actualLong);
     }
     @Test
     public void testSubtractions2() {
+        // : Given
         short baseValue = 16384;
         short difference = 16383;
         short expectedShort = 1;
-        short actualShort = (short) primativeTypes.subtract(baseValue, difference);
+        // : When
+        short actualShort = primativeTypes.subtract(baseValue, difference);
+        // : Then
         assertEquals(expectedShort,actualShort);
     }
     @Test
     public void testSubtractions3() {
+        // : Given
         byte baseValue = 63;
         byte difference = 64;
         byte expectedByte = -1;
+        // : When
         byte actualByte = primativeTypes.subtract(baseValue, difference);
+        // : Then
         assertEquals(expectedByte,actualByte);
     }
     @Test
     public void testSubtractions4() {
+        // : Given
         float baseValue = 750.585F;
         float difference = 795.0F;
-        float expectedFloat = (float) -44.415;
-        float actualFloat = (float) primativeTypes.subtract(baseValue,difference);
+        float expectedFloat = -44.415F;
+        // : When
+        float actualFloat = primativeTypes.subtract(baseValue,difference);
+        // : Then
         assertEquals(expectedFloat,actualFloat, 0);
     }
     @Test
     public void testSubtractions5() {
+        // : Given
         double baseValue = 225.25;
         double difference = 231;
         double expectedDouble = -5.75;
+        // : When
         double actualDouble = primativeTypes.subtract(baseValue, difference);
+        // : Then
         assertEquals(expectedDouble,actualDouble, 0);
     }
 
@@ -139,51 +175,69 @@ public class PrimativeTypesTest {
 
     @Test
     public void testDivision(){
+        // : Given
         int dividend = 20;
         int divisor = 2;
         int expectedInt = 10;
+        // : When
         int actualInt = primativeTypes.divide(dividend, divisor);
+        // : Then
         assertEquals(expectedInt,actualInt);
     }
     @Test
     public void testDivision1() {
+        // : Given
         int dividend = 20000000;
         int divisor = 1000;
         long expectedLong = 20000;
+        // : When
         long actualLong = primativeTypes.divide(dividend, divisor);
+        // : Then
         assertEquals(expectedLong,actualLong);
     }
     @Test
     public void testDivision2() {
+        // : Given
         short dividend = 2;
         short divisor = 1;
         short expectedShort = 2;
+        // : When
         short actualShort = primativeTypes.divide(dividend, divisor);
+        // : Then
         assertEquals(expectedShort,actualShort);
 
     }
     @Test
     public void testDivision3() {
+        // : Given
         byte dividend = 64;
         byte divisor = 32;
         byte expectedByte = 2;
-        byte actualByte = (byte) primativeTypes.divide(dividend, divisor);
+        // : When
+        byte actualByte = primativeTypes.divide(dividend, divisor);
+        // : Then
         assertEquals(expectedByte,actualByte);
     }
     @Test
     public void testDivision4() {
+        // : Given
         float dividend = 7.5F;
         float divisor = 3;
         float expectedFloat = 2.50F;
+        // : When
         float actualFloat = primativeTypes.divide(dividend,divisor);
+        // : Then
         assertEquals(expectedFloat,actualFloat, 0);
     }
     @Test
     public void testDivision5() {
+        // : Given
         double dividend = 5.0;
         double divisor = 4.0;
         double expectedDouble = 1.25;
+        // : When
         double actualDouble = primativeTypes.divide(dividend,divisor);
+        // : Then
         assertEquals(expectedDouble,actualDouble, 0);
     }
 
@@ -206,60 +260,84 @@ public class PrimativeTypesTest {
 
     @Test
     public void testMultiplication(){
+        // : Given
         int multiplicand = 5;
         int multiplier = 2;
         int expectedInt = 10;
+        // : When
         int actualInt = primativeTypes.multiply(multiplicand,multiplier);
+        // : Then
         assertEquals(expectedInt,actualInt);
     }
     @Test
     public void testMultiplication1() {
+        // : Given
         long multiplicand = 20;
         long multiplier = 1000;
         long expectedLong = 20000;
+        // : When
         long actualLong = primativeTypes.multiply(multiplicand, multiplier);
+        // : Then
         assertEquals(expectedLong, actualLong);
     }
     @Test
     public void testMultiplication2() {
+        // : Given
         short multiplicand = 2;
         short multiplier = 1;
         short expectedShort = 2;
-        short actualShort = (short) primativeTypes.multiply(multiplicand, multiplier);
+        // : When
+        short actualShort = primativeTypes.multiply(multiplicand, multiplier);
+        // : Then
         assertEquals(expectedShort, actualShort);
     }
     @Test
     public void testMultiplication3() {
+        // : Given
         byte multiplicand = 16;
         byte multiplier = 14;
         byte expectedByte = 64;
-        byte actualByte = (byte) primativeTypes.multiply(multiplicand, multiplier);
+        // : When
+        byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
+        // : Then
         assertEquals(expectedByte, actualByte);
     }
     @Test
     public void testMultiplication4() {
+        // : Given
         float multiplicand = 2.5F;
         float multiplier = 1;
-        float expectedFloat = (float) 2.50;
-        float actualFloat = (float) primativeTypes.multiply(multiplicand,multiplier);
+        float expectedFloat = 2.50F;
+        // : When
+        float actualFloat =  primativeTypes.multiply(multiplicand,multiplier);
+        // : Then
         assertEquals(expectedFloat, actualFloat, 0);
     }
     @Test
     public void testMultiplication5() {
+        // : Given
         double multiplicand = 3.25;
         double multiplier = 3.0;
         double expectedDouble = 9.75;
+        // : When
         double actualDouble = primativeTypes.multiply(multiplicand,multiplier);
+        // : Then
         assertEquals(expectedDouble, actualDouble, 0);
     }
 
     @Test
     public void testReturnTrue(){
+        // : Given
+        // : When
+        // : Then
         assertTrue(primativeTypes.returnTrue());
     }
 
     @Test
     public void testReturnFalse(){
+        // : Given
+        // : When
+        // : Then
         assertFalse(primativeTypes.returnFalse());
     }