Move name up in toString()

sualeh · Dec 26, 2023 · 1df1112 · 1df1112
1 parent 0da264b
commit 1df1112
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/us/fatehi/creditcardnumber/BankCard.java b/src/main/java/us/fatehi/creditcardnumber/BankCard.java
@@ -195,16 +195,16 @@ public String toString() {
       buffer.append("    Is Primary Account Number Valid? ");
       buffer.append(pan.isPrimaryAccountNumberValid() ? "Yes" : "No").append(NEWLINE);
     }
+    if (hasName()) {
+      buffer.append("  Name: ");
+      buffer.append(getName()).append(NEWLINE);
+    }
     if (hasExpirationDate()) {
       buffer.append("  Expiration Date: ");
       buffer.append(expirationDate).append(NEWLINE);
       buffer.append("    Is Expired? ");
       buffer.append(expirationDate.isExpired() ? "Yes" : "No").append(NEWLINE);
     }
-    if (hasName()) {
-      buffer.append("  Name: ");
-      buffer.append(getName()).append(NEWLINE);
-    }
     if (hasServiceCode()) {
       final ServiceCode serviceCode = getServiceCode();
       buffer.append("  Service Code: ");

diff --git a/src/test/resources/BankCard.toString b/src/test/resources/BankCard.toString
@@ -7,9 +7,9 @@ Bank Card Information:
     Last Four Digits: 6173
     Passes Luhn Check? No
     Is Primary Account Number Valid? No
+  Name: Sualeh Fatehi
   Expiration Date: 2012-12
     Is Expired? Yes
-  Name: Sualeh Fatehi
   Service Code: 
     2 - Interchange: International interchange. Technology: Integrated circuit card.
     2 - Authorization Processing: By issuer.

diff --git a/src/test/resources/BankCard1.toString b/src/test/resources/BankCard1.toString
@@ -7,7 +7,7 @@ Bank Card Information:
     Last Four Digits: 6173
     Passes Luhn Check? No
     Is Primary Account Number Valid? No
+  Name: Sualeh Fatehi
   Expiration Date: 2012-12
     Is Expired? Yes
-  Name: Sualeh Fatehi
 
diff --git a/src/test/resources/BankCard5.toString b/src/test/resources/BankCard5.toString
@@ -7,9 +7,9 @@ Bank Card Information:
     Last Four Digits: 6174
     Passes Luhn Check? Yes
     Is Primary Account Number Valid? Yes
+  Name: Sualeh Fatehi
   Expiration Date: 2030-12
     Is Expired? No
-  Name: Sualeh Fatehi
   Service Code: 
     2 - Interchange: International interchange. Technology: Integrated circuit card.
     2 - Authorization Processing: By issuer.