Commit

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

@@ -8,6 +8,16 @@ public class Check implements Payment {
     private String accountNumber;
 
 
+    public Check(){
+
+    }
+
+
+    public Check(long id, String payerName, String routingNumber, String accountNumber){
+
+    }
+
+
     public void setId(int id) {
         this.id = id;
     }

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

@@ -3,4 +3,37 @@ package com.zipcoder.payment;
 public class PaymentPresenter {
 
 
+    public String toString(Payment[] payments) {
+        Payment q = null;
+
+        for(Payment x : payments){
+            if(x != null){
+                q = x;
+            }
+        }
+        if(q == null){
+            return "";
+        }
+
+
+//        if(payments.length == 0){
+//            return "";
+//        }
+
+        String x = toString(payments);
+        System.out.println(x);
+        return x;
+    }
+
+
+    public String toStringByPayerName(Payment[] payments) {
+
+        return null;
+    }
+
+    public String toStringById(Payment[] payments) {
+
+        return null;
+
+    }
 }

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

@@ -1,16 +1,13 @@
 package com.zipcoder.payment;
+import java.util.Comparator;
+public class PaymentSortByPayer implements Comparator<Payment> {
 
-public class PaymentSortByPayer implements java.util.Comparator {
-
-//    public int comparee(Payment payment1, Payment payment2) {
-//        return payment1.compareTo(payment2);
-//    }
 
     @Override
-    public int compare(Object o1, Object o2) {
-
-        int x = compare(o1, o2);
-
+    public int compare(Payment o1, Payment o2) {
+        int x = o1.getPayerName().compareTo(o2.getPayerName());
         return x;
     }
+
 }
+

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

@@ -1,4 +1,75 @@
 package com.zipcoder.payment;
 
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
 public class PaymentPresenterTest {
+
+    @Test
+    public void test_toString_with_no_payment(){
+
+        Payment[] payments = new Payment[0];
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "";
+
+        String actual = presenter.toString(payments);
+
+        assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void test_toString_with_multiple_payments(){
+
+        Payment[] payments = new Payment[2];
+        Payment payPal = new PayPal(4, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81, "Tia Mowry", "11432543", "9936275");
+
+        payments[0] = payPal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Check Tia Mowry ***4551\nPaypal Tia Mowry tia@mowry.com\n";
+
+        String actual = presenter.toString(payments);
+        assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void test_toStringByPayerName_with_multiple_payments(){
+
+        Payment[] payments = new Payment[2];
+        Payment payPal = new PayPal(4, "Tamara Mowry", "tamara@mowry.com");
+        Payment check = new Check(81, "Tia Mowry", "11432543", "2273080");
+
+        payments[0] = payPal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringByPayerName(payments);
+        assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void test_toStringById(){
+
+        Payment[] payments = new Payment[2];
+        Payment payPal = new PayPal(120, "Tamara Mowry", "tamara@mowry.com");
+        Payment check = new Check(81, "Tia Mowry", "11432543", "134344551");
+
+        payments[0] = payPal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringById(payments);
+        assertEquals(expected, actual);
+
+    }
 }

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

@@ -7,54 +7,79 @@ public class PaymentSortByPayerTest {
 
     PaymentSortByPayer paymentSortByPayer1 = new PaymentSortByPayer();
     PaymentSortByPayer paymentSortByPayer2 = new PaymentSortByPayer();
-    PaymentSortByPayer paymentSortByPayer3= new PaymentSortByPayer();
 
 
-    Payment payment1 = new PayPal();
-    Payment payment2 = new Check();
+    PayPal payment1 = new PayPal();
+    Check payment2 = new Check();
 
     @Test
-    public void compare() {
+    public void test_compare_when_payments_are_equal() {
 
-        int x = paymentSortByPayer3.compare(paymentSortByPayer1, paymentSortByPayer2);
+        payment1.setPayerName("Ken");
+        payment1.setEmail("peace_459@live.com");
+        payment1.setId(888);
 
-        Assert.assertEquals(-1, x < 0);
-        Assert.assertEquals(0, x == 0);
-        Assert.assertEquals(1, x > 0);
+        payment2.setId(459);
+        payment2.setRoutingNumber("2815");
+        payment2.setPayerName("Angel");
+        payment2.setAccountNumber("9532850");
 
 
+        //int actual = paymentSortByPayer1.compare(payment1, payment1);
 
+        Assert.assertTrue(paymentSortByPayer1.compare(payment1, payment1)==0);
+//        Assert.assertFalse(actual < 0);
+//        Assert.assertFalse(actual > 0);
 
 
+        }
 
 
+    @Test
+    public void test_compare_when_payment1_is_before_payment2(){
+
+        payment1.setPayerName("Kenn");
+        payment1.setEmail("peace_459@livee.com");
+        payment1.setId(8888);
+
+        payment2.setId(4559);
+        payment2.setRoutingNumber("28155");
+        payment2.setPayerName("Angell");
+        payment2.setAccountNumber("9532857");
+
+        int actual = paymentSortByPayer1.compare(payment1, payment2);
+
+        Assert.assertTrue(actual > 0);
+        Assert.assertFalse(actual < 0);
+        Assert.assertFalse(actual == 0);
+    }
+
+
+
+    @Test
+    public void test_compare_when_payment2_is_before_payment1(){
 
+        PayPal payment5 = new PayPal();
+        Check payment6 = new Check();
 
+        payment5.setPayerName("Kennn");
+        payment5.setEmail("peace_459@liveee.com");
+        payment5.setId(88888);
 
+        payment6.setId(45559);
+        payment6.setRoutingNumber("281555");
+        payment6.setPayerName("Angelll");
+        payment6.setAccountNumber("9532852");
 
-        //     //   boolean answer;
-//        int fuego = 0;
-//
-//        if(payment1.compareTo(payment2) > 0){
-//            fuego = 88;
-//        } else
-//            if(payment1.compareTo(payment2) == 0){
-//            fuego = 0;
-//            } else
-//                if(payment1.compareTo(payment2) < 0){
-//            fuego = -3849;
-//                }
-//
-//        Assert.assertTrue("fuego is greater than zero", fuego > 0);
-//        Assert.assertTrue("fuego equals zero", fuego == 0);
-//        Assert.assertTrue("fuego is less than zero", fuego < 0);
-//
-//    }
+        int actual = paymentSortByPayer2.compare(payment5, payment6);
 
+        Assert.assertTrue(actual > 0);
+        Assert.assertFalse(actual < 0);
+        Assert.assertFalse(actual == 0);
 
     }
 }
 
 //Leaving test broken so that I remember to come back to it.
-xyz
+//xyz
 //Leaving test broken so that I remember to come back to it.