Merge branch '510558017' into lab7

Author: as10968574

.github/workflows/lab-autograding.yml

@@ -23,6 +23,14 @@ jobs:
               with:
                   node-version: '20'
 
+
+            - uses: actions/checkout@v4
+              with:
+                  ref: "${{ github.event.pull_request.merge_commit_sha }}"
+                  fetch-depth: 1
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: latest
             - name: Extract lab number and Check no changes other than specific files
               uses: actions/github-script@v5
               id: lab
@@ -46,6 +54,8 @@ jobs:
                       const labNumber = labNumberMatch[1];
                       console.log(`Lab number: ${labNumber}`);
 
+                      console.log(`Lab number: ${labNumber}`)
+
                       const files = await github.rest.pulls.listFiles({ owner, repo, pull_number: issue_number });
                       const changedFiles = files.data.map((file) => file.filename);
                       const allowedFileRegex = /^lab\d+\/main_test.js$/;
@@ -55,6 +65,11 @@ jobs:
                       }
                       return labNumber;
 
+
+                      if (!changedFiles.every((file) => (allowedFileRegex.test(file) || specialChangedFiles.includes(file)))) {
+                        core.setFailed('The PR contains changes to files other than the allowed files.');
+                      }
+                      return labNumber;
             - name: Grading
               run: |
                   cd lab${{ steps.lab.outputs.result }}

lab1/main.js

@@ -42,14 +42,14 @@ class Student {
     }
 }
 
-// const myClass = new MyClass();
-// const names = ['John', 'Jane', 'Doe', 'Smith'];
-// names.forEach(name => {
-//     const student = new Student();
-//     student.setName(name);
-//     const newStudentId = myClass.addStudent(student);
-//     const newStudentName = myClass.getStudentById(newStudentId).getName();
-//     console.log('[+] Added student with id: %d, name: %s', newStudentId, newStudentName);
+ //const myClass = new MyClass();
+//const names = ['John', 'Jane', 'Doe', 'Smith'];
+//names.forEach(name => {
+    // const student = new Student();
+     //student.setName(name);
+   // const newStudentId = myClass.addStudent(student);
+     //const newStudentName = myClass.getStudentById(newStudentId).getName();
+  //  console.log('[+] Added student with id: %d, name: %s', newStudentId, newStudentName);
 // });
 
-module.exports = { MyClass, Student };
+module.exports = { MyClass, Student };

lab1/main_test.js

@@ -3,21 +3,39 @@ const assert = require('assert');
 const { MyClass, Student } = require('./main');
 
 test("Test MyClass's addStudent", () => {
-    // TODO
-    throw new Error("Test not implemented");
+    const myClass = new MyClass();
+    const student = new Student();
+    student.setName("John");
+    const index = myClass.addStudent(student);
+    assert.strictEqual(index, 0, "addStudent should return index 0 for the first student");
+    const notAStudent = {}; 
+    const indexForNotAStudent = myClass.addStudent(notAStudent);
+    assert.strictEqual(indexForNotAStudent, -1, "addStudent should return -1 when adding a non-Student instance");
 });
 
 test("Test MyClass's getStudentById", () => {
-    // TODO
-    throw new Error("Test not implemented");
+    const myClass = new MyClass();
+    const student = new Student();
+    student.setName("Jane");
+    const index = myClass.addStudent(student);
+    const fetchedStudent = myClass.getStudentById(index);
+    assert.strictEqual(fetchedStudent.getName(), "Jane", "getStudentById should retrieve the student with the correct name");
+    const invalidFetchedStudent = myClass.getStudentById(-1);
+    assert.strictEqual(invalidFetchedStudent, null, "getStudentById should return null for an invalid id");
 });
 
 test("Test Student's setName", () => {
-    // TODO
-    throw new Error("Test not implemented");
+    const student = new Student();
+    student.setName("Doe");
+    assert.strictEqual(student.name, "Doe", "setName should correctly set the student's name");
+    student.setName(123); 
+    assert.strictEqual(student.name, "Doe", "setName should not set name when the input is not a string");
 });
 
 test("Test Student's getName", () => {
-    // TODO
-    throw new Error("Test not implemented");
-});
+    const student = new Student();
+    student.setName("Smith");
+    assert.strictEqual(student.getName(), "Smith", "getName should return the correct name");
+    const newStudent = new Student();
+    assert.strictEqual(newStudent.getName(), '', "getName should return an empty string for a student without a name");
+});