Finished and refactored

src/main/java/com/zipcoder/payment/PaymentPresenter.java → src/main/java/com/zipcoder/PaymentPresenter.java

@@ -1,9 +1,10 @@
-package com.zipcoder.payment;
+package com.zipcoder;
 
-import com.zipcoder.paymentSort.ById;
-import com.zipcoder.paymentSort.ByPayer;
-import com.zipcoder.paymentSort.PaymentOrder;
-import com.zipcoder.paymentSort.ByShortDescription;
+import com.zipcoder.payment.Payment;
+import com.zipcoder.payment.Comparators.Id;
+import com.zipcoder.payment.Comparators.Payer;
+import com.zipcoder.payment.Comparators.PaymentOrder;
+import com.zipcoder.payment.Comparators.ShortDescription;
 
 import java.util.Comparator;
 
@@ -22,7 +23,6 @@ public class PaymentPresenter {
 
         for(int i = 0; i < payments.length; i++){
             sb.append(payments[i].getShortDescription());
-            sb.append("\n");
         }
 
         return sb.toString();
@@ -35,13 +35,13 @@ public class PaymentPresenter {
     public void orderBy(Payment[] payments){
         switch(this.order){
             case SHORTDESCRIPTION:
-                this.bubbleSort(payments, new ByShortDescription());
+                this.bubbleSort(payments, new ShortDescription());
                 break;
             case PAYERNAME:
-                this.bubbleSort(payments, new ByPayer());
+                this.bubbleSort(payments, new Payer());
                 break;
             case ID:
-                this.bubbleSort(payments, new ById());
+                this.bubbleSort(payments, new Id());
                 break;
             default:
                 break;

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

@@ -63,6 +63,14 @@ public class Check implements Payment {
     }
 
     public int compareTo(Payment o) {
-        return 0;
+        int result = this.getShortDescription().compareTo(o.getShortDescription());
+        if(result > 0){
+            return 1;
+        } else if(result < 0){
+            return -1;
+        } else {
+            return 0;
+        }
     }
+
 }

src/main/java/com/zipcoder/paymentSort/ById.java → src/main/java/com/zipcoder/payment/Comparators/Id.java

@@ -1,10 +1,10 @@
-package com.zipcoder.paymentSort;
+package com.zipcoder.payment.Comparators;
 
 import com.zipcoder.payment.Payment;
 
 import java.util.Comparator;
 
-public class ById implements Comparator<Payment> {
+public class Id implements Comparator<Payment> {
 
     public int compare(Payment o1, Payment o2) {
         String id1 = Long.toString(o1.getId());

src/main/java/com/zipcoder/paymentSort/ByPayer.java → src/main/java/com/zipcoder/payment/Comparators/Payer.java

@@ -1,10 +1,10 @@
-package com.zipcoder.paymentSort;
+package com.zipcoder.payment.Comparators;
 
 import com.zipcoder.payment.Payment;
 
 import java.util.Comparator;
 
-public class ByPayer implements Comparator<Payment> {
+public class Payer implements Comparator<Payment> {
 
     public int compare(Payment o1, Payment o2) {
         if(o1.getPayerName().compareTo(o2.getPayerName()) > 0){

src/main/java/com/zipcoder/paymentSort/PaymentOrder.java → src/main/java/com/zipcoder/payment/Comparators/PaymentOrder.java

@@ -1,4 +1,4 @@
-package com.zipcoder.paymentSort;
+package com.zipcoder.payment.Comparators;
 
 public enum PaymentOrder {
     ID, PAYERNAME, SHORTDESCRIPTION

src/main/java/com/zipcoder/paymentSort/ByShortDescription.java → src/main/java/com/zipcoder/payment/Comparators/ShortDescription.java

@@ -1,10 +1,10 @@
-package com.zipcoder.paymentSort;
+package com.zipcoder.payment.Comparators;
 
 import com.zipcoder.payment.Payment;
 
 import java.util.Comparator;
 
-public class ByShortDescription implements Comparator<Payment> {
+public class ShortDescription implements Comparator<Payment> {
 
     public int compare(Payment o1, Payment o2) {
         String str1 = o1.getShortDescription();

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

@@ -44,6 +44,16 @@ public class Paypal implements Payment {
     }
 
     public int compareTo(Payment o) {
-        return 0;
+
+        int result = this.getShortDescription().compareTo(o.getShortDescription());
+
+        if(result > 0){
+            return 1;
+        } else if(result < 0){
+            return -1;
+        } else {
+            return 0;
+        }
+
     }
 }

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

@@ -1,16 +1,19 @@
 package com.zipcoder.payment;
 
-import com.zipcoder.paymentSort.ByPayer;
-import org.junit.jupiter.api.Test;
+import com.zipcoder.payment.Comparators.Payer;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.Assert.*;
 
-class PaymentOrderByPayerTest {
+import org.junit.Test;
+
+import java.util.Comparator;
+
+public class PaymentOrderByPayerTest {
 
     @Test
-    void compairTest1() {
+    public void compairTest1() {
         //When
-        ByPayer ps = new ByPayer();
+        Comparator ps = new Payer();
         Payment cc = new CreditCard(12, 4111131,"Jimmy Maidanos", 4, 11);
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
 
@@ -24,9 +27,9 @@ class PaymentOrderByPayerTest {
     }
 
     @Test
-    void compairTest2() {
+    public void compairTest2() {
         //When
-        ByPayer ps = new ByPayer();
+        Comparator ps = new Payer();
         Payment cc = new CreditCard(12, 4111131,"Zimmy Maidanos", 4, 11);
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
 
@@ -40,9 +43,9 @@ class PaymentOrderByPayerTest {
     }
 
     @Test
-    void compairTest3() {
+    public void compairTest3() {
         //When
-        ByPayer ps = new ByPayer();
+        Comparator ps = new Payer();
         Payment cc = new CreditCard(12, 4111131,"Nicholas Maidanos", 4, 11);
         Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
 

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

@@ -1,9 +1,9 @@
 package com.zipcoder.payment;
 
-import com.zipcoder.paymentSort.PaymentOrder;
-import org.junit.Test;
-
+import com.zipcoder.PaymentPresenter;
+import com.zipcoder.payment.Comparators.PaymentOrder;
 import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class PaymentPresenterTest {
 
@@ -37,7 +37,7 @@ public class PaymentPresenterTest {
         payments[1] = cc;
         payments[2] = ck;
         //Expect
-        String expected = "CC Nicholas Maidanos 1131 4/11\nCheck Nicholas Maidanos ****3234\nPayPal Nicholas Maidanos nmaidanos@gmail.com\n";
+        String expected = "CC Nicholas Maidanos 1131 4/11\nCheck Nicholas Maidanos ****3234\nPaypal Nicholas Maidanos nmaidanos@gmail.com\n";
 
         //Actual
         String actual = paymentPresenter.toString(payments);
@@ -60,7 +60,7 @@ public class PaymentPresenterTest {
         payments[1] = cc;
         payments[2] = ck;
         //Expect
-        String expected = "Check Nicholas Maidanos ****3234\nPayPal Nicholas Maidanos nmaidanos@gmail.com\nCC Nicholas Maidanos 1131 4/11\n";
+        String expected = "Check Nicholas Maidanos ****3234\nPaypal Nicholas Maidanos nmaidanos@gmail.com\nCC Nicholas Maidanos 1131 4/11\n";
 
         //Actual
         String actual = paymentPresenter.toString(payments);
@@ -82,7 +82,7 @@ public class PaymentPresenterTest {
         payments[1] = ck;
         payments[2] = pp;
         //Expect
-        String expected = "PayPal Billy Maidanos nmaidanos@gmail.com\nCC Jimmy Maidanos 1131 4/11\nCheck Nicholas Maidanos ****3234\n";
+        String expected = "Paypal Billy Maidanos nmaidanos@gmail.com\nCC Jimmy Maidanos 1131 4/11\nCheck Nicholas Maidanos ****3234\n";
 
         //Actual
         String actual = paymentPresenter.toString(payments);