Merge pull request #18 from jinzihan2002/Zihan-9-Oct

Add and delete assignments using AssignmentCommand

src/main/java/TutorLink/command/assignment_command/AddAssignmentCommand.java → src/main/java/tutorlink/command/assignmentcommand/AddAssignmentCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.assignment_command;
+package tutorlink.command.assignmentcommand;
 
 import tutorlink.assignment.Assignment;
 
@@ -11,11 +11,6 @@ public AddAssignmentCommand(Assignment assignment) {
 
     @Override
     public void execute(ArrayList assignmentList) {
-
-    }
-
-    @Override
-    public boolean isExit() {
-        return false;
+        assignmentList.add(assignment);
     }
 }

src/main/java/TutorLink/command/assignment_command/AssignmentCommand.java → src/main/java/tutorlink/command/assignmentcommand/AssignmentCommand.java

@@ -1,12 +1,12 @@
-package tutorlink.command.assignment_command;
+package tutorlink.command.assignmentcommand;
 
 import tutorlink.assignment.Assignment;
 import tutorlink.command.Command;
 
 import java.util.ArrayList;
 
 public abstract class AssignmentCommand extends Command {
-    private Assignment assignment;
+    protected Assignment assignment;
 
     public AssignmentCommand(Assignment assignment) {
         this.assignment = assignment;

src/main/java/TutorLink/command/assignment_command/DeleteAssignmentCommand.java → src/main/java/tutorlink/command/assignmentcommand/DeleteAssignmentCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.assignment_command;
+package tutorlink.command.assignmentcommand;
 
 import tutorlink.assignment.Assignment;
 
@@ -10,6 +10,6 @@ public DeleteAssignmentCommand(Assignment assignment) {
     }
 
     public void execute(ArrayList assignmentList) {
-
+        assignmentList.remove(assignment);
     }
 }

src/main/java/TutorLink/command/attendance_command/AddAttendanceCommand.java → src/main/java/tutorlink/command/attendancecommand/AddAttendanceCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.attendance_command;
+package tutorlink.command.attendancecommand;
 
 import tutorlink.attendance.Attendance;
 

src/main/java/TutorLink/command/attendance_command/AttendanceCommand.java → src/main/java/tutorlink/command/attendancecommand/AttendanceCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.attendance_command;
+package tutorlink.command.attendancecommand;
 
 import tutorlink.attendance.Attendance;
 import tutorlink.command.Command;

src/main/java/TutorLink/command/attendance_command/DeleteAttendanceCommand.java → src/main/java/tutorlink/command/attendancecommand/DeleteAttendanceCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.attendance_command;
+package tutorlink.command.attendancecommand;
 
 import tutorlink.attendance.Attendance;
 

src/main/java/TutorLink/command/student_command/DeleteStudentCommand.java → src/main/java/tutorlink/command/studentcommand/DeleteStudentCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.student_command;
+package tutorlink.command.studentcommand;
 
 import tutorlink.student.Student;
 

src/main/java/TutorLink/command/student_command/StudentCommand.java → src/main/java/tutorlink/command/studentcommand/StudentCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.student_command;
+package tutorlink.command.studentcommand;
 
 import tutorlink.command.Command;
 import tutorlink.student.Student;

src/main/java/TutorLink/command/student_command/addStudentCommand.java → src/main/java/tutorlink/command/studentcommand/addStudentCommand.java

@@ -1,4 +1,4 @@
-package tutorlink.command.student_command;
+package tutorlink.command.studentcommand;
 
 import tutorlink.student.Student;
 

src/test/java/tutorlink/command/assignmentcommand/AddAssignmentCommandTest.java

@@ -0,0 +1,23 @@
+package tutorlink.command.assignmentcommand;
+
+import org.junit.jupiter.api.Test;
+import tutorlink.assignment.Assignment;
+
+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AddAssignmentCommandTest {
+    @Test
+    void execute_addOne_expectOne() {
+        // setup
+        ArrayList<Assignment> assignmentList = new ArrayList<>();
+        Assignment assignment1 = new Assignment("Test_1",100,100,0.2);
+        AddAssignmentCommand addAssignmentCommand = new AddAssignmentCommand(assignment1);
+        // execute
+        addAssignmentCommand.execute(assignmentList);
+        assertFalse(assignmentList.isEmpty());
+        assertEquals(1, assignmentList.size());
+        assertEquals(assignment1, assignmentList.get(0));
+    }
+}