Nicholas Maidanos 8 лет назад
Родитель
Сommit
9c21048a24

+ 1
- 6
src/main/java/com/zipcoder/payment/Check.java Просмотреть файл

@@ -25,12 +25,7 @@ public class Check implements Payment {
25 25
     }
26 26
 
27 27
     public String getShortDescription() {
28
-        StringBuilder sb = new StringBuilder();
29
-        sb.append("Check ");
30
-        sb.append(this.payerName + " ");
31
-        sb.append("****");
32
-        sb.append(lastFourDigits());
33
-        return sb.toString();
28
+        return String.format("Check %s ****%d", this.getPayerName(), lastFourDigits());
34 29
     }
35 30
 
36 31
     public int lastFourDigits(){

+ 1
- 8
src/main/java/com/zipcoder/payment/CreditCard.java Просмотреть файл

@@ -61,14 +61,7 @@ public class CreditCard implements Payment {
61 61
     }
62 62
 
63 63
     public String getShortDescription() {
64
-        StringBuilder sb = new StringBuilder();
65
-
66
-        sb.append("CC ");
67
-        sb.append(this.payerName + " ");
68
-        sb.append(lastFourDigits() + " ");
69
-        sb.append(this.expiredMonth + "/" + this.expiredYear);
70
-
71
-        return sb.toString();
64
+        return String.format("CC %s %d %d/%d", this.payerName, this.lastFourDigits(), this.expiredMonth, this.expiredYear);
72 65
     }
73 66
 
74 67
     public int lastFourDigits(){

+ 1
- 5
src/main/java/com/zipcoder/payment/Paypal.java Просмотреть файл

@@ -40,11 +40,7 @@ public class Paypal implements Payment {
40 40
 
41 41
 
42 42
     public String getShortDescription() {
43
-        StringBuilder sb = new StringBuilder();
44
-        sb.append("PayPal ");
45
-        sb.append(this.payerName + " ");
46
-        sb.append(this.email);
47
-        return sb.toString();
43
+        return String.format("Paypal %s %s", this.payerName, this.email);
48 44
     }
49 45
 
50 46
     public int compareTo(Payment o) {

+ 14
- 17
src/test/java/com/zipcoder/payment/CheckTest.java Просмотреть файл

@@ -1,15 +1,12 @@
1 1
 package com.zipcoder.payment;
2 2
 
3
-import org.junit.jupiter.api.Test;
3
+import static org.junit.Assert.*;
4
+import org.junit.Test;
4 5
 
5
-import static org.junit.Assert.assertEquals;
6
-import static org.junit.Assert.assertThat;
7
-import static org.junit.jupiter.api.Assertions.*;
8
-
9
-class CheckTest {
6
+public class CheckTest {
10 7
 
11 8
     @Test
12
-    void getId() {
9
+    public void getId() {
13 10
         //When
14 11
         Check ck = new Check();
15 12
         ck.setId(4456);
@@ -24,7 +21,7 @@ class CheckTest {
24 21
     }
25 22
 
26 23
     @Test
27
-    void getPayerName() {
24
+    public void getPayerName() {
28 25
         //When
29 26
         Check ck = new Check();
30 27
         ck.setPayerName("Nicholas");
@@ -38,12 +35,12 @@ class CheckTest {
38 35
     }
39 36
 
40 37
     @Test
41
-    void getShortDescription() {
38
+    public void getShortDescription() {
42 39
     }
43 40
 
44 41
 
45 42
     @Test
46
-    void getRoutingNumber() {
43
+    public void getRoutingNumber() {
47 44
         //When
48 45
         Check ck = new Check();
49 46
         ck.setRoutingNumber("4532353");
@@ -58,7 +55,7 @@ class CheckTest {
58 55
     }
59 56
 
60 57
     @Test
61
-    void setRoutingNumber() {
58
+    public void setRoutingNumber() {
62 59
         //When
63 60
         Check ck = new Check();
64 61
         ck.setRoutingNumber("4532353");
@@ -72,7 +69,7 @@ class CheckTest {
72 69
     }
73 70
 
74 71
     @Test
75
-    void setAccountNumber() {
72
+    public void setAccountNumber() {
76 73
         //When
77 74
         Check ck = new Check();
78 75
         ck.setAccountNumber("4532353");
@@ -86,7 +83,7 @@ class CheckTest {
86 83
     }
87 84
 
88 85
     @Test
89
-    void setPayerName() {
86
+    public void setPayerName() {
90 87
         //When
91 88
         Check ck = new Check();
92 89
         ck.setPayerName("Nick M");
@@ -100,7 +97,7 @@ class CheckTest {
100 97
     }
101 98
 
102 99
     @Test
103
-    void setId() {
100
+    public void setId() {
104 101
         //When
105 102
         Check ck = new Check();
106 103
         ck.setId(3423);
@@ -115,7 +112,7 @@ class CheckTest {
115 112
     }
116 113
 
117 114
     @Test
118
-    void getAccountNumber() {
115
+    public void getAccountNumber() {
119 116
         //When
120 117
         Check ck = new Check();
121 118
         ck.setAccountNumber("893456");
@@ -130,7 +127,7 @@ class CheckTest {
130 127
     }
131 128
 
132 129
     @Test
133
-    void getShortDescription1() {
130
+    public void getShortDescription1() {
134 131
         //When
135 132
         Check ck = new Check(4563, "Nicholas Maidanos", "45335665", "444545");
136 133
 
@@ -143,6 +140,6 @@ class CheckTest {
143 140
     }
144 141
 
145 142
     @Test
146
-    void compareTo() {
143
+    public void compareTo() {
147 144
     }
148 145
 }

+ 5
- 6
src/test/java/com/zipcoder/payment/PaypalTest.java Просмотреть файл

@@ -1,11 +1,10 @@
1 1
 package com.zipcoder.payment;
2 2
 
3
-import org.junit.jupiter.api.Test;
4 3
 
4
+import static org.junit.Assert.*;
5
+import org.junit.Test;
5 6
 
6
-import static org.junit.Assert.assertEquals;
7
-
8
-class PaypalTest {
7
+public class PaypalTest {
9 8
 
10 9
     @Test
11 10
     void setId() {
@@ -94,10 +93,10 @@ class PaypalTest {
94 93
     @Test
95 94
     void getShortDescription() {
96 95
         //When
97
-        Paypal pp = new Paypal(78, "Nicholas Madianos", "nmaidanos@gmail.com");
96
+        Paypal pp = new Paypal(78, "Nicholas Maidanos", "nmaidanos@gmail.com");
98 97
 
99 98
         //Expect
100
-        String expect = "PayPal Nicholas Madianos nmaidanos@gmail.com";
99
+        String expect = "PayPal Nicholas Maidanos nmaidanos@gmail.com";
101 100
 
102 101
         //Actual
103 102
         String actual = pp.getShortDescription();