InterfaceComparable

README.MD

@@ -61,7 +61,7 @@
 # Section 2 - Comparable
 Note: You may use the String/Long compareTo methods in your code
 1. Edit the `Payment` class to extends the Comparable interface
-  - `public interface Payment extends Comparable<Payment>`
+  - `public class Payment extends Comparable<Payment>`
   - This indicate that payment can be comparable, which means it can be sorted
 2. Fix the syntax error in your CreditCard, Check, and Paypal class by adding the compare method
 3. Create a test for the `compareTo` method. Compare using the getShortDescription()
@@ -102,8 +102,7 @@ Note: You may use the String/Long compareTo methods in your code
     Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
     payment[0] = paypal;
-    payment[1] = check;
-    
+
     PaymentPresenter presenter = new PaymentPresenter();
     String expected = "Check Tia Mowry ***4551\nPaypal Tia Mowry tia@mowry.com\n";
 
@@ -120,12 +119,11 @@ Note: You may use the String/Long compareTo methods in your code
       Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
       payment[0] = paypal;
-      payment[1] = check;
 
       PaymentPresenter presenter = new PaymentPresenter();
       String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
 
-      String actual = presenter.toStringByPayerName(payments);
+      String actual = presenter.toString(payments);
       assertEquals(expected, actual);
     ```
     
@@ -138,11 +136,10 @@ Note: You may use the String/Long compareTo methods in your code
       Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
       payment[0] = paypal;
-      payment[1] = check;
 
       PaymentPresenter presenter = new PaymentPresenter();
       String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
 
-      String actual = presenter.toStringById(payments);
+      String actual = presenter.toString(payments);
       assertEquals(expected, actual);
     ```

pom.xml

@@ -7,9 +7,20 @@
     <groupId>com.zipcoder</groupId>
     <artifactId>payment</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
 
 </project>

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

@@ -0,0 +1,82 @@
+package com.zipcoder.payment;
+
+public class Check implements Payment {
+
+
+    Long id;
+
+    String payerName;
+
+
+    public Check(Long id, String payerName, String accountNumber){
+        this.id = id;
+        this.payerName = payerName;
+        this.accountNumber = accountNumber;
+    }
+
+
+
+
+    public String getRoutingNumber() {
+        return routingNumber;
+    }
+
+    public void setRoutingNumber(String routingNumber) {
+        this.routingNumber = routingNumber;
+    }
+
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber;
+    }
+
+    String routingNumber;
+
+    String accountNumber;
+
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+
+
+
+    public String getPayerName() {
+        return payerName;
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+    }
+
+
+
+    public String getShortDescription() {
+
+        String accountNumb = getAccountNumber();
+        String lastFourAcct = accountNumb.substring(accountNumb.length()-4);
+
+        return "Check " + this.payerName + " ***" + lastFourAcct + "\n";
+    }
+
+
+    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

