Merge pull request #238 from rexkoh425/A-JunitFix

A-JunitFixAge

docs/DeveloperGuide.md

@@ -318,7 +318,7 @@ transactionData.txt should be created in the data folder as well if it does not
 
 `Test case 3` :
 
-`details` : Adding a user using `add-user /u john /a 16 /c +65 77777777` <br>
+`details` : Adding a user using `add-user /u john /a 16 /c 87777777` <br>
 `check` : The command should return an error message saying that the age is illegal to drive which is true 
 for most countries at age of 16. Our legal age is 18 thus changing the age to 18 and above but maximally 100 years old 
 will work now.

src/main/java/customer/Customer.java

@@ -23,9 +23,12 @@ public Customer(String customerName, int age, String contactNumber) {
             throw CustomerException.invalidCustomerNameException(customerName);
         }
         // Validate age
-        if (age <= 17) {
+        if(age <= 17){
             throw CustomerException.invalidAgeException();
+        }else if(age > 100){
+            throw CustomerException.invalidMaxAgeException();
         }
+
         // Validate contact number format
         if (isInvalidContactNumber(contactNumber)) {
             throw CustomerException.invalidContactNumberException();
@@ -56,9 +59,12 @@ public void setCustomerName(String customerName) {
     }
 
     public void setAge(int age) {
-        if (age <= 17) {
+        if(age <= 17){
             throw CustomerException.invalidAgeException();
+        }else if(age > 100){
+            throw CustomerException.invalidMaxAgeException();
         }
+
         this.age = age;
     }
 

src/main/java/exceptions/CustomerException.java

@@ -61,6 +61,10 @@ public static CustomerException invalidAgeException(){
         return new CustomerException("Illegal driver!! Age should be more than 17!!");
     }
 
+    public static CustomerException invalidMaxAgeException(){
+        return new CustomerException("This age is not safe to drive!! Too old!!");
+    }
+
     /**
      * Exception thrown when the customer name already exists (case-insensitive).
      *

src/main/java/parser/CustomerParser.java

@@ -34,8 +34,10 @@ public static Customer parseIntoCustomer(String userInput) throws CustomerExcept
         String customerName = parameterContents[0];
         int age = Integer.parseInt(parameterContents[1]);
 
-        if(age <= 17 || age > 100){
+        if(age <= 17){
             throw CustomerException.invalidAgeException();
+        }else if(age > 100){
+            throw CustomerException.invalidMaxAgeException();
         }
 
         String contactNumber = parameterContents[2];