9 Commity

Autor SHA1 Wiadomość Data
  Brandon Defrancis cf00a7b3c3 final 5 lat temu
  Brandon Defrancis 443abd4ef9 Merge branch 'master' of https://git.zipcode.rocks/Cohort4.2/Quiz5 5 lat temu
  Leon 10ac76ad0e update 5 lat temu
  Leon f0c939e16b update 5 lat temu
  Leon 4c54d130c7 update 5 lat temu
  Leon 5f72e6dc5f update 5 lat temu
  Leon aa72d9a451 update 5 lat temu
  Leon 33120f10d8 update 5 lat temu
  Leon b9baa214e7 update 5 lat temu

+ 3
- 0
src/main/java/rocks/zipcode/quiz5/collections/WordCounter.java Wyświetl plik

@@ -3,6 +3,9 @@ package rocks.zipcode.quiz5.collections;
3 3
 import java.util.Map;
4 4
 
5 5
 public class WordCounter {
6
+
7
+
8
+
6 9
     public WordCounter(String... strings) {
7 10
     }
8 11
 

+ 2
- 2
src/test/java/rocks/zipcode/quiz5/fundamentals/calculator/AddTest.java Wyświetl plik

@@ -11,7 +11,7 @@ public class AddTest {
11 11
     @Test
12 12
     public void test1() {
13 13
         // given
14
-        test(98.5, 10.5, 88.5);
14
+        test(99.0, 10.5, 88.5);
15 15
     }
16 16
 
17 17
     @Test
@@ -44,6 +44,6 @@ public class AddTest {
44 44
         Double actual = calculator.add(input1, input2);
45 45
 
46 46
         // then
47
-        Assert.assertEquals(expected, actual, 0);
47
+        Assert.assertEquals(expected, actual, 0.01);
48 48
     }
49 49
 }

+ 2
- 2
src/test/java/rocks/zipcode/quiz5/fundamentals/calculator/DivideTest.java Wyświetl plik

@@ -29,7 +29,7 @@ public class DivideTest {
29 29
     @Test
30 30
     public void test4() {
31 31
         // given
32
-        test(9.0, 63.0, 5.0);
32
+        test(12.6, 63.0, 5.0);
33 33
     }
34 34
 
35 35
     @Test
@@ -44,6 +44,6 @@ public class DivideTest {
44 44
         Double actual = calculator.divide(input1, input2);
45 45
 
46 46
         // then
47
-        Assert.assertEquals(expected, actual, 0);
47
+        Assert.assertEquals(expected, actual, 0.01);
48 48
     }
49 49
 }

+ 1
- 1
src/test/java/rocks/zipcode/quiz5/fundamentals/calculator/SquareRootTest.java Wyświetl plik

@@ -40,6 +40,6 @@ public class SquareRootTest {
40 40
         Double actual = calculator.squareRoot(input);
41 41
 
42 42
         // then
43
-        Assert.assertEquals(expected, actual, 0);
43
+        Assert.assertEquals(expected, actual, 0.01);
44 44
     }
45 45
 }

+ 1
- 1
src/test/java/rocks/zipcode/quiz5/fundamentals/calculator/SquareRootsTest.java Wyświetl plik

@@ -24,7 +24,7 @@ public class SquareRootsTest {
24 24
     @Test
25 25
     public void test3() {
26 26
         // given
27
-        test(new Double[]{12.0, 438.0, }, 144.0, 191844.0, 81.0);
27
+        test(new Double[]{12.0, 438.0, 9.0}, 144.0, 191844.0, 81.0);
28 28
     }
29 29
 
30 30
     @Test

+ 1
- 1
src/test/java/rocks/zipcode/quiz5/fundamentals/calculator/SquareTest.java Wyświetl plik

@@ -44,6 +44,6 @@ public class SquareTest {
44 44
         Double actual = calculator.square(input);
45 45
 
46 46
         // then
47
-        Assert.assertEquals(expected, actual, 0);
47
+        Assert.assertEquals(expected, actual, 0.01);
48 48
     }
49 49
 }

+ 1
- 1
src/test/java/rocks/zipcode/quiz5/fundamentals/stringutils/HasDuplicateConsecutiveCharactersTest.java Wyświetl plik

@@ -8,7 +8,7 @@ public class HasDuplicateConsecutiveCharactersTest {
8 8
     @Test
9 9
     public void test1() {
10 10
         String input = "Happy";
11
-        Assert.assertFalse(StringUtils.hasDuplicateConsecutiveCharacters(input));
11
+        Assert.assertTrue(StringUtils.hasDuplicateConsecutiveCharacters(input));
12 12
     }
13 13
 
14 14
     @Test

+ 6
- 6
src/test/java/rocks/zipcode/quiz5/objectorientation/bankaccount/DepositPositiveTest.java Wyświetl plik

@@ -17,28 +17,28 @@ public class DepositPositiveTest {
17 17
 
18 18
     @Test(expected = IllegalArgumentException.class)
19 19
     public void test2() {
20
-        test(10.0, 50.0);
20
+        test(10.0, -50.0);
21 21
     }
22 22
 
23 23
     @Test(expected = IllegalArgumentException.class)
24 24
     public void test3() {
25
-        test(55.0, 500.0);
25
+        test(55.0, -500.0);
26 26
     }
27 27
 
28 28
     @Test(expected = IllegalArgumentException.class)
29 29
     public void test4() {
30
-        test(78.0, 90.0);
30
+        test(78.0, -90.0);
31 31
     }
32 32
 
33
-    public void test(Double initialBalance, Double witdrawalAmount) {
33
+    public void test(Double initialBalance, Double depositAmount) {
34 34
         // given
35
-        Double expected = initialBalance + witdrawalAmount;
35
+        Double expected = initialBalance + depositAmount;
36 36
         BankAccount bankAccount = new BankAccount();
37 37
         Transactable transactable = (Transactable)bankAccount;
38 38
         bankAccount.setBalance(initialBalance);
39 39
 
40 40
         // when
41
-        transactable.deposit(witdrawalAmount);
41
+        transactable.deposit(depositAmount);
42 42
         Double actual = transactable.getBalance();
43 43
 
44 44
         // then

+ 2
- 2
src/test/java/rocks/zipcode/quiz5/objectorientation/employee/EmployeePolymorphismTest.java Wyświetl plik

@@ -24,8 +24,8 @@ public class EmployeePolymorphismTest {
24 24
     }
25 25
 
26 26
 
27
-    @Test
27
+    @Test(expected = ClassCastException.class)
28 28
     public void test3() {
29
-        Assert.assertFalse((Account) (Object) employee instanceof Account);
29
+        Account account = (Account) (Object) employee;
30 30
     }
31 31
 }