@@ -0,0 +1,118 @@
+package com.zipcoder.payment;
+
+public class CreditCard implements Payment {
+
+
+    Long id;
+
+    String payerName;
+
+    String shortDescription;
+
+
+
+    String number;
+
+    int expiredMonth;
+
+    int expiredYear;
+
+
+
+    public CreditCard(){
+
+    }
+
+    public CreditCard(long id, String payerName, String number, int month, int year){
+        this.id = id;
+        this.payerName = payerName;
+        this.number = number;
+        this.expiredMonth = expiredMonth;
+        this.expiredYear = expiredYear;
+    }
+
+
+
+
+    public Long getId(){
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+
+
+
+    public String getPayerName(){
+        return payerName;
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+    }
+
+
+
+
+    public String getNumber (){
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+
+
+
+
+
+    public int getExpiredMonth (){
+        return expiredMonth;
+    }
+
+    public void setExpiredMonth(int expiredMonth) {
+        this.expiredMonth = expiredMonth;
+    }
+
+
+
+
+
+
+    public int getExpiredYear (){
+        return expiredYear;
+    }
+
+    public void setExpiredYear(int expiredYear) {
+        this.expiredYear = expiredYear;
+    }
+
+
+
+
+
+    public String getShortDescription(){
+
+        String numb = getNumber();
+        String lastFour = getNumber().substring(numb.length()-4, numb.length());
+
+        return "CC " + this.payerName + " " + lastFour + " " + this.expiredMonth + "/" + this.expiredYear + "\n";
+    }
+
+
+
+
+    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

@@ -0,0 +1,66 @@
+package com.zipcoder.payment;
+
+public class PayPal implements Payment{
+
+    Long id;
+
+    String payerName;
+
+    String email;
+
+
+
+    public static void main(String[] args){
+        int var = "Paypal Tia Mowry tia@mowry.com".compareTo("Check Tia Mowry ***4551");
+        System.out.println(var);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPayerName() {
+        return payerName;
+    }
+
+    public void setPayerName(String payerName) {
+        this.payerName = payerName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+
+    public PayPal(Long id, String payerName, String email){
+        this.id = id;
+        this.payerName = payerName;
+        this.email = email;
+    }
+
+
+
+
+    public String getShortDescription(){
+        return "PayPal " + this.payerName + " " + this.email + "\n";
+    }
+
+
+    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/Payment.java

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

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

@@ -1,6 +1,50 @@
 package com.zipcoder.payment;
 
+import java.util.Arrays;
+
 public class PaymentPresenter {
 
 
+
+    public String toStringPayer(Payment[] payments) {
+
+        Arrays.sort(payments, new PaymentSortByPayer());
+
+        StringBuilder sb = new StringBuilder();
+
+        for (Payment payment:payments) {
+            sb.append(payment.getShortDescription());
+        }
+
+        return sb.toString();
+    }
+
+
+    public String toString(Payment[] payments) {
+
+        Arrays.sort(payments, new PaymentSortByShortDescription());
+
+        StringBuilder sb = new StringBuilder();
+
+        for (Payment payment:payments) {
+            sb.append(payment.getShortDescription());
+        }
+
+        return sb.toString();
+    }
+
+
+    public String toStringID(Payment[] payments) {
+
+        Arrays.sort(payments, new PaymentSortByID());
+
+        StringBuilder sb = new StringBuilder();
+
+        for (Payment payment:payments) {
+            sb.append(payment.getShortDescription());
+        }
+
+        return sb.toString();
+    }
+
 }

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

@@ -0,0 +1,17 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByID implements Comparator<Payment> {
+
+
+    public int compare(Payment o1, Payment o2) {
+        if (o1.getId().compareTo(o2.getId()) > 0){
+            return 1;
+        } else if(o1.getId().compareTo(o2.getId()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByPayer implements Comparator<Payment> {
+
+
+
+    public int compare(Payment o1, Payment o2) {
+        if (o1.getPayerName().compareTo(o2.getPayerName()) > 0){
+            return 1;
+        } else if(o1.getPayerName().compareTo(o2.getPayerName()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+//    public int compareShortDescription(Payment o1, Payment o2) {
+//        if (o1.getShortDescription().compareTo(o2.getShortDescription()) > 0){
+//            return 1;
+//        } else if(o1.getShortDescription().compareTo(o2.getShortDescription()) < 0) {
+//            return -1;
+//        } else {
+//            return 0;
+//        }
+//    }
+//
+//    public int compareID(Payment o1, Payment o2) {
+//        if (o1.getId().compareTo(o2.getId()) > 0){
+//            return 1;
+//        } else if(o1.getId().compareTo(o2.getId()) < 0) {
+//            return -1;
+//        } else {
+//            return 0;
+//        }
+//    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortByShortDescription implements Comparator<Payment> {
+
+
+    public int compare(Payment o1, Payment o2) {
+        if (o1.getShortDescription().compareTo(o2.getShortDescription()) > 0){
+            return 1;
+        } else if(o1.getShortDescription().compareTo(o2.getShortDescription()) < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+public class CheckTest {
+
+    Check check = new Check(456L, "no", "123123");
+
+
+    @Test
+    public void getIdTest(){
+
+        //when
+        check.setId(555L);
+
+        //expected
+        Long expected = 555L;
+
+        //actual
+        Long actual = check.getId();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void getPayerNameTest(){
+        //when
+        check.setPayerName("Troy");
+
+        //expected
+        String expected = "Troy";
+
+        //actual
+        String actual = check.getPayerName();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void getRoutingNumberTest() {
+        //when
+        check.setRoutingNumber("90001");
+
+        //expected
+        String expected = "90001";
+
+        //actual
+        String actual = check.getRoutingNumber();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+
+    @Test
+    public void getAccountNumberTest(){
+        //when
+        check.setAccountNumber("56789");
+
+        //expected
+        String expected = "56789";
+
+        //actual
+        String actual = check.getAccountNumber();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    //*********************************************************
+    @Test
+    public void getShortDescriptionTest(){
+        //when
+        check.setPayerName("Abed");
+        check.setAccountNumber("0001234");
+
+        //expected
+        String expected = "Check Abed ***1234\n";
+
+        //actual
+        String actual = check.getShortDescription();
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    //*********************************************************
+
+
+    @Test
+    public void compareTo() {
+        //when
+        check.setPayerName("Abed");
+        check.setAccountNumber("0001234");
+        check.getShortDescription();
+
+        CreditCard cc = new CreditCard();
+        cc.setPayerName("Troy");
+        cc.setNumber("1110000");
+        cc.setExpiredMonth(12);
+        cc.setExpiredYear(2020);
+        cc.getShortDescription();
+
+        //expected
+        int expected = -1;
+
+        //actual
+        int actual = cc.compareTo(check);
+
+        Assert.assertEquals(expected,actual);
+    }
+}

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

@@ -0,0 +1,131 @@
+
+
+package com.zipcoder.payment;
+
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CreditCardTest {
+
+
+    CreditCard cc = new CreditCard();
+
+
+
+    @Test
+    public void getIdTest(){
+        //When
+        cc.setId(13L);
+
+        //Expected
+        long expected = 13L;
+
+        //Actual
+        long actual = cc.getId();
+
+        Assert.assertEquals(expected,actual);
+
+    }
+
+
+    @Test
+    public void getPayerNameTest(){
+        //when
+        cc.setPayerName("Abed");
+
+        //Expected
+        String expected = "Abed";
+
+        //Actual
+        String actual = cc.getPayerName();
+
+        assertEquals(expected,actual);
+    }
+
+    @Test
+    public void getNumberTest(){
+        //when
+        cc.setNumber("112233");
+
+        //Expected
+        String expected = "112233";
+
+        //Actual
+        String actual = cc.getNumber();
+
+        assertEquals(expected,actual);
+    }
+
+
+    @Test
+    public void getExpiredMonthTest(){
+        //when
+        cc.setExpiredMonth(12);
+
+        //Expected
+        int expected = 12;
+
+        //Actual
+        int actual = cc.getExpiredMonth();
+
+        assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void getExpiredYearTest(){
+        //when
+        cc.setExpiredYear(2019);
+
+        //Expected
+        int expected = 2019;
+
+        //Actual
+        int actual = cc.getExpiredYear();
+
+        assertEquals(expected, actual);
+    }
+
+
+
+    @Test
+    public void getShortDescriptionTest(){
+        //when
+        cc.setPayerName("Troy");
+        cc.setNumber("1110000");
+        cc.setExpiredMonth(12);
+        cc.setExpiredYear(2020);
+
+        //expected
+        String expected = "CC Troy 0000 12/2020\n";
+
+        //actual
+        String actual = cc.getShortDescription();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void compareTo() {
+        //when
+        cc.setPayerName("Troy");
+        cc.setNumber("1110000");
+        cc.setExpiredMonth(12);
+        cc.setExpiredYear(2020);
+        cc.getShortDescription();
+
+        //expected
+        int expected = 0;
+
+        //actual
+        int actual = cc.compareTo(cc);
+
+        Assert.assertEquals(expected,actual);
+
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
+public class PayPalTest {
+
+    PayPal pp = new PayPal(123L, "yes", "yesyes");
+
+    @Test
+    public void getIdTest() {
+
+    //when
+    pp.setId(5000L);
+
+    //expected
+    Long expected = 5000L;
+
+    //actual
+    Long actual = pp.getId();
+
+    Assert.assertEquals(expected, actual);
+    }
+
+
+
+    @Test
+    public void getPayerName(){
+        //when
+        pp.setPayerName("Tia Mowry");
+
+        //expected
+        String expected = "Tia Mowry";
+
+        //actual
+        String actual = pp.getPayerName();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void getEmailTest(){
+        //when
+        pp.setEmail("tia@mowry.com");
+
+        //expected
+        String expected = "tia@mowry.com";
+
+        //actual
+        String actual = pp.getEmail();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void getShortDescriptionTest(){
+        //when
+        pp.setPayerName("Tia Mowry");
+        pp.setEmail("tia@mowry.com");
+
+        //expected
+        String expected = "PayPal Tia Mowry tia@mowry.com";
+
+        //actual
+        String actual = pp.getShortDescription();
+    }
+
+
+    @Test
+    public void compareTo() {
+        //when
+        pp.setPayerName("Tia Mowry");
+        pp.setEmail("tia@mowry.com");
+        pp.getShortDescription();
+
+        Check check = new Check(123L, "Tia Mowry", "123123");
+        check.setPayerName("Tia Mowry");
+        check.setAccountNumber("0001234");
+        check.getShortDescription();
+
+        //expected
+        int expected = 1;
+
+        //actual
+        int actual = pp.compareTo(check);
+
+        Assert.assertEquals(expected,actual);
+    }
+}

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

@@ -1,4 +1,72 @@
 package com.zipcoder.payment;
 
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
 public class PaymentPresenterTest {
+
+        @Test
+        public void noPaymentTest() {
+        Payment[] payments = new Payment[0];
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "";
+
+        String actual = presenter.toString(payments);
+
+        Assert.assertEquals(expected, actual);
+}
+
+    @Test
+    public void multiplePaymentTest(){
+        Payment[] payments = new Payment[2];
+        Payment paypal = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81L, "Tia Mowry", "134344551");
+
+        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);
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void multiplePaymentTestPayerName(){
+        Payment[] payments = new Payment[2];
+        Payment paypal = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81L, "Alice Wonder", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Check Alice Wonder ***4551\nPayPal Tia Mowry tia@mowry.com\n";
+
+        String actual = presenter.toStringPayer(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void multiplePaymentTestID(){
+        Payment[] payments = new Payment[2];
+        Payment paypal = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        Payment check = new Check(81L, "Tia Mowry", "134344551");
+
+        payments[0] = paypal;
+        payments[1] = check;
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "PayPal Tia Mowry tia@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringID(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+
+
+
 }

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

@@ -0,0 +1,96 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+public class PaymentSortByPayerTest {
+
+    PaymentSortByPayer psbp;
+
+//    Payment payment1;
+//
+//    Payment payment2;
+
+
+//    @Before
+//    public void setup(){
+//        payment1 = new PayPal(123L, "Dexter", "dexter@gmail.com");
+//        payment2 = new Check(456L, "Mandark");
+//
+//    }
+
+//    @Test
+//    public void compareTest(){
+//        System.out.println(payment1.getShortDescription());
+//        System.out.println(payment2.getShortDescription());
+//        //expected
+//        int expected = -1;
+//
+//        //actual
+//        int actual = psbp.compare(payment1, payment2);
+//
+//        Assert.assertEquals(expected, actual);
+//
+//    }
+
+    @Test
+    public void compareTest2(){
+        //when
+        Check check = new Check(123L,"Dexter", "123123");
+        Check check2 = new Check(456L, "Mandark", "456456");
+
+        //expected
+        int expected = -1;
+
+        //actual
+        //int actual = check.getPayerName().compareTo(check2.getPayerName());
+
+        int actual = check.compareTo(check2);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void compareTest3(){
+        //when
+        Check check = new Check(123L,"Dexter", "123123");
+        Check check2 = new Check(456L, "Mandark", "456456");
+
+        //expected
+        int expected = 1;
+
+        //actual
+        int actual = check2.compareTo(check);
+
+        Assert.assertEquals(expected, actual);
+
+    }
+
+
+    @Test
+    public void compareTest4(){
+        //when
+        Check check = new Check(123L,"Dexter", "123123");
+        //Check check2 = new Check(456L, "Mandark", "456456");
+
+        //expected
+        int expected = 0;
+
+        //actual
+        int actual = check.compareTo(check);
+
+        Assert.assertEquals(expected, actual);
+
+
+    }
+
+
+
+
+
+
+}