section2 done

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

@@ -6,40 +6,49 @@ public class Check implements Payment {
     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 Long getId() {
+
         return this.id;
     }
 
-    public void setId(long id){
+    public void setId(long id) {
+
         this.id = id;
     }
 
     public String getPayerName() {
+
         return this.payerName;
     }
 
     public void setPayerName(String payerName) {
+
         this.payerName = payerName;
     }
 
 
-    public String getRoutingNumber(){
+    public String getRoutingNumber() {
         return this.routingNumber;
     }
 
-    public void setRoutingNumber(String routingNumber){
+    public void setRoutingNumber(String routingNumber) {
 
-    this.routingNumber = routingNumber;
+        this.routingNumber = routingNumber;
     }
 
-    public String getAccountNumber(){
-      return this.accountNumber;
+    public String getAccountNumber() {
+        return this.accountNumber;
 
     }
 
-    public void setAccountNumber(String accountNumber){
+    public void setAccountNumber(String accountNumber) {
         this.accountNumber = accountNumber;
 
     }
@@ -47,6 +56,11 @@ public class Check implements Payment {
     public String getShortDescription() {
 
 
-        return "Check" + getPayerName() + " " + "***" + getAccountNumber().substring(accountNumber.length()-4,accountNumber.length()-1);
+        return "Check" + getPayerName() + " " + "***" + getAccountNumber().substring(accountNumber.length() - 4, accountNumber.length() - 1);
+    }
+
+    public int compareTo(Payment o) {
+
+        return 0;
     }
 }

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

@@ -1,3 +1,4 @@
+
 package com.zipcoder.payment;
 
 public class CreditCard implements Payment {
@@ -9,44 +10,69 @@ public class CreditCard implements Payment {
 
 
     public Long getId() {
+
         return this.id;
     }
 
-    public void setId(long id){
+    public void setId(long id) {
         this.id = id;
 
     }
 
     public String getPayerName() {
+
         return this.payerName;
     }
 
-    public void setPayerName(String payerName){
+    public void setPayerName(String payerName) {
+
         this.payerName = payerName;
     }
+
     public String getShortDescription() {
 
 
         return "CC " + getPayerName() + " " + getNumber() + " " + getExpiredMonth() + "/" + getExpiredYear();
     }
-    public String getNumber(){
+
+    public String getNumber() {
+
         return this.number;
     }
-    public void setNumber(String number){
+
+    public void setNumber(String number) {
         this.number = number;
 
     }
-    public int getExpiredMonth(){
+
+    public int getExpiredMonth() {
+
         return this.expiredMonth;
     }
-    public void setExpiredMonth(int expiredMonth){
-     this.expiredMonth = expiredMonth;
+
+    public void setExpiredMonth(int expiredMonth) {
+
+        this.expiredMonth = expiredMonth;
     }
-    public int getExpiredYear(){
-     return this.expiredYear;
+
+    public int getExpiredYear() {
+
+        return this.expiredYear;
     }
 
-    public void setExpiredYear(int expiredYear){
+    public void setExpiredYear(int expiredYear) {
+
         this.expiredYear = expiredYear;
     }
+
+
+    public int compareTo(Payment o) {
+
+        int n = this.getShortDescription().compareTo(o.getShortDescription());
+        return n;
+
+        }
+
+
+
 }

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

@@ -0,0 +1,43 @@
+package com.zipcoder.payment;
+
+public class PayPal implements Payment {
+    private long id;
+    private String payerName;
+    private String email;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getPayerName() {
+        return this.payerName;
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+
+    }
+
+    public String getEmail() {
+        return this.email;
+
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+
+    }
+
+    public String getShortDescription() {
+
+        return "PayPal" + getPayerName() + " " + getEmail();
+    }
+
+    public int compareTo(Payment o) {
+        return 0;
+    }
+}

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

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

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

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

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

@@ -1,28 +1,86 @@
 package com.zipcoder.payment;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 
+
 public class CheckTest {
 
+    Check check;
+    @Before
+    public void start(){
+        check = new Check(12312l, "Jo","33775", "8800");
+
+    }
+
     @Test
     public void testGetId() {
-        Check check = new Check();
         long expected = 12312;
-        check.setId(12312);
         long actual = check.getId();
         Assert.assertEquals(expected,actual);
     }
 
     @Test
     public void testSetId(){
-        Check check = new Check();
         check.setId(12345);
         long expected = 12345;
         long actual = check.getId();
         Assert.assertEquals(expected,actual);}
 
 
+    @Test
+    public void getPayerName() {
+        String expected = "Jo";
+        String actual = check.getPayerName();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void setPayerName() {
+        check.setPayerName("yes");
+        String expected = "yes";
+        String actual = check.getPayerName();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void getRoutingNumber() {
+        String expected = "33775";
+        String actual = check.getRoutingNumber();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void setRoutingNumber() {
+        check.setRoutingNumber("22322");
+        String expected = "22322";
+        String actual = check.getRoutingNumber();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void getAccountNumber() {
+        String expected = "8800";
+        String actual = check.getAccountNumber();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void setAccountNumber() {
+        check.setAccountNumber("2200");
+        String expected = "2200";
+        String actual = check.getAccountNumber();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void getShortDescription() {
+    }
+
+    @Test
+    public void compareTo() {
+    }
 }
 
 

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

@@ -1,8 +1,16 @@
 package com.zipcoder.payment;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 public class CreditCardTest {
 
+    CreditCard cc;
+
+    @Before
+    public void setup(){
+        cc = new CreditCard();
+    }
+
     @Test
     public void testGetId() {
     CreditCard creditCard = new CreditCard();
@@ -24,44 +32,138 @@ public class CreditCardTest {
 
     @Test
     public void testGetPayerName() {
+        CreditCard creditCard = new CreditCard();
+        creditCard.setPayerName("Jo");
+        String expected = "Jo";
+        String actual = creditCard.getPayerName();
+        Assert.assertEquals(expected,actual);
     }
 
-    @Test
-    public void testGetShortDescription() {
-    }
+//    @Test
+//    public void testGetShortDescription() {
+//        CreditCard creditCard = new CreditCard("whoever", "1122", 12, 2019);
+//        PayPal payPal = new PayPal();
+//
+//    }
+
 
 
 
-    @Test
-    public void getPayerName() {
-    }
 
     @Test
-    public void setPayerName() {
+    public void testSetPayerName() {
+        CreditCard creditCard = new CreditCard();
+        String expected = "Jo";
+        creditCard.setPayerName("Jo");
+        String actual = creditCard.getPayerName();
+        Assert.assertEquals(expected,actual);
     }
 
 
     @Test
-    public void getNumber() {
+    public void testGetNumber() {
+        CreditCard creditCard = new CreditCard();
+        String expected = "12345";
+        creditCard.setNumber("12345");
+        String actual = creditCard.getNumber();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void setNumber() {
+    public void testSetNumber() {
+        CreditCard creditCard = new CreditCard();
+        creditCard.setNumber("12345");
+        String expected = "12345";
+        String actual = creditCard.getNumber();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void getExpiredMonth() {
+        CreditCard creditCard = new CreditCard();
+        creditCard.setExpiredMonth(12);
+        int expected = 12;
+        int actual = creditCard.getExpiredMonth();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void setExpiredMonth() {
+        CreditCard creditCard = new CreditCard();
+        int expected = 1;
+        creditCard.setExpiredMonth(1);
+        int actual = creditCard.getExpiredMonth();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void getExpiredYear() {
+        CreditCard creditCard = new CreditCard();
+        int expected = 2008;
+        creditCard.setExpiredYear(2008);
+        int actual = creditCard.getExpiredYear();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void setExpiredYear() {
+        CreditCard creditCard = new CreditCard();
+        creditCard.setExpiredYear(2008);
+        int expected = 2008;
+        int actual = creditCard.getExpiredYear();
+        Assert.assertEquals(expected, actual);
+
+
+
     }
+
+    @Test
+    public void compareToWhenPayment1ComesBeforePayment2() {
+    CreditCard creditCard = new CreditCard();
+    PayPal payPal = new PayPal();
+    creditCard.setId(1234);
+    creditCard.setPayerName("Jo");
+    creditCard.setNumber("334455");
+    creditCard.setExpiredMonth(01);
+    creditCard.setExpiredYear(2012);
+    payPal.setId(1234);
+    payPal.setPayerName("Harris");
+    payPal.setEmail("harris@zipcode.com");
+    Assert.assertTrue(creditCard.compareTo(payPal)<0);
+    }
+
+    @Test
+    public void compareToWhenPayment2ComesBeforePayment1() {
+        CreditCard creditCard = new CreditCard();
+        CreditCard creditCard1 = new CreditCard();
+        creditCard.setId(1234);
+        creditCard.setPayerName("Jo");
+        creditCard.setNumber("334455");
+        creditCard.setExpiredMonth(01);
+        creditCard.setExpiredYear(2012);
+        creditCard1.setId(0001);
+        creditCard1.setPayerName("Harris");
+        creditCard1.setNumber("223344");
+        creditCard1.setExpiredMonth(01);
+        creditCard1.setExpiredYear(2013);
+        Assert.assertTrue(creditCard.compareTo(creditCard1)>0);
+    }
+    @Test
+    public void compareToWhenEquals(){
+        CreditCard creditCard = new CreditCard();
+        CreditCard creditCard1 = new CreditCard();
+        creditCard.setId(1234);
+        creditCard.setPayerName("Jo");
+        creditCard.setNumber("334455");
+        creditCard.setExpiredMonth(01);
+        creditCard.setExpiredYear(2012);
+        creditCard1.setId(1234);
+        creditCard1.setPayerName("Jo");
+        creditCard1.setNumber("334455");
+        creditCard1.setExpiredMonth(01);
+        creditCard1.setExpiredYear(2012);
+        Assert.assertTrue(creditCard.compareTo(creditCard1)==0);
+    }
+
+
 }

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

@@ -0,0 +1,69 @@
+package com.zipcoder.payment;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PayPalTest {
+
+    @Test
+    public void testGetId() {
+        PayPal payPal = new PayPal();
+        long expected = 12312;
+        payPal.setId(12312);
+        long actual = payPal.getId();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void testSetId() {
+        PayPal payPal = new PayPal();
+        payPal.setId(12345);
+        long expected = 12345;
+        long actual = payPal.getId();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getPayerName() {
+        PayPal payPal = new PayPal();
+        String expected = "World";
+        payPal.setPayerName("World");
+        String actual = payPal.getPayerName();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void setPayerName() {
+        PayPal payPal = new PayPal();
+        payPal.setPayerName("World");
+        String expected = "World";
+        String actual = payPal.getPayerName();
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void getEmail() {
+        PayPal payPal = new PayPal();
+        payPal.setEmail("whatever@gmail.com");
+        String expected = "whatever@gmail.com";
+        String actual = payPal.getEmail();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void setEmail() {
+        PayPal payPal = new PayPal();
+        String expected = "whatever@gmail.com";
+        payPal.setEmail("whatever@gmail.com");
+        String actual = payPal.getEmail();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getShortDescription() {
+    }
+
+    @Test
+    public void compareTo() {
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PaymentSortByPayerTest {
+
+    @Test
+    public void compareWhenPaymentEquals() {
+        CreditCard creditCard = new CreditCard();
+        CreditCard creditCard1 = new CreditCard();
+        creditCard.setPayerName("Jo");
+        creditCard1.setPayerName("Jo");
+        PaymentSortByPayer c = new PaymentSortByPayer();
+        Assert.assertTrue(c.compare(creditCard,creditCard1)==0);
+
+    }
+
+    @Test
+    public void compareWhenPayment1ComesBeforePayment2(){
+
+        CreditCard creditCard = new CreditCard();
+        CreditCard creditCard1 = new CreditCard();
+        creditCard.setPayerName("Bo");
+        creditCard1.setPayerName("Jo");
+        PaymentSortByPayer c = new PaymentSortByPayer();
+        Assert.assertTrue(c.compare(creditCard,creditCard1)<0);
+    }
+    @Test
+    public void compareWhenPayment1ComesAfterPayment2() {
+        CreditCard creditCard = new CreditCard();
+        CreditCard creditCard1 = new CreditCard();
+        creditCard.setPayerName("Jo");
+        creditCard1.setPayerName("Bo");
+        PaymentSortByPayer c = new PaymentSortByPayer();
+        Assert.assertTrue(c.compare(creditCard, creditCard1) > 0);
+    }
+}