KS

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

@@ -7,7 +7,7 @@ public class Check implements Payment {
     private String accountNumber;
 
     Check(){
-        ID = 123;
+        ID = 1234567891;
         payerName =  "Tia Mowry";
         routingNumber = "34343456";
         accountNumber = "***4551";
@@ -25,6 +25,20 @@ public class Check implements Payment {
         return "Check " + payerName + " " + accountNumber;
     }
 
+    public int compareTo(Payment o) {
+        String origin = this.getShortDescription();
+        String compared = o.getShortDescription();
+        if (origin.length() == compared.length()) {
+            int difference = 0;
+            for (int i = 0; i < origin.length(); i++) {
+                difference += origin.charAt(i) - compared.charAt(i);
+            }
+            return difference;
+        } else {
+            return origin.length() - compared.length();
+        }
+    }
+
     public String getRoutingNumber() {
         return routingNumber;
     }

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

@@ -3,11 +3,13 @@ package com.zipcoder.payment;
 public class CreditCard implements Payment {
     //Define
     private String payerNumber;
+    private String payerName;
     private String number;
-    private long ID;
     private int expiredMonth;
     private int expiredYear;
-    private String payerName;
+    private long ID;
+
+
 
     public CreditCard(){
         ID = 1234567891;
@@ -36,6 +38,20 @@ public class CreditCard implements Payment {
         return "CC " + payerName + " " + payerNumber + " " + expiredMonth + "/" + expiredYear;
     }
 
+    public int compareTo(Payment o) {
+        String origin = this.getShortDescription();
+        String compared = o.getShortDescription();
+        if (origin.length() == compared.length()) {
+            int difference = 0;
+            for (int i = 0; i < origin.length(); i++) {
+                difference += origin.charAt(i) - compared.charAt(i);
+            }
+            return difference;
+        } else {
+            return origin.length() - compared.length();
+        }
+    }
+
     public int getExpiredMonth() {
         return expiredMonth;
     }
@@ -55,4 +71,6 @@ public class CreditCard implements Payment {
     public void setNumber(String number) {
         this.number = this.number;
     }
+
+
 }

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

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

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

@@ -0,0 +1,6 @@
+package com.zipcoder.payment;
+import java.util.Comparator;
+
+public class PaymentsSortByPayer {
+
+}

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

@@ -6,9 +6,9 @@ public class Paypal implements Payment {
     private String email;
 
     Paypal (){
-        ID = 212131;
-        email = "khalil@gmail.com";
-        payerName = "Khalil";
+        ID = 1234567891;
+        email = "tia@mowry.com";
+        payerName = "Tia Mowry";
     }
 
     public Long getID() {
@@ -20,10 +20,28 @@ public class Paypal implements Payment {
     }
 
     public String getShortDescription() {
-        return "Paypal" + payerName +" "+ email;
+        return "Paypal " + payerName +" "+ email;
     }
 
     public void setID(long ID) {
         this.ID = ID;
     }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+    }
+
+    public int compareTo(Payment o) {
+        String origin = this.getShortDescription();
+        String compared = o.getShortDescription();
+        if (origin.length() == compared.length()) {
+            int difference = 0;
+            for (int i = 0; i < origin.length(); i++) {
+                difference += origin.charAt(i) - compared.charAt(i);
+            }
+            return difference;
+        } else {
+            return origin.length() - compared.length();
+        }
+    }
 }

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

@@ -1,17 +1,24 @@
 package com.zipcoder.payment;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 public class CreditCardTest {
+    private CreditCard cc;
+    private Paypal pay;
+    private Check ch;
+
+    @Before
+    public void setUp() throws Exception {
+        ch = new Check();
+        pay = new Paypal();
+        cc = new CreditCard();
+    }
 
     @Test
     public void getID() {
-        //creditCard object
-        CreditCard cc = new CreditCard();
-        //long ID we are testing
-
         //Given
         long ExpectedID = 1234567891;
         //When
@@ -23,10 +30,6 @@ public class CreditCardTest {
 
     @Test
     public void getPayerName() {
-        //creditCard object
-        CreditCard cc = new CreditCard();
-
-
         //Given
         String ExpectedPayerName = "Tia Mowry";
         //When
@@ -39,10 +42,6 @@ public class CreditCardTest {
     @Test
     public void getExpiredMonth(){
         int expiredMonth = 10;
-        //creditCard object
-        CreditCard cc = new CreditCard();
-
-
         //Given
         int expectedExpiredMonth = expiredMonth;
         //When
@@ -53,10 +52,6 @@ public class CreditCardTest {
     }
     @Test
     public void getExpiredYear(){
-        //creditCard object
-        CreditCard cc = new CreditCard();
-
-
         //Given
         int ExpectedExpireYear = 2019;
         //When
@@ -67,19 +62,39 @@ public class CreditCardTest {
     }
     @Test
     public void getShortDescription() {
-        CreditCard cc = new CreditCard();
-
         String payerName = "Khalil Saboor ";
         int expiredMonth = 12;
         int expiredYear = 2020;
-        String payerNumber = " 4551 ";
+        String payerNumber = "4551 ";
         cc.setPayerName(payerName);
         cc.setExpiredMonth(expiredMonth);
         cc.setExpiredYear(expiredYear);
         cc.setNumber(payerNumber);
 
-        String expected = "CC " + payerName + " " + payerNumber + "  " + expiredMonth + "/" + expiredYear;
+        String expected = "CC " + payerName + " " + payerNumber + " " + expiredMonth + "/" + expiredYear;
         System.out.println(cc.getShortDescription());
         String actual = cc.getShortDescription();
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo1(){
+
+        int expected = 0;
+        int actual = cc.compareTo(cc);
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo2(){
+
+        int expected = -1;
+        int actual = cc.compareTo(pay);
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo3(){
+
+        int expected = -1;
+        int actual = cc.compareTo(ch);
+        assertEquals(expected,actual);
     }
 }

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

@@ -5,7 +5,9 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class PaypalTest {
-
+    CreditCard cc = new CreditCard();
+    Paypal pay = new Paypal();
+    Check ch = new Check();
     @Test
     public void getID() {
         Paypal pay = new Paypal();
@@ -22,9 +24,49 @@ public class PaypalTest {
 
     @Test
     public void getPayerName() {
+        Paypal pay = new Paypal();
+        //Given
+        String PayerName = "Tia Mowry";
+        //When
+        pay.setPayerName(PayerName);
+        //Then
+        String actualID = pay.getPayerName();
+        assertEquals(PayerName,actualID);
     }
 
     @Test
     public void getShortDescription() {
+        Paypal pay = new Paypal();
+        String payerName = "Khalil Saboor ";
+        String accountNumber = "***4551";
+
+        pay.setPayerName(payerName);
+
+        String email = "khalil@gmail.com";
+        String expected = "Paypal " + payerName + " " + email;
+        System.out.println(pay.getShortDescription());
+        String actual = pay.getShortDescription();
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo1(){
+
+        int expected = 0;
+        int actual = pay.compareTo(pay);
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo2(){
+
+        int expected = -1;
+        int actual = pay.compareTo(cc);
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo3(){
+
+        int expected = -1;
+        int actual = ch.compareTo(cc);
+        assertEquals(expected,actual);
     }
 }