comparing

pom.xml

@@ -7,6 +7,22 @@
     <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>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
 
 
 </project>

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

@@ -1,4 +1,5 @@
-package com.zipcoder.payment;
+package com.zipcoder.payment.main.payment;
+
 
 public class Check implements Payment{
     Long id;

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

@@ -1,4 +1,4 @@
-package com.zipcoder.payment;
+package com.zipcoder.payment.main.payment;
 
 
 public class CreditCard implements Payment {

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

@@ -1,4 +1,4 @@
-package com.zipcoder.payment;
+package com.zipcoder.payment.main.payment;
 
 public interface Payment extends Comparable<Payment> {
 

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

@@ -1,4 +1,4 @@
-package com.zipcoder.payment;
+package com.zipcoder.payment.main.payment;
 
 import java.util.Arrays;
 
@@ -11,8 +11,7 @@ public class PaymentPresenter {
         StringBuilder build = new StringBuilder();
         for(Payment o : payment) build.append(o.getShortDescription()+"\n");
         return build.toString();
-
-//             o.getId(); o.getPayerName();
+        
         }
 
     public String toStringByPayerName(Payment[] payment) {
@@ -24,7 +23,7 @@ public class PaymentPresenter {
     }
 
     public String toStringById(Payment[] payment) {
-        Arrays.sort(payment, new PaymentSortByPayer());
+        Arrays.sort(payment, (Payment o1, Payment o2) -> Long.compare(o1.getId(), o2.getId()));
 
         StringBuilder build = new StringBuilder();
         for(Payment o : payment) build.append(o.getShortDescription()+"\n");

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

@@ -1,4 +1,4 @@
-package com.zipcoder.payment;
+package com.zipcoder.payment.main.payment;
 
 import java.util.Comparator;
 

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

@@ -1,4 +1,4 @@
-package com.zipcoder.payment;
+package com.zipcoder.payment.main.payment;
 
 public class Paypal implements Payment{
     Long id;
@@ -12,7 +12,7 @@ public class Paypal implements Payment{
 
     }
 
-    @Override
+
     public long getId() {
         return id;
     }
@@ -21,7 +21,7 @@ public class Paypal implements Payment{
         this.id = id;
     }
 
-    @Override
+
     public String getPayerName() {
         return this.payerName;
     }
@@ -30,7 +30,7 @@ public class Paypal implements Payment{
         this.payerName = payerName;
     }
 
-    @Override
+
     public String getShortDescription() {
         return "Paypal " + getPayerName() + " " + getEmail();
     }

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

@@ -1,8 +1,11 @@
-package com.zipcoder.payment;
+package com.zipcoder;
 
+import com.zipcoder.payment.main.payment.Check;
+import com.zipcoder.payment.main.payment.CreditCard;
+import com.zipcoder.payment.main.payment.Paypal;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class CheckTest {
     Check check = new Check();

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

@@ -1,9 +1,11 @@
-package com.zipcoder.payment;
+package com.zipcoder;
 
-import com.sun.deploy.net.CrossDomainXML;
+import com.zipcoder.payment.main.payment.Check;
+import com.zipcoder.payment.main.payment.CreditCard;
+import com.zipcoder.payment.main.payment.Paypal;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class CreditCardTest {
     Paypal pay = new Paypal();

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

@@ -1,5 +1,9 @@
-package com.zipcoder.payment;
+package com.zipcoder;
 
+import com.zipcoder.payment.main.payment.Check;
+import com.zipcoder.payment.main.payment.Payment;
+import com.zipcoder.payment.main.payment.PaymentPresenter;
+import com.zipcoder.payment.main.payment.Paypal;
 import org.junit.Test;
 
 import static junit.framework.TestCase.assertEquals;
@@ -61,7 +65,7 @@ public class PaymentPresenterTest {
         payment[1] = check;
 
         PaymentPresenter presenter = new PaymentPresenter();
-        String expected = "Paypal Tia Mowry tamara@mowry.com\nCheck Tamara Mowry ***4551\n";
+        String expected = "Check Tia Mowry ***4551\nPaypal Tamara Mowry tamara@mowry.com\n";
 
         String actual = presenter.toStringById(payment);
         assertEquals(expected, actual);

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

@@ -1,8 +1,11 @@
-package com.zipcoder.payment;
+package com.zipcoder;
 
+import com.zipcoder.payment.main.payment.Check;
+import com.zipcoder.payment.main.payment.CreditCard;
+import com.zipcoder.payment.main.payment.Paypal;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class PaypalTest {