all parts complete

README.MD

@@ -1,4 +1,4 @@
-# Polymorphism Payment Lab
+# Polymorphism com.zipcoder.payment.Payment Lab
 
 ## Objectives
 
@@ -7,15 +7,15 @@
 - To learn [lambda function](https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html)
 
 # Section 1 - Setting up the classes
-## Part 1 - Payment
-1. Create a `Payment` interface
+## Part 1 - com.zipcoder.payment.Payment
+1. Create a `com.zipcoder.payment.Payment` interface
   - The class should define a `getId()` method which returns a Long
   - The class should define a `getPayerName()` method which returns a String
   - The class should define a `getShortDescription` method which returns a String
 
 ## Part 2 - Credit Card
 1. Create a `CreditCardTest` test class
-2. Create a `CreditCard` class which implements the `Payment` interface
+2. Create a `CreditCard` class which implements the `com.zipcoder.payment.Payment` interface
 3. Add the required methods from the interface
 4. Add getter and setter test for an id
   - Add a Long id field
@@ -31,7 +31,7 @@
 
 ## Part 3 - Check
 1. Create a `CheckTest` test class
-2. Create a `Check` class which implements the `Payment` interface
+2. Create a `Check` class which implements the `com.zipcoder.payment.Payment` interface
 3. Add the required methods from the interface
 4. Add getter and setter test for an id
   - Add a Long id field
@@ -46,7 +46,7 @@
 
 ## Part 4 - Paypal
 1. Create a `PayPalTest` test class
-2. Create a `PayPal` class which implements the `Payment` interface
+2. Create a `PayPal` class which implements the `com.zipcoder.payment.Payment` interface
 3. Add the required methods from the interface
 4. Add getter and setter test for an id
   - Add a Long id field
@@ -60,19 +60,19 @@
 
 # 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 class Payment extends Comparable<Payment>`
+1. Edit the `com.zipcoder.payment.Payment` class to extends the Comparable interface
+  - `public class com.zipcoder.payment.Payment extends Comparable<com.zipcoder.payment.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()
-  - Example: Given Payment of type Paypal with the short description of `Paypal Tia Mowry tia@mowry.com` and a Check with the short description of `Check Tia Mowry ***4551`, then the `compareTo` method should return a number larger than 0
+  - Example: Given com.zipcoder.payment.Payment of type Paypal with the short description of `Paypal Tia Mowry tia@mowry.com` and a Check with the short description of `Check Tia Mowry ***4551`, then the `compareTo` method should return a number larger than 0
   - The `compareTo` method will return number larger than 0 if this payment comes after payment2
   - The `compareTo` method will return number 0 if this payment has the same information
   - The `compareTo` method will return number less than 0 if this payment comes before payment2
 4. Add the code necessary to make the test pass
 5. Create a new `PaymentSortByPayer` class which implements `java.util.Comparator`
   - This class will sort by payer name
-  - `public class PaymentSortByPayer implements Comparator<Payment>`
+  - `public class PaymentSortByPayer implements Comparator<com.zipcoder.payment.Payment>`
 6. Add the required `compare` method from the Comparator
 7. Create a test to compare two payment
     - The `compare` method will return number larger than 0 if payment1 comes after payment2
@@ -85,7 +85,7 @@ Note: You may use the String/Long compareTo methods in your code
   - When there is no payment
     
     ```
-      Payment[] payments = new Payment[0];
+      com.zipcoder.payment.Payment[] payments = new com.zipcoder.payment.Payment[0];
       PaymentPresenter presenter = new PaymentPresenter();
       String expected = "";
 
@@ -97,9 +97,9 @@ Note: You may use the String/Long compareTo methods in your code
   - When there are multiple payments, you need to sort it first, then build the string using the short description
     
   ```
-    Payment[] payments = new Payment[2];
-    Payment paypal = new PayPayl(4L, "Tia Mowry", "tia@mowry.com");
-    Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
+    com.zipcoder.payment.Payment[] payments = new com.zipcoder.payment.Payment[2];
+    com.zipcoder.payment.Payment paypal = new PayPayl(4L, "Tia Mowry", "tia@mowry.com");
+    com.zipcoder.payment.Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
     payment[0] = paypal;
 
@@ -114,9 +114,9 @@ Note: You may use the String/Long compareTo methods in your code
     - When there are multiple payments, you need to sort by calling the `PaymentSortByPayer` class to sort, then build the string using the short description
 
     ```
