Completed TODOs

JavaFinalProject.iml

@@ -4,8 +4,35 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13.1/junit-4.13.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit5.8.1">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.8.1/junit-jupiter-5.8.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.1/junit-jupiter-api-5.8.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.1/junit-platform-commons-1.8.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.8.1/junit-jupiter-params-5.8.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.1/junit-jupiter-engine-5.8.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

src/com/generation/model/Student.java

@@ -23,7 +23,12 @@ public Student( String id, String name, String email, Date birthDate )
 
     public void enrollToCourse( Course course )
     {
-        //TODO implement this method
+        if (!isAttendingCourse(course.getCode())) {
+            courses.add(course);
+        }
+        else {
+            System.out.println("Student has already been enrolled in the course.");
+        }
     }
 
     public void registerApprovedCourse( Course course )
@@ -34,7 +39,11 @@ public void registerApprovedCourse( Course course )
 
     public boolean isAttendingCourse( String courseCode )
     {
-        //TODO implement this method
+        for(Course c : courses){
+            if(c.getCode().equals(courseCode)) {
+                return true;
+            }
+        }
         return false;
     }
 
@@ -47,6 +56,6 @@ public double getAverage()
     @Override
     public String toString()
     {
-        return "Student {" + super.toString() + "}";
+        return "Student {" + super.toString() + ", " + courses.toString() + "}";
     }
 }

src/com/generation/service/StudentService.java

@@ -26,7 +26,10 @@ public Student findStudent( String studentId )
 
     public void showSummary()
     {
-        //TODO implement
+        System.out.println("Students: ");
+        for(Student s: students.values()){
+            System.out.println(s.toString());
+        }
     }
 
     public void enrollToCourse( String studentId, Course course )

src/com/generation/utils/PrinterHelper.java

@@ -38,9 +38,18 @@ public static Student createStudentMenu( Scanner scanner )
         System.out.println( "| Enter student email:                |" );
         String email = scanner.next();
         System.out.println( "| Enter student birth date(mm/dd/yyyy)|" );
-        DateFormat formatter = new SimpleDateFormat( "mm/dd/yyyy");
-        //TODO validate date format and catch exception to avoid crash
-        Date birthDate = formatter.parse( scanner.next());
+        DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
+        boolean validDate = false;
+        Date birthDate = null;
+        while(!validDate) {
+            System.out.println("| Enter Student Birth Date (mm/dd/yyyy)|");
+            try {
+                birthDate = formatter.parse( scanner.next());
+                validDate = true;
+            } catch (ParseException e) {
+                System.out.println("Invalid Date!");
+            }
+        };
         System.out.println( "|-------------------------------------|" );
         Student student = new Student( id, name, email, birthDate );
         System.out.println( "Student Successfully Registered! " );

src/test/com/generation/service/CourseServiceTest.java

@@ -0,0 +1,19 @@
+package com.generation.service;
+
+import com.generation.model.Course;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class CourseServiceTest {
+
+    public CourseService courseService = new CourseService();
+
+
+    @Test
+    void getCourseNull() {
+        Course course = courseService.getCourse("Invalid Course Code");
+        assertNull(course);
+    }
+
+}

src/test/com/generation/service/StudentServiceTest.java

@@ -0,0 +1,11 @@
+package com.generation.service;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StudentServiceTest {
+
+    public StudentService student = new StudentService();
+
+
+
+}