thulasi 7 år sedan
förälder
incheckning
62105c6e6b

+ 1
- 1
src/main/java/com/zipcoder/payment/PayPal.java Visa fil

@@ -33,7 +33,7 @@ public class PayPal implements Payment{
33 33
 
34 34
     @Override
35 35
     public String getShortDescription() {
36
-        return String.format("PayPay %s %s", this.payerName,this.email);
36
+        return String.format("Paypal %s %s", this.payerName,this.email);
37 37
     }
38 38
 
39 39
     public void setId(long id) {

+ 1
- 1
src/main/java/com/zipcoder/payment/PaymentPresenter.java Visa fil

@@ -21,7 +21,7 @@ public class PaymentPresenter {
21 21
     }
22 22
 
23 23
     public String toString(Payment[] payments) {
24
-       // Arrays.sort(payments);
24
+        Arrays.sort(payments);
25 25
         return stringGenerator(payments);
26 26
     }
27 27
 

+ 7
- 1
src/main/java/com/zipcoder/payment/PaymentSortByPayer.java Visa fil

@@ -6,6 +6,12 @@ public class PaymentSortByPayer implements Comparator<Payment> {
6 6
 
7 7
     @Override
8 8
     public int compare(Payment payment1, Payment payment2) {
9
-        return payment1.getShortDescription().compareTo(payment2.getShortDescription());
9
+        int num =payment1.getPayerName().compareTo(payment2.getPayerName());
10
+        if(num < 0)
11
+            return -1;
12
+        else if(num > 0)
13
+            return 1;
14
+        else
15
+            return 0;
10 16
     }
11 17
 }

+ 1
- 1
src/test/java/com/zipcoder/payment/PaymentPresenterTest.java Visa fil

@@ -52,7 +52,7 @@ public class PaymentPresenterTest {
52 52
     @Test
53 53
     public void testToStringById(){
54 54
         Payment[] payments = new Payment[2];
55
-        Payment paypal = new PayPal(4L, "Tamara Mowry", "tamara@mowry.com");
55
+        Payment paypal = new PayPal(140L, "Tamara Mowry", "tamara@mowry.com");
56 56
         Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551");
57 57
 
58 58
         payments[0] = paypal;