Clean up test

NumberUtilities.java

@@ -2,35 +2,31 @@
 
 
 public class NumberUtilities {
-    public static String getEvenNumbers(int start, int stop) {
+    
+    public static String getRange(int start) {
         return null;
     }
-
-
-    public static String getOddNumbers(int start, int stop) {
+    
+    public static String getRange(int start, int stop) {
         return null;
     }
 
 
-    public static String getSquareNumbers(int start, int stop, int step) {
-        return null;
-    }
-
-    public static String getRange(int start) {
+    public static String getRange(int start, int stop, int step) {
         return null;
     }
-
-    public static String getRange(int start, int stop) {
+    
+    public static String getEvenNumbers(int start, int stop) {
         return null;
     }
 
 
-    public static String getRange(int start, int stop, int step) {
+    public static String getOddNumbers(int start, int stop) {
         return null;
     }
 
 
-    public static String getExponentiations(int start, int stop, int step, int exponent) {
+    public static String getExponentiations(int start, int stop, int exponent) {
         return null;
     }
 }

NumberUtilitiesTest.java

@@ -4,11 +4,12 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NumberUtilitiesTest {
+    
     @Test
-    public void testGetRange1A() {
+    public void testGetRangeForSmallRange() {
         // : Given
-        String expected = "0123456789";
-        int stop = 11;
+        String expected = "012";
+        int stop = 3;
 
         // : When
         String actual = NumberUtilities.getRange(stop);
@@ -16,12 +17,13 @@ public class NumberUtilitiesTest {
         // : Then
         Assert.assertEquals(expected, actual);
     }
-
+    
+    
     @Test
-    public void testGetRange2A() {
+    public void testGetRangeToTwoDigits() {
         // : Given
-        String expected = "01234";
-        int stop = 5;
+        String expected = "01234567891011";
+        int stop = 12;
 
         // : When
         String actual = NumberUtilities.getRange(stop);
@@ -31,35 +33,25 @@ public class NumberUtilitiesTest {
     }
 
     @Test
-    public void testGetRange3A() {
+    public void testGetRangeWithAStartNumber() {
         // : Given
-        String expected = "012345678910111213141516171819";
+        String expected = "5678910111213141516171819";
+        int start = 5;
         int stop = 20;
 
         // : When
-        String actual = NumberUtilities.getRange(stop);
+        String actual = NumberUtilities.getRange(start, stop);
 
         // : Then
         Assert.assertEquals(expected, actual);
     }
 
-
-
-
-
-
-
-
-
-
-
-
     @Test
-    public void testGetRange1B() {
+    public void testGetRangeStartAt100() {
         // : Given
-        String expected = "5678910111213141516171819";
-        int start = 5;
-        int stop = 20;
+        String expected = "100101102103104105106107108109";
+        int start = 100;
+        int stop = 110;
 
         // : When
         String actual = NumberUtilities.getRange(start, stop);
@@ -68,16 +60,17 @@ public class NumberUtilitiesTest {
         Assert.assertEquals(expected, actual);
     }
 
-
+    
     @Test
-    public void testGetRange2B() {
+    public void testGetRangeWithOneStep() {
         // : Given
-        String expected = "101112131415161718192021222324";
-        int start = 10;
-        int stop = 25;
+        String expected = "012345678910111213141516171819";
+        int start = 0;
+        int stop = 20;
+        int step = 1;
 
         // : When
-        String actual = NumberUtilities.getRange(start, stop);
+        String actual = NumberUtilities.getRange(start, stop, step);
 
         // : Then
         Assert.assertEquals(expected, actual);
@@ -85,33 +78,22 @@ public class NumberUtilitiesTest {
 
 
     @Test
-    public void testGetRange3B() {
+    public void testGetRangeWithTwoStep() {
         // : Given
-        String expected = "100101103104105106107108109";
-        int start = 100;
-        int stop = 110;
+        String expected = "0246810";
+        int start = 0;
+        int stop = 11;
+        int step = 2;
 
         // : When
-        String actual = NumberUtilities.getRange(start, stop);
+        String actual = NumberUtilities.getRange(start, stop, step);
 
         // : Then
         Assert.assertEquals(expected, actual);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-    @Test
-    public void testGetRange1C() {
+        @Test
+    public void testGetRangeWithFiveStep() {
         // : Given
         String expected = "51015";
         int start = 5;
@@ -125,72 +107,56 @@ public class NumberUtilitiesTest {
         Assert.assertEquals(expected, actual);
     }
 
-
+    
     @Test
-    public void testGetRange2C() {
+    public void testGetEvenNumbersStartAndEndAtEven() {
         // : Given
-        String expected = "012345678910111213141516171819";
-        int start = 0;
+        String expected = "4681012141618";
+        int start = 4;
         int stop = 20;
-        int step = 1;
 
         // : When
-        String actual = NumberUtilities.getRange(start, stop, step);
+        String actual = NumberUtilities.getEvenNumbers(start, stop);
 
         // : Then
         Assert.assertEquals(expected, actual);
     }
 
-
+    
     @Test
-    public void testGetRange3C() {
+    public void testGetEvenNumbersStartAndEndAtOdd() {
         // : Given
-        String expected = "0246810";
-        int start = 0;
-        int stop = 11;
-        int step = 2;
+        String expected = "68101214161820";
+        int start = 5;
+        int stop = 21;
 
         // : When
-        String actual = NumberUtilities.getRange(start, stop, step);
+        String actual = NumberUtilities.getEvenNumbers(start, stop);
 
         // : Then
         Assert.assertEquals(expected, actual);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+    
     @Test
-    public void testGetEvenNumbers() {
+    public void testGetOddNumbersStartAndEndAtOdd() {
         // : Given
         String expected = "5791113151719";
         int start = 5;
-        int stop = 20;
+        int stop = 21;
 
         // : When
-        String actual = NumberUtilities.getEvenNumbers(start, stop);
+        String actual = NumberUtilities.getOddNumbers(start, stop);
 
         // : Then
         Assert.assertEquals(expected, actual);
     }
 
-    @Test
-    public void testGetOddNumbers() {
+    public void testGetOddNumbersStartAndEndAtEven() {
         // : Given
-        String expected = "681012141618";
-        int start = 5;
-        int stop = 20;
-        int step = 5;
+        String expected = "579111315";
+        int start = 4;
+        int stop = 16;
 
         // : When
         String actual = NumberUtilities.getOddNumbers(start, stop);
@@ -200,35 +166,34 @@ public class NumberUtilitiesTest {
     }
 
 
-
     @Test
-    public void testGetSquareNumbers() {
+    public void testGetExponentiationNumbersForSquare() {
         // : Given
-        String expected = "25100225";
-        int start = 5;
-        int stop = 20;
-        int step = 5;
+        String expected = "4916253649";
+        int start = 2;
+        int stop = 7;
+        int exponent = 2;
 
         // : When
-        String actual = NumberUtilities.getSquareNumbers(start, stop, step);
+        String actual = NumberUtilities.getExponentiations(start, stop, exponent);
 
         // : Then
         Assert.assertEquals(expected, actual);
     }
-
-
+    
+    
     @Test
-    public void testGetExponentiationNumbers() {
+    public void testGetExponentiationNumbersForCube() {
         // : Given
-        String expected = "25100225";
-        int start = 5;
-        int stop = 20;
-        int step = 5;
-        int exponent = 2;
+        String expected = "182764";
+        int start = 1;
+        int stop = 4;
+        int exponent = 3;
 
         // : When
-        String actual = NumberUtilities.getExponentiations(start, stop, step, exponent);
+        String actual = NumberUtilities.getExponentiations(start, stop, exponent);
 
+        // : Then
         Assert.assertEquals(expected, actual);
     }
 }

TableUtilitiesTest.java

@@ -7,6 +7,25 @@ import org.junit.Test;
  * Created by leon on 1/31/18.
  */
 public class TableUtilitiesTest {
+   
+    @Test
+    public void testGetMulplicationTable_forOne(){
+        String expected = "  1 |\n";
+
+        String actual = TableUtilities.getMultiplicationTable(1);
+        Assert.assertEquals(expected, actual);
+    }
+    
+        @Test
+    public void testGetMulplicationTable_forTwo(){
+        String expected = "  1 |  2 |\n" +
+                          "  2 |  4 |\n";
+
+        String actual = TableUtilities.getMultiplicationTable(2);
+        Assert.assertEquals(expected, actual);
+    }
+    
+    
     @Test
     public void testGetLargeMultiplicationTable() {
         String expected =

TriangleUtilities.java

@@ -2,14 +2,15 @@
 
 public class TriangleUtilities {
 
-    public static String getTriangle(int numberOfRows) {
+    public static String getRow(int numberOfStars) {
         return null;
     }
-
-    public static String getRow(int numberOfStars) {
+    
+    public static String getTriangle(int numberOfRows) {
         return null;
     }
 
+
     public static String getSmallTriangle() {
         return null;
     }

TriangleUtilitiesTest.java

@@ -7,18 +7,62 @@ import org.junit.Test;
 public class TriangleUtilitiesTest {
 
     @Test
-    public void getRow() {
+    public void testGetRow_ForSmallWidth(){
+        //Given
+        String expected = "*";
+        int width = 1;
+        
+        //When
+        String actual = TriangleUtilities.getRow(width);
+        
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void testGetRow_ForBigWidth() {
+        //Given
         String expected = "********************";
         int width = 20;
+        
+        //When
         String actual = TriangleUtilities.getRow(width);
+        
+        //Then
         Assert.assertEquals(expected, actual);
     }
 
+    @Test
+    public void testGetTriangle_ForOneRow() {
+        // Given
+        String expected = "*\n";
 
+        // When
+        String actual = TriangleUtilities.getTriangle(1);
+        
+        // Then
+        Assert.assertEquals(expected, actual);
+    }
+    
     @Test
-    public void getTriangleTest1() {
+    public void testGetTriangle_ForSmallTriangle() {
+        // Given
         String expected =
-                "*\n" +
+                        "*\n" +
+                        "**\n" +
+                        "***\n";
+
+        // When                
+        String actual = TriangleUtilities.getTriangle(3);
+        
+        // Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void testGetTriangle_ForBigTriangle() {
+        String expected =
+                        "*\n" +
                         "**\n" +
                         "***\n" +
                         "****\n" +
@@ -26,23 +70,13 @@ public class TriangleUtilitiesTest {
                         "******\n" +
                         "*******\n" +
                         "********\n" +
-                        "*********\n";
+                        "*********\n" +
+                        "**********\n";
         String actual = TriangleUtilities.getTriangle(10);
         Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void getTriangleTest2() {
-        String expected =
-                "*\n" +
-                        "**\n" +
-                        "***\n" +
-                        "****\n";
-        String actual = TriangleUtilities.getTriangle(5);
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
     public void testGetLargeTriangle() {
         String expected =
                 "*\n" +

package.bluej

@@ -1,27 +1,27 @@
 #BlueJ package file
-dependency1.from=TableUtilitiesTest
-dependency1.to=TableUtilities
+dependency1.from=NumberUtilitiesTest
+dependency1.to=NumberUtilities
 dependency1.type=UsesDependency
-dependency2.from=NumberUtilitiesTest
-dependency2.to=NumberUtilities
+dependency2.from=TriangleUtilitiesTest
+dependency2.to=TriangleUtilities
 dependency2.type=UsesDependency
-dependency3.from=TriangleUtilitiesTest
-dependency3.to=TriangleUtilities
+dependency3.from=TableUtilitiesTest
+dependency3.to=TableUtilities
 dependency3.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=640
-editor.fx.0.y=23
+editor.fx.0.x=537
+editor.fx.0.y=28
 objectbench.height=164
-objectbench.width=595
+objectbench.width=484
 package.divider.horizontal=0.6
 package.divider.vertical=0.7560627674750356
 package.editor.height=523
-package.editor.width=493
+package.editor.width=382
 package.editor.x=20
 package.editor.y=57
 package.frame.height=759
-package.frame.width=619
+package.frame.width=508
 package.numDependencies=3
 package.numTargets=6
 package.showExtends=true
@@ -62,18 +62,18 @@ target4.type=ClassTarget
 target4.width=120
 target4.x=80
 target4.y=70
-target5.association=TriangleUtilitiesTest
 target5.height=50
-target5.name=TriangleUtilities
+target5.name=NumberUtilitiesTest
 target5.showInterface=false
-target5.type=ClassTarget
+target5.type=UnitTestTargetJunit4
 target5.width=120
-target5.x=70
-target5.y=190
+target5.x=110
+target5.y=40
+target6.association=TriangleUtilitiesTest
 target6.height=50
-target6.name=NumberUtilitiesTest
+target6.name=TriangleUtilities
 target6.showInterface=false
-target6.type=UnitTestTargetJunit4
+target6.type=ClassTarget
 target6.width=120
-target6.x=110
-target6.y=40
+target6.x=70
+target6.y=190