Start part 3

src/main/java/com/zipcoder/payment/Check.java

@@ -1,14 +1,21 @@
 package com.zipcoder.payment;
 
 public class Check implements Payment {
-    private long id;
+    private Long id;
 
     private String payerName;
     private String routingNumber;
     private String accountNumber;
 
+    public Check(Long id, String payerName, String routingNumber, String accountNumber) {
+        this.id = id;
+        this.payerName = payerName;
+        this.routingNumber = routingNumber;
+        this.accountNumber = accountNumber;
+    }
+
     public Check() {
-        id = 0;
+        id = 0L;
         payerName = null;
         routingNumber = null;
         accountNumber = null;
@@ -16,7 +23,12 @@ public class Check implements Payment {
     }
 
     @Override
-    public long getId() {
+    public int compareTo(Payment o) {
+        return getShortDescription().compareTo(o.getShortDescription());
+    }
+
+    @Override
+    public Long getId() {
         return this.id;
     }
 
@@ -25,7 +37,7 @@ public class Check implements Payment {
     }
 
     public String getRoutingNumber() {
-        return routingNumber;
+        return this.routingNumber;
     }
 
     public void setRoutingNumber(String routingNumber) {
@@ -33,7 +45,7 @@ public class Check implements Payment {
     }
 
     public String getAccountNumber() {
-        return accountNumber;
+        return this.accountNumber;
     }
 
     public void setAccountNumber(String accountNumber) {
@@ -47,10 +59,11 @@ public class Check implements Payment {
 
     @Override
     public String getShortDescription() {
-        return null;
+
+        return "Check " + this.getPayerName() + " ****" + this.getAccountNumber().substring(this.getAccountNumber().length() - 4);
     }
 
-    public void setId(long l) {
+    public void setId(Long l) {
         this.id = l;
     }
 }

src/main/java/com/zipcoder/payment/CreditCard.java

@@ -1,7 +1,7 @@
 package com.zipcoder.payment;
 
 public class CreditCard implements Payment {
-    private long id;
+    private Long id;
 
     private String payerName;
     private String number;
@@ -9,8 +9,16 @@ public class CreditCard implements Payment {
     private int expiredMonth;
     private int expiredyear;
 
+    public CreditCard(Long id, String payerName, String number, int expiredMonth, int expiredyear) {
+        this.id = id;
+        this.payerName = payerName;
+        this.number = number;
+        this.expiredMonth = expiredMonth;
+        this.expiredyear = expiredyear;
+    }
+
     public CreditCard() {
-        id = 0;
+        id = 0L;
         this.number = null;
         this.payerName = null;
         expiredMonth = 0;
@@ -18,6 +26,7 @@ public class CreditCard implements Payment {
     }
 
 
+
     public void setPayerName(String payerName) {
         this.payerName = payerName;
     }
@@ -46,11 +55,11 @@ public class CreditCard implements Payment {
         this.expiredyear = expiredyear;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -65,6 +74,11 @@ public class CreditCard implements Payment {
         int numLength = getNumber().length();
         String last4 = getNumber().substring(numLength - 4);
 
-        return "CC [" + this.getPayerName() + "] [" + last4 + "] [" + getExpiredMonth() + "]/[" + getExpiredyear() + "]";
+        return "CC " + this.getPayerName() + " " + last4 + " " + getExpiredMonth() + "/" + getExpiredyear();
+    }
+
+    @Override
+    public int compareTo(Payment o) {
+        return this.getShortDescription().compareTo(o.getShortDescription());
     }
 }

src/main/java/com/zipcoder/payment/PayPal.java

@@ -0,0 +1,58 @@
+package com.zipcoder.payment;
+
+public class PayPal implements Payment {
+    private Long id;
+
+    String payerName;
+    String email;
+
+    public PayPal(Long id, String name, String email) {
+        this.id = id;
+        this.payerName = name;
+        this.email = email;
+    }
+
+    public PayPal() {
+        this.id = 0L;
+        this.payerName = "Default";
+        this.email = "Defailt@gmail.com";
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+    }
+
+    public String getEmail() {
+        return this.email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    @Override
+    public Long getId() {
+        return this.id;
+    }
+
+    @Override
+    public String getPayerName() {
+        return this.payerName;
+    }
+
+    @Override
+    public String getShortDescription() {
+
+        //Paypal Tia Mowry tia@mowry.com
+        return "PayPal " + getPayerName() + " " + getEmail();
+    }
+
+    public void setId(Long l) {
+        this.id = l;
+    }
+
+    @Override
+    public int compareTo(Payment o) {
+        return this.getShortDescription().compareTo(o.getShortDescription());
+    }
+}

src/main/java/com/zipcoder/payment/Payment.java

@@ -1,8 +1,8 @@
 package com.zipcoder.payment;
 
-public interface Payment {
+public interface Payment extends Comparable<Payment> {
 
-    long getId();
+    Long getId();
     String getPayerName();
     String getShortDescription();
     

src/main/java/com/zipcoder/payment/PaymentSortByPayer.java

@@ -0,0 +1,12 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByPayer implements Comparator<Payment> {
+
+    @Override
+    public int compare(Payment o1, Payment o2) {
+        return o1.compareTo(o2);
+    }
+
+}

src/test/java/com/zipcoder/payment/CheckTest.java

@@ -6,21 +6,57 @@ import org.junit.Test;
 
 public class CheckTest {
     private Check testCheck;
+    private CreditCard cc;
 
     @Before
     public void setUp() {
         testCheck = new Check();
+
         testCheck.setId(12345678910L);
         testCheck.setPayerName("Biggie");
         testCheck.setRoutingNumber("623852453");
         testCheck.setAccountNumber("1234567");
+
+        cc = new CreditCard();
+        cc.setPayerName("Apple");
+        cc.setNumber("4567 8910 9090 9000");
     }
 
     @Test
     public void testId() {
-        long expectedId = 12345678910L;
+        Long expectedId = 12345678910L;
         testCheck.setId(12345678910L);
         Assert.assertEquals(expectedId, testCheck.getId());
     }
 
+    @Test
+    public void testPayerName() {
+        String expectedName = "Biggie";
+        Assert.assertEquals(expectedName, testCheck.getPayerName());
+
+    }
+
+    @Test
+    public void testAccountingNum() {
+        String expectedActNum = "1234567";
+        Assert.assertEquals(expectedActNum, testCheck.getAccountNumber());
+    }
+
+    @Test
+    public void testRoutingNum() {
+        String expectedRout = "623852453";
+        Assert.assertEquals(expectedRout, testCheck.getRoutingNumber());
+    }
+
+    @Test
+    public void testShortDesc() {
+        String expectedDesc = "Check Biggie ****4567";
+        Assert.assertEquals(expectedDesc, testCheck.getShortDescription());
+    }
+
+    @Test
+    public void testCompareTo() {
+        int expectedComp = 37;
+        Assert.assertEquals(expectedComp, testCheck.compareTo(cc));
+    }
 }

src/test/java/com/zipcoder/payment/CreditcardTest.java

@@ -6,6 +6,7 @@ import org.junit.Test;
 
 public class CreditcardTest {
     CreditCard cc;
+    Check testCheck;
 
     @Before
     public void setUp() {
@@ -15,11 +16,18 @@ public class CreditcardTest {
         cc.setExpiredMonth(12);
         cc.setExpiredyear(2020);
         cc.setNumber("4539 1889 1071 9389");
+
+        testCheck = new Check();
+
+        testCheck.setId(12345678910L);
+        testCheck.setPayerName("Biggie");
+        testCheck.setRoutingNumber("623852453");
+        testCheck.setAccountNumber("1234567");
     }
 
     @Test
     public void testLongId() {
-        long expectedId =  1234567894321L;
+        Long expectedId =  1234567894321L;
         cc.setId(1234567894321L);
         Assert.assertEquals(expectedId, cc.getId());
     }
@@ -50,9 +58,13 @@ public class CreditcardTest {
 
     @Test
     public void testShortDesc() {
-        String expectedCC = "CC [Jared] [9389] [12]/[2020]";
+        String expectedCC = "CC Jared 9389 12/2020";
         Assert.assertEquals(expectedCC, cc.getShortDescription());
     }
 
-
+    @Test
+    public void testCompare() {
+        int exp = -37;
+        Assert.assertEquals(exp, cc.compareTo(testCheck));
+    }
 }

src/test/java/com/zipcoder/payment/PayPalTest.java

@@ -0,0 +1,54 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PayPalTest {
+    PayPal pp;
+    CreditCard cc;
+    @Before
+    public void setUp() {
+        pp = new PayPal();
+        pp.setId(98765432100L);
+        pp.setPayerName("TeeTay Tong");
+        pp.setEmail("TeeTay@gmail.com");
+
+        cc = new CreditCard();
+
+        cc.setPayerName("Jared");
+        cc.setExpiredMonth(12);
+        cc.setExpiredyear(2020);
+        cc.setNumber("4539 1889 1071 9389");
+    }
+
+    @Test
+    public void testId() {
+        Long expectedID = 98765432100L;
+        Assert.assertEquals(expectedID, pp.getId());
+    }
+
+    @Test
+    public void testPayerName() {
+        String expectedName = "TeeTay Tong";
+        Assert.assertEquals(expectedName, pp.getPayerName());
+    }
+
+    @Test
+    public void testEmail() {
+        String expectedEmail = "TeeTay@gmail.com";
+        Assert.assertEquals(expectedEmail, pp.getEmail());
+    }
+
+    @Test
+    public void testDesc() {
+        String expDesc = "PayPal TeeTay Tong TeeTay@gmail.com";
+        Assert.assertEquals(expDesc, pp.getShortDescription());
+    }
+
+    @Test
+    public void testCompare() {
+        int exp = 13;
+        Assert.assertEquals(exp, pp.compareTo(cc));
+    }
+}

src/test/java/com/zipcoder/payment/PaymentSortByPayerTest.java

@@ -0,0 +1,26 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class PaymentSortByPayerTest {
+    PaymentSortByPayer ppSort;
+    PayPal pp;
+    Check ch;
+
+    @Before
+    public void setUp() {
+        ppSort = new PaymentSortByPayer();
+        pp = new PayPal(678694850L, "Tullo Tilly", "tSquared@gmail.com");
+        ch = new Check(123149324L, "Biggie Yougin", "011103093", "123456789");
+    }
+
+    @Test
+    public void testCompare() {
+        int expected = 13;
+        Assert.assertEquals(expected, ppSort.compare(pp, ch));
+    }
+}