From 795eec1a433a517d16d9670d06ecb2e1ca815943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CSulemaMalik=E2=80=9D?=
<“WMIS228@live.rhul.ac.uk”>
Date: Fri, 1 Nov 2024 06:12:02 +0000
Subject: [PATCH] Add recovered files
---
.../exception/NoGradeAvailableException.java | 0
.../exception/NoRegistrationException.java | 0
.../NoGradeAvailableExceptionTest.java | 0
.../NoRegistrationExceptionTest.java | 0
.../java/uk/ac/rhul/cs2800/model/Grade.java | 34 -------
.../java/uk/ac/rhul/cs2800/model/Module.java | 32 -------
.../uk/ac/rhul/cs2800/model/Registration.java | 27 ------
.../java/uk/ac/rhul/cs2800/model/Student.java | 89 -------------------
.../uk/ac/rhul/cs2800/model/GradeTest.java | 24 -----
.../uk/ac/rhul/cs2800/model/ModuleTest.java | 18 ----
.../rhul/cs2800/model/RegistrationTest.java | 18 ----
.../uk/ac/rhul/cs2800/model/StudentTest.java | 52 -----------
12 files changed, 294 deletions(-)
rename CW1/StudentGradeManagment/src/{test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src => }/main/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableException.java (100%)
rename CW1/StudentGradeManagment/src/{test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src => }/main/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationException.java (100%)
rename CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/{cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/exception => }/NoGradeAvailableExceptionTest.java (100%)
rename CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/{cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/exception => }/NoRegistrationExceptionTest.java (100%)
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Grade.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Module.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Registration.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Student.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/GradeTest.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/ModuleTest.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/RegistrationTest.java
delete mode 100644 CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/StudentTest.java
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableException.java b/CW1/StudentGradeManagment/src/main/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableException.java
similarity index 100%
rename from CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableException.java
rename to CW1/StudentGradeManagment/src/main/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableException.java
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationException.java b/CW1/StudentGradeManagment/src/main/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationException.java
similarity index 100%
rename from CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationException.java
rename to CW1/StudentGradeManagment/src/main/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationException.java
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableExceptionTest.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/NoGradeAvailableExceptionTest.java
similarity index 100%
rename from CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/exception/NoGradeAvailableExceptionTest.java
rename to CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/NoGradeAvailableExceptionTest.java
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationExceptionTest.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/NoRegistrationExceptionTest.java
similarity index 100%
rename from CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/exception/NoRegistrationExceptionTest.java
rename to CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/NoRegistrationExceptionTest.java
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Grade.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Grade.java
deleted file mode 100644
index 3557cea..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Grade.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-/**
- * This class represents a grade with both a numeric score and a module it belongs to.
- */
-public class Grade {
-
- private int score;
- private Module module;
-
- /**
- * Constructs a Grade with the score and module.
- * score of the grade module associated with the grade
- */
-
- public Grade(int score, Module module) {
- this.score = score;
- this.module = module;
- }
-
- public int getScore() {
- return score;
- }
-
- public Module getModule() {
- return module;
- }
-
-
- public void setScore(int score) {
- this.score = score;
- }
-
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Module.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Module.java
deleted file mode 100644
index beed787..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Module.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-/**
- * Represents a module with its code, name, and mandatory status.
- */
-
-public class Module {
- private String code;
- private String name;
- private boolean nmc;
-
- /**
- * Defines a module, including its code, name, and whether it's a mandatory module.
- */
- public Module(String code, String name, boolean nmc) {
- this.code = code;
- this.name = name;
- this.nmc = nmc;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getName() {
- return name;
- }
-
- public boolean isNmc() {
- return nmc;
- }
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Registration.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Registration.java
deleted file mode 100644
index 7fb54ff..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Registration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-/**
- * Registers a student to a specified module.
- */
-
-public class Registration {
- private Student student;
- private Module module;
-
- /**
- * Registers a student to a specified module.
- */
-
- public Registration(Student student, Module module) {
- this.student = student;
- this.module = module;
- }
-
- public Student getStudent() {
- return student;
- }
-
- public Module getModule() {
- return module;
- }
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Student.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Student.java
deleted file mode 100644
index f50c16d..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/main/java/uk/ac/rhul/cs2800/model/Student.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import uk.ac.rhul.cs2800.model.exception.NoGradeAvailableException;
-
-/**
- * Represents a student with personal and academic information.
- */
-public class Student {
-
- private Long id;
- private String grade;
- private String firstName;
- private String lastName;
- private String username;
- private String email;
- private List<Grade> grades = new ArrayList<>();
- private List<Module> modules = new ArrayList<>();
-
- /**
- * Represents a student with basic identifying information. Each student has a unique ID, personal
- * details, and contact information.
- */
-
- public Student(Long id, String firstName, String lastName, String username, String email) {
- this.id = id;
- this.firstName = firstName;
- this.lastName = lastName;
- this.username = username;
- this.email = email;
- }
-
- /**
- * Adds a grade to the student's list of grades.
- *
- * @param g the grade to add
- */
-
- public void addGrade(Grade g) {
- grades.add(g);
- }
-
- /**
- * Adds a grade to the student's list of grades.
- *
- *
- */
-
- public Grade getGrade(Module m) throws NoGradeAvailableException {
- for (Grade grade : grades) {
- if (grade.getModule().equals(m)) {
- return grade;
- }
- }
- throw new NoGradeAvailableException("No grade available for module: " + m.getName());
- }
-
- /**
- * Adds a grade to the student's list of grades.
- *
- * @param m the grade to add
- */
- public void registerModule(Module m) {
- modules.add(m);
- }
-
- /**
- * 0 if grade is empty.
- */
-
- public float computeAverage() {
- if (grades.isEmpty()) {
- return 0;
- }
- int total = 0;
- for (Grade grade : grades) {
- total += grade.getScore();
- }
- return (float) total / grades.size();
- }
-
-
-
- public List<Module> getModules() {
- return modules;
- }
-
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/GradeTest.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/GradeTest.java
deleted file mode 100644
index 3b16fcf..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/GradeTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class GradeTest {
-
- @Test
- void testGradeInitialization() {
- Module module = new Module("CS2800", "CS4600", false);
- Grade grade = new Grade(50, module);
-
- equals(50);
- assertEquals(module, grade.getModule());
- }
-
- @Test
- void testSetScore() {
- Grade grade = new Grade(50, null);
- grade.setScore(95);
- assertEquals(95, grade.getScore());
- }
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/ModuleTest.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/ModuleTest.java
deleted file mode 100644
index 60cf663..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/ModuleTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
-import org.junit.jupiter.api.Test;
-
-class ModuleTest {
-
- @Test
- void testModuleInitialization() {
- Module module = new Module("CS2800", "ComputerScience", false);
-
- assertEquals("CS2800", module.getCode());
- assertEquals("ComputerScience", module.getName());
- assertFalse(module.isNmc());
- }
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/RegistrationTest.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/RegistrationTest.java
deleted file mode 100644
index f658d75..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/RegistrationTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-class RegistrationTest {
-
- @Test
- void testRegistrationInitialization() {
- Student student = new Student(1L, "Anna", "Angelina", "Alina", "Izzy");
- Module module = new Module("CS2800", "ComputerScience", false);
- Registration registration = new Registration(student, module);
-
- assertEquals(student, registration.getStudent());
- assertEquals(module, registration.getModule());
- }
-}
diff --git a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/StudentTest.java b/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/StudentTest.java
deleted file mode 100644
index 1fbedc3..0000000
--- a/CW1/StudentGradeManagment/src/test/java/uk/ac/rhul/cs2800/model/cs2800-lab-2024/CW1/StudentGradeManagement/src/test/java/uk/ac/rhul/cs2800/model/StudentTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package uk.ac.rhul.cs2800.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import uk.ac.rhul.cs2800.model.exception.NoGradeAvailableException;
-
-
-class StudentTest {
-
- private Student student;
- private Module module;
- private Grade grade;
-
-
- @BeforeEach
- void setUp() {
- student = new Student(1L, "Anna", "Angelina", "Alina", "Izzy");
- module = new Module("CS2800", "ComputerScience", false);
- grade = new Grade(85, module);
- }
-
- @Test
- void testAddGrade() throws NoGradeAvailableException {
- student.addGrade(grade);
- assertEquals(grade, student.getGrade(module));
- }
-
- @Test
- void testComputeAverage() {
- student.addGrade(new Grade(50, module));
- student.addGrade(new Grade(90, new Module("CS2800", "ComputerScience", false)));
- assertEquals(70.0, student.computeAverage(), 0.01);
- }
-
- @Test
- void testGetGradeThrowsExceptionWhenNoGrade() {
- Module newModule = new Module("CS2800", "ComputerScience", false);
- assertThrows(NoGradeAvailableException.class, () -> student.getGrade(newModule));
- }
-
- @Test
- void testRegisterModule() {
- student.registerModule(module);
-
- assertTrue(student.getModules().contains(module));
- }
-}
--
GitLab