KS

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

@@ -25,20 +25,6 @@ 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;
     }
@@ -57,4 +43,13 @@ public class Check implements Payment {
 
     public void setRoutingNumber(String routingNumber) { this.routingNumber = routingNumber; }
 
+    public int compareTo(Payment o) {
+        if (this.getShortDescription().compareTo(o.getShortDescription()) < 0) return -1;
+
+        else if (this.getShortDescription().compareTo(o.getShortDescription()) > 0) return 1;
+
+        else return 0;
+
+    }
+
 }

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

@@ -34,34 +34,18 @@ public class CreditCard implements Payment {
     this.payerName = payerName;
     }
 
-    public String getShortDescription() {
-        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 String getShortDescription() { return "CC " + payerName + " " + payerNumber + " " + expiredMonth + "/" + expiredYear; }
 
     public int getExpiredMonth() {
         return expiredMonth;
     }
 
     public void setExpiredMonth(int expiredMonth) {
-    this.expiredMonth = expiredMonth;
+        this.expiredMonth = expiredMonth;
     }
 
     public void setExpiredYear(int expiredYear) {
-    this.expiredYear = expiredYear;
+        this.expiredYear = expiredYear;
     }
 
     public int getExpiredYear() {
@@ -69,8 +53,15 @@ public class CreditCard implements Payment {
     }
 
     public void setNumber(String number) {
-        this.number = this.number;
+        this.number = number;
     }
 
+    public int compareTo(Payment o) {
+        if (this.getShortDescription().compareTo(o.getShortDescription()) < 0) return -1;
+
+        else if (this.getShortDescription().compareTo(o.getShortDescription()) > 0) return 1;
 
+        else return 0;
+
+    }
 }

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

@@ -31,17 +31,17 @@ public class Paypal implements Payment {
         this.payerName = payerName;
     }
 
+    public void setEmail(String email) { this.email = email; }
+
+    public String getEmail() { return email; }
+
     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();
-        }
+
+        if (this.getShortDescription().compareTo(o.getShortDescription()) < 0) return -1;
+
+        else if (this.getShortDescription().compareTo(o.getShortDescription()) > 0) return 1;
+
+        else return 0;
+
     }
 }

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

@@ -1,11 +1,21 @@
 package com.zipcoder.payment;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 public class CheckTest {
-
+    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
@@ -74,4 +84,25 @@ public class CheckTest {
         String actual = check.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(ch);
+        assertEquals(expected,actual);
+    }
+    @Test
+    public void compareTo3(){
+
+        int expected = -1;
+        int actual = cc.compareTo(pay);
+        assertEquals(expected,actual);
+    }
 }

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

@@ -87,14 +87,14 @@ public class CreditCardTest {
     public void compareTo2(){
 
         int expected = -1;
-        int actual = cc.compareTo(pay);
+        int actual = cc.compareTo(ch);
         assertEquals(expected,actual);
     }
     @Test
     public void compareTo3(){
 
         int expected = -1;
-        int actual = cc.compareTo(ch);
+        int actual = cc.compareTo(pay);
         assertEquals(expected,actual);
     }
 }

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

@@ -5,14 +5,11 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class PaypalTest {
-    CreditCard cc = new CreditCard();
-    Paypal pay = new Paypal();
-    Check ch = new Check();
+    private CreditCard cc = new CreditCard();
+    private Paypal pay = new Paypal();
+    private Check ch = new Check();
     @Test
     public void getID() {
-        Paypal pay = new Paypal();
-        //long ID we are testing
-
         //Given
         long ID = 1234567891;
         //When
@@ -24,7 +21,6 @@ public class PaypalTest {
 
     @Test
     public void getPayerName() {
-        Paypal pay = new Paypal();
         //Given
         String PayerName = "Tia Mowry";
         //When
@@ -33,16 +29,25 @@ public class PaypalTest {
         String actualID = pay.getPayerName();
         assertEquals(PayerName,actualID);
     }
+    @Test
+    public void testEmail(){
+        String email = "tia@mowry.com";
+
+        pay.setEmail(email);
+
+        String actualEmail = pay.getEmail();
+        assertEquals(email,actualEmail);
+    }
 
     @Test
     public void getShortDescription() {
-        Paypal pay = new Paypal();
+
         String payerName = "Khalil Saboor ";
-        String accountNumber = "***4551";
+        String email = "khalil@gmail.com";
 
+        pay.setEmail(email);
         pay.setPayerName(payerName);
 
-        String email = "khalil@gmail.com";
         String expected = "Paypal " + payerName + " " + email;
         System.out.println(pay.getShortDescription());
         String actual = pay.getShortDescription();
@@ -66,7 +71,7 @@ public class PaypalTest {
     public void compareTo3(){
 
         int expected = -1;
-        int actual = ch.compareTo(cc);
+        int actual = pay.compareTo(ch);
         assertEquals(expected,actual);
     }
 }