-      Payment[] payments = new Payment[2];
-      Payment paypal = new PayPayl(4L, "Tamara Mowry", "tamara@mowry.com");
-      Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
+      com.zipcoder.payment.Payment[] payments = new com.zipcoder.payment.Payment[2];
+      com.zipcoder.payment.Payment paypal = new PayPayl(4L, "Tamara Mowry", "tamara@mowry.com");
+      com.zipcoder.payment.Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
       payment[0] = paypal;
 
@@ -131,9 +131,9 @@ Note: You may use the String/Long compareTo methods in your code
     - When there are multiple payments, you need to sort by creating a lambda to sort the payment by id, then build the string using the short description
 
     ```
-      Payment[] payments = new Payment[2];
-      Payment paypal = new PayPayl(120L, "Tamara Mowry", "tamara@mowry.com");
-      Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
+      com.zipcoder.payment.Payment[] payments = new com.zipcoder.payment.Payment[2];
+      com.zipcoder.payment.Payment paypal = new PayPayl(120L, "Tamara Mowry", "tamara@mowry.com");
+      com.zipcoder.payment.Payment check = new Check(81L, "Tia Mowry", "11432543", "134344551")
 
       payment[0] = paypal;
 

pom.xml

@@ -8,5 +8,13 @@
     <artifactId>payment</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 </project>

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

@@ -0,0 +1,35 @@
+package com.zipcoder.payment;
+
+public class Check implements Payment{
+    long id;
+    String payerName;
+    String routingNumber;
+    String accountNumber;
+
+    public Check(long id, String payerName, String routingNumber, String accountNumber) {
+        this.id = id;
+        this.payerName = payerName;
+        this.routingNumber = routingNumber;
+        this.accountNumber = accountNumber;
+    }
+
+    public long getId(){
+        return id;
+    }
+    public String getPayerName(){
+        return payerName;
+    }
+    public String getShortDescription(){
+        return String.format("Check %s ***%s", payerName, accountNumber.substring(accountNumber.length()-4, accountNumber.length()));
+    }
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+    public String getRoutingNumber() {
+        return routingNumber;
+    }
+    public int compareTo(Payment p) {
+        return this.getShortDescription().compareTo(p.getShortDescription());
+    }
+
+}

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

@@ -0,0 +1,42 @@
+package com.zipcoder.payment;
+
+public class CreditCard implements Payment {
+    private long id;
+    private String payerName;
+    private String number;
+    private int expiredMonth;
+    private int expiredYear;
+
+    public CreditCard(long id, String payerName, String number, int expiredMonth, int expiredYear) {
+        this.id = id;
+        this.payerName = payerName;
+        this.number = number;
+        this.expiredMonth = expiredMonth;
+        this.expiredYear = expiredYear;
+
+    }
+    public long getId() {
+        return id;
+    }
+    public String getPayerName() {
+        return payerName;
+    }
+    public String getNumber() {
+        return number;
+    }
+    public int getExpiredMonth() {
+        return expiredMonth;
+    }
+    public int getExpiredYear() {
+        return expiredYear;
+    }
+
+    public String getShortDescription(){
+        return String.format("CC %s %s %d/%d", payerName, number.substring(number.length() - 4, number.length()), expiredMonth, expiredYear);
+    }
+
+    public int compareTo(Payment p) {
+        return this.getShortDescription().compareTo(p.getShortDescription());
+    }
+
+}

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

@@ -0,0 +1,29 @@
+package com.zipcoder.payment;
+
+public class PayPal  implements Payment{
+    long id;
+    String payerName;
+    String payerEmail;
+
+    public PayPal(long id, String payerName, String payerEmail) {
+        this.id = id;
+        this.payerName = payerName;
+        this.payerEmail = payerEmail;
+    }
+
+    public long getId(){
+        return id;
+    }
+    public String getPayerName(){
+        return payerName;
+    }
+    public String getPayerEmail() {
+        return payerEmail;
+    }
+    public String getShortDescription(){
+        return String.format("Paypal %s %s", payerName, payerEmail);
+    }
+    public int compareTo(Payment p) {
+        return this.getShortDescription().compareTo(p.getShortDescription());
+    }
+}

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

@@ -0,0 +1,10 @@
+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,32 @@
 package com.zipcoder.payment;
 
+import java.util.Arrays;
+
 public class PaymentPresenter {
 
 
+    public String toString(Payment[] p){
+        Arrays.sort(p);
+        return generateOutputString(p);
+    }
+
+    public String toStringByPayerName(Payment[] p) {
+        PaymentSortByPayer psbp = new PaymentSortByPayer();
+        Arrays.sort(p, psbp);
+        return generateOutputString(p);
+    }
+
+    public String toStringByID(Payment[] p){
+        PaymentSortById psbi = new PaymentSortById();
+        Arrays.sort(p, psbi);
+        return generateOutputString(p);
+    }
+
+    private String generateOutputString(Payment[] p) {
+        StringBuilder paymentSB = new StringBuilder();
+        for (Payment payment : p){
+            paymentSB.append(payment.getShortDescription() + "\n");
+        }
+        return paymentSB.toString();
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.zipcoder.payment;
+
+import java.util.Comparator;
+
+public class PaymentSortById implements Comparator<Payment>{
+    public int compare(Payment p1, Payment p2) {
+        Long p1ID = p1.getId();
+        Long p2ID = p2.getId();
+        return p1ID.compareTo(p2ID);
+    }
+
+}

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

@@ -0,0 +1,9 @@
+package com.zipcoder.payment;
+import java.util.Comparator;
+
+public class PaymentSortByPayer implements Comparator<Payment>{
+
+    public int compare(Payment p1, Payment p2) {
+        return p1.getPayerName().compareTo(p2.getPayerName());
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CheckTest {
+    Check ch;
+    Check c2;
+
+    @Before
+    public void setup() {
+        ch = new Check(12345, "Sansa Stark", "1234567", "987654321");
+        c2 = new Check(9034, "Arya Stark", "1234569", "987654444");
+
+    }
+
+    @Test
+    public void getIdTest() {
+        long expected = 12345;
+        long actual = ch.getId();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void getPayerNameTest() {
+        String expected = "Sansa Stark";
+        String actual = ch.getPayerName();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void getRoutingNumberTest() {
+        String expected = "1234567";
+        String actual = ch.getRoutingNumber();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void getAccountNumberTest() {
+        String expected = "987654321";
+        String actual = ch.getAccountNumber();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void getShortDescriptionTest() {
+        String expected = "Check Sansa Stark ***4321";
+        String actual = ch.getShortDescription();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void compareToTest() {
+        int actual = ch.compareTo(c2);
+        Assert.assertTrue(actual > 0);
+    }
+    @Test
+    public void compareToTest2() {
+        int actual = c2.compareTo(ch);
+        Assert.assertTrue(actual < 0);
+    }
+    @Test
+    public void compareToTest3() {
+        int actual = c2.compareTo(c2);
+        Assert.assertTrue(actual == 0);
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CreditCardTest {
+    CreditCard cc;
+    PayPal pp;
+    @Before
+    public void setup() {
+        cc = new CreditCard(12345, "Sansa Stark", "4444444444", 12, 2020);
+        pp = new PayPal(12345, "Sansa Stark", "ladystark@winterfell.com");
+    }
+
+    @Test
+    public void creditCardGetIDTest() {
+        long expected = 12345;
+        long actual = cc.getId();
+
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void creditCardGetPayerNameTest() {
+        String expected = "Sansa Stark";
+        String actual = cc.getPayerName();
+
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void creditCardGetShortDescription() {
+        String expected = "CC Sansa Stark 4444 12/2020";
+        String actual = cc.getShortDescription();
+
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void creditCardGetExpiredMonthTest() {
+        int expected = 12;
+        int actual = cc.getExpiredMonth();
+
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void creditCardGetExpiredYearTest() {
+        int expected = 2020;
+        int actual = cc.getExpiredYear();
+
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void creditCardGetNumberTest() {
+        String expected = "4444444444";
+        String actual = cc.getNumber();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void compareToTest() {
+        int actual = pp.compareTo(cc);
+        Assert.assertTrue(actual > 0);
+    }
+    @Test
+    public void compareToTest2() {
+        int actual = cc.compareTo(pp);
+        Assert.assertTrue(actual < 0);
+    }
+    @Test
+    public void compareToTest3() {
+        int actual = cc.compareTo(cc);
+        Assert.assertTrue(actual == 0);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PayPalTest {
+    PayPal pp;
+    Check ch;
+    @Before
+    public void setup() {
+        pp = new PayPal(12345, "Sansa Stark", "ladystark@winterfell.com");
+        ch = new Check(12345, "Sansa Stark", "1234567", "987654321");
+
+    }
+
+    @Test
+    public void getIdTest() {
+        long expected = 12345;
+        long actual = pp.getId();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void getPayerNameTest() {
+        String expected = "Sansa Stark";
+        String actual = pp.getPayerName();
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void getEmailTest() {
+        String expected = "ladystark@winterfell.com";
+        String actual = pp.getPayerEmail();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getShortDescriptionTest() {
+        String expected = "Paypal Sansa Stark ladystark@winterfell.com";
+        String actual = pp.getShortDescription();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void compareToTest() {
+        int actual = pp.compareTo(ch);
+        Assert.assertTrue(actual > 0);
+    }
+    @Test
+    public void compareToTest2() {
+        int actual = ch.compareTo(pp);
+        Assert.assertTrue(actual < 0);
+    }
+    @Test
+    public void compareToTest3() {
+        int actual = pp.compareTo(pp);
+        Assert.assertTrue(actual == 0);
+    }
+}

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

@@ -1,4 +1,55 @@
 package com.zipcoder.payment;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class PaymentPresenterTest {
+
+    @Test
+    public void toStringTest() {
+        Payment[] payments = new Payment[0];
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "";
+        String actual = presenter.toString(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void toStringTest2() {
+        Payment[] payments = new Payment[2];
+        payments[0] = new PayPal(4L, "Tia Mowry", "tia@mowry.com");
+        payments[1] = new Check(81L, "Tia Mowry", "11432543", "134344551");
+
+        PaymentPresenter pp = new PaymentPresenter();
+        String expected = "Check Tia Mowry ***4551\nPaypal Tia Mowry tia@mowry.com\n";
+
+        String actual = pp.toString(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void toStringByPayerName() {
+        Payment[] payments = new Payment[2];
+        payments[1] = new PayPal(4L, "Tamara Mowry", "tamara@mowry.com");
+        payments [0] = new Check(81L, "Tia Mowry", "11432543", "134344551");
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringByPayerName(payments);
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void toStringByID() {
+        Payment[] payments = new Payment[2];
+        payments[1] = new PayPal(4L, "Tamara Mowry", "tamara@mowry.com");
+        payments[0] = new Check(81L, "Tia Mowry", "11432543", "134344551");
+
+        PaymentPresenter presenter = new PaymentPresenter();
+        String expected = "Paypal Tamara Mowry tamara@mowry.com\nCheck Tia Mowry ***4551\n";
+
+        String actual = presenter.toStringByID(payments);
+        Assert.assertEquals(expected, actual);
+    }
+
 }

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

@@ -0,0 +1,31 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PaymentSortByIdTest {
+    Check ch = new Check(1, "Sansa Stark", "1234567", "987654321");
+    PayPal pp = new PayPal(1, "Catelyn Stark", "ladystark@winterfell.com");
+    CreditCard cc = new CreditCard(123, "Robb Stark", "4444444444", 12, 2020);
+    Check ch2 = new Check(900, "Arya Stark", "1234569", "987654444");
+
+    PaymentSortById psbi = new PaymentSortById();
+
+
+    @Test
+    public void paymentSortByIdTest1() {
+        int expected = 0;
+        int actual = psbi.compare(ch, pp);
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void paymentSortByIdTest2() {
+        int actual = psbi.compare(ch, cc);
+        Assert.assertTrue(actual < 0);
+    }
+    @Test
+    public void paymentSortByIdTest3() {
+        int actual = psbi.compare(ch2, cc);
+        Assert.assertTrue(actual > 0);
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.zipcoder.payment;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PaymentSortByPayerTest {
+    Check ch = new Check(12345, "Sansa Stark", "1234567", "987654321");
+    PayPal pp = new PayPal(12345, "Catelyn Stark", "ladystark@winterfell.com");
+    CreditCard cc = new CreditCard(12345, "Robb Stark", "4444444444", 12, 2020);
+    Check ch2 = new Check(9034, "Arya Stark", "1234569", "987654444");
+    PayPal pp2 = new PayPal(12345, "Sansa Stark", "ladystarkthesecond@winterfell.com");
+
+    PaymentSortByPayer psbp = new PaymentSortByPayer();
+
+
+    @Test
+    public void paymentSortByPayerTest1() {
+        int expected = 0;
+        int actual = psbp.compare(ch, pp2);
+        Assert.assertEquals(expected, actual);
+    }
+    @Test
+    public void paymentSortByPayerTest2() {
+        int actual = psbp.compare(ch, pp);
+        Assert.assertTrue(actual > 0);
+    }
+    @Test
+    public void paymentSortByPayerTest3() {
+        int actual = psbp.compare(ch2, cc);
+        Assert.assertTrue(actual < 0);
+    }
+}