Merge branch 'main' into watchtower-cleanup

Author: TheDavSmasher

.github/workflows/docker-publish.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   build-and-push-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     permissions:
       contents: read
       packages: write
@@ -25,10 +25,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 22 # Compatible Node.js version
-      
-      - 
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
 
       -
         name: Set up Docker Buildx

docs/getting-started/db-insert-statements/insert-rubric-database.md

@@ -10,14 +10,15 @@ The primary things that needs to be updated on an ongoing basis are:
 
 ## Statements
 > [!NOTE]
-> Updated as of **SUMMER 2024**
+> Updated as of **WINTER 2026**
 
 ```mysql
 INSERT INTO rubric_config (phase, type, category, criteria, points, rubric_id) VALUES
 ('GitHub', 'GITHUB_REPO', 'GitHub Repository', 'Two Git commits: one for creating the repository and another for `notes.md`.', 15, '_6829'),
 ('Phase0', 'GIT_COMMITS', 'Git Commits', 'Necessary commit amount', 0, '90342_649'),
 ('Phase0', 'PASSOFF_TESTS', 'Functionality', 'All pass off test cases succeed', 125, '_1958'),
 ('Phase1', 'GIT_COMMITS', 'Git Commits', 'Necessary commit amount', 0, '90342_7800'),
+('Phase1', 'EXTRA_CREDIT', 'Extra Credit', 'Castling and En Passant', 10, '90342_7835'),
 ('Phase1', 'PASSOFF_TESTS', 'Functionality', 'All pass off test cases succeed', 125, '_1958'),
 ('Phase3', 'GIT_COMMITS', 'Git Commits', 'Necessary commit amount', 0, '90344_2520'),
 ('Phase3', 'PASSOFF_TESTS', 'Web API Works', 'All pass off test cases in StandardAPITests.java succeed', 125, '_5202'),

docs/getting-started/db-insert-statements/update-rubric-database.md

@@ -13,7 +13,14 @@ The primary things that needs to be updated on an ongoing basis are:
 
 ## Statements
 > [!NOTE]
-> Updated as of **SUMMER 2024**
+> Updated as of **WINTER 2026**
+
+```mysql
+INSERT INTO rubric_config (phase, type, category, criteria, points, rubric_id)
+VALUES ('Phase1', 'EXTRA_CREDIT', 'Extra Credit', 'Castling and En Passant', 10, '90342_7835')
+```
+
+If updating prior to **SUMMER 2024**, run these statements before running the ones above.
 
 ```mysql
 ALTER TABLE rubric_config ADD rubric_id VARCHAR(15);

package.json

@@ -0,0 +1,12 @@
+{
+  "name": "autograder",
+  "version": "0.0.0",
+  "private": true,
+  "workspaces": [
+    "src/main/resources/frontend"
+  ],
+  "scripts": {
+    "frontend": "npm run start -w src/main/resources/frontend",
+    "frontend:host": "npm run start:host -w src/main/resources/frontend"
+  }
+}

src/main/java/edu/byu/cs/autograder/Grader.java

@@ -10,6 +10,7 @@
 import edu.byu.cs.autograder.score.LateDayCalculator;
 import edu.byu.cs.autograder.quality.QualityGrader;
 import edu.byu.cs.autograder.score.Scorer;
+import edu.byu.cs.autograder.test.ExtraCreditGrader;
 import edu.byu.cs.autograder.test.PassoffTestGrader;
 import edu.byu.cs.autograder.test.PreviousPhasePassoffTestGrader;
 import edu.byu.cs.autograder.test.UnitTestGrader;
@@ -133,6 +134,7 @@ private Rubric evaluateProject(RubricConfig rubricConfig, CommitVerificationResu
                     // This code is violating the open-closed principle.
                     case PASSOFF_TESTS -> new PassoffTestGrader(gradingContext).runTests();
                     case UNIT_TESTS -> new UnitTestGrader(gradingContext).runTests();
+                    case EXTRA_CREDIT -> new ExtraCreditGrader(gradingContext).runTests();
                     case QUALITY -> new QualityGrader(gradingContext).runQualityChecks();
                     case GITHUB_REPO -> new GitHubAssignmentGrader().grade(commitVerificationResult);
                     case GIT_COMMITS, GRADING_ISSUE -> null;

src/main/java/edu/byu/cs/autograder/score/Scorer.java

@@ -417,6 +417,11 @@ private ScorePair getScores(Rubric rubric) throws GradingException, DataAccessEx
             throw new GradingException("Total possible points for phase " + gradingContext.phase() + " is 0");
         }
 
+        if (DaoService.getRubricConfigDao().getRubricConfig(gradingContext.phase()) instanceof RubricConfig rubricConfig &&
+                rubricConfig.items().get(Rubric.RubricType.EXTRA_CREDIT) instanceof RubricConfig.RubricConfigItem item) {
+            totalPossiblePoints -= item.points();
+        }
+
         float score = 0;
         float rawScore = 0;
         for (Rubric.RubricType type : Rubric.RubricType.values()) {

src/main/java/edu/byu/cs/autograder/test/ExtraCreditGrader.java

@@ -0,0 +1,70 @@
+package edu.byu.cs.autograder.test;
+
+import edu.byu.cs.autograder.GradingContext;
+import edu.byu.cs.autograder.GradingException;
+import edu.byu.cs.model.Rubric;
+import edu.byu.cs.model.TestNode;
+import edu.byu.cs.model.TestOutput;
+import edu.byu.cs.util.PhaseUtils;
+
+import java.io.File;
+import java.util.*;
+
+/**
+ * Runs and scores the extra credit tests for the phase a submission is graded for
+ */
+public class ExtraCreditGrader extends TestGrader {
+    public ExtraCreditGrader(GradingContext gradingContext) {
+        super(gradingContext);
+    }
+
+    @Override
+    protected String name() {
+        return "extra credit";
+    }
+
+    @Override
+    protected Set<File> testsToCompile() {
+        return Set.of(phaseTests);
+    }
+
+    @Override
+    protected Set<String> packagesToTest() throws GradingException {
+        return PhaseUtils.extraCreditPackagesToTest(gradingContext.phase());
+    }
+
+    @Override
+    protected String testName() {
+        return "Extra Credit";
+    }
+
+    @Override
+    protected float getScore(TestOutput testOutput) {
+        TestNode testResults = testOutput.root();
+        float score = 0;
+
+        for (TestNode child : testResults.getChildren().values()) {
+            score += (float) Math.floor((float) child.getNumTestsPassed() /
+                    (child.getNumTestsPassed() + child.getNumTestsFailed()));
+        }
+
+        return score / testResults.getChildren().size();
+    }
+
+    @Override
+    protected String getNotes(TestOutput testOutput) {
+        if (testOutput.root() == null) return "No tests were run";
+
+        return "Extra credit tests: +" + (getScore(testOutput) * PhaseUtils.extraCreditScore(gradingContext.phase()));
+    }
+
+    @Override
+    protected Rubric.RubricType rubricType() {
+        return Rubric.RubricType.EXTRA_CREDIT;
+    }
+
+    @Override
+    protected Set<String> modulesToCheckCoverage() {
+        return Set.of();
+    }
+}

src/main/java/edu/byu/cs/autograder/test/PassoffTestGrader.java

@@ -34,11 +34,6 @@ protected Set<String> packagesToTest() throws GradingException {
         return PhaseUtils.passoffPackagesToTest(gradingContext.phase());
     }
 
-    @Override
-    protected Set<String> extraCreditTests() {
-        return PhaseUtils.extraCreditTests(gradingContext.phase());
-    }
-
     @Override
     protected String testName() {
         return "Passoff Tests";
@@ -48,25 +43,10 @@ protected String testName() {
     protected float getScore(TestOutput testOutput) {
         TestNode testResults = testOutput.root();
         float totalStandardTests = testResults.getNumTestsFailed() + testResults.getNumTestsPassed();
-        TestNode extraCredit = testOutput.extraCredit();
-        float totalECTests = extraCredit != null ? extraCredit.getNumTestsPassed() + extraCredit.getNumTestsFailed() : 0f;
 
         if (totalStandardTests == 0) return 0;
 
-        float score = testResults.getNumTestsPassed() / totalStandardTests;
-        if (totalECTests == 0) return score;
-
-        // extra credit calculation
-        if (score < 1f) return score;
-        Map<String, Float> ecScores = getECScores(extraCredit);
-        float extraCreditValue = PhaseUtils.extraCreditValue(gradingContext.phase());
-        for (String category : extraCreditTests()) {
-            if (ecScores.get(category) == 1f) {
-                score += extraCreditValue;
-            }
-        }
-
-        return score;
+        return testResults.getNumTestsPassed() / totalStandardTests;
     }
 
     @Override
@@ -83,11 +63,6 @@ protected String getNotes(TestOutput testOutput) {
         else {
             notes.append(testResults.getNumTestsFailed() + "/" + totalRequiredTests + " required tests failed");
         }
-        Map<String, Float> ecScores = getECScores(testOutput.extraCredit());
-        float extraCreditValue = PhaseUtils.extraCreditValue(gradingContext.phase());
-        float totalECPoints = ecScores.values().stream().reduce(0f, (f1, f2) -> (float) (f1 + Math.floor(f2))) * extraCreditValue;
-
-        if (totalECPoints > 0f) notes.append("\nExtra credit tests: +").append(totalECPoints * 100).append("%");
 
         return notes.toString();
     }
@@ -97,28 +72,6 @@ protected Rubric.RubricType rubricType() {
         return Rubric.RubricType.PASSOFF_TESTS;
     }
 
-
-    private Map<String, Float> getECScores(TestNode results) {
-        Map<String, Float> scores = new HashMap<>();
-        if(results == null) return scores;
-
-        Queue<TestNode> unchecked = new PriorityQueue<>();
-        unchecked.add(results);
-
-        while (!unchecked.isEmpty()) {
-            TestNode node = unchecked.remove();
-            for (TestNode child : node.getChildren().values()) {
-                if (child.getEcCategory() != null) {
-                    scores.put(child.getEcCategory(), (float) child.getNumTestsPassed() /
-                            (child.getNumTestsPassed() + child.getNumTestsFailed()));
-                    unchecked.remove(child);
-                } else unchecked.add(child);
-            }
-        }
-
-        return scores;
-    }
-
     @Override
     protected Set<String> modulesToCheckCoverage() {
         return Set.of();

src/main/java/edu/byu/cs/autograder/test/PreviousPhasePassoffTestGrader.java

@@ -39,7 +39,7 @@ protected Set<String> packagesToTest() throws GradingException {
     }
 
     @Override
-    protected Set<String> extraCreditTests() throws GradingException {
+    protected Set<String> ignoredTests() throws GradingException {
         return allPreviousPhases(PhaseUtils::extraCreditTests);
     }
 
@@ -84,7 +84,6 @@ protected String testName() {
     @Override
     protected float getScore(TestOutput testResults) throws GradingException {
         if (testResults.root().getNumTestsFailed() == 0) return 1f;
-        testResults = new TestOutput(testResults.root(), null, testResults.coverage(), testResults.error());
         StringBuilder errorBuilder = new StringBuilder(ERROR_MESSAGE).append(" \nFailing tests: \n");
         failingTests(testResults.root(), errorBuilder);
         Rubric.Results results = Rubric.Results.testError(errorBuilder.toString(), testResults);

src/main/java/edu/byu/cs/autograder/test/TestAnalyzer.java

@@ -14,24 +14,19 @@
  * <b>Important: this class is ONLY compatible with the xml output on the JUnit standalone client</b><br/>
  */
 public class TestAnalyzer {
-
-    public record TestAnalysis(TestNode root, TestNode extraCredit) {}
-
     /**
      * Parses the output of the JUnit Console Runner
      *
      * @param junitXmlOutput   file containing test output
-     * @param extraCreditTests the names of the test files (excluding .java) worth bonus points. This cannot be null, but can be empty
+     * @param ignoredTests the names of the test files (excluding .java) to ignore. This cannot be null, but can be empty
      * @return the root of the test tree
      */
-    public TestAnalysis parse(File junitXmlOutput, Set<String> extraCreditTests) throws GradingException {
+    public TestNode parse(File junitXmlOutput, Set<String> ignoredTests) throws GradingException {
         TestNode root = new TestNode();
         root.setTestName("JUnit Jupiter");
-        TestNode extraCredit = new TestNode();
-        extraCredit.setTestName("JUnit Jupiter Extra Credit");
 
         if(!junitXmlOutput.exists()) {
-            return compileAnalysis(root, extraCredit);
+            return compileAnalysis(root);
         }
 
         String xml = FileUtils.readStringFromFile(junitXmlOutput);
@@ -44,14 +39,9 @@ public TestAnalysis parse(File junitXmlOutput, Set<String> extraCreditTests) thr
 
         int uniqueTestIndex = 0;
         for (TestSuite.TestCase testCase : suite.getTestcase()) {
-            TestNode base = root;
-            String ecCategory = null;
-            for (String category : extraCreditTests) {
-                if (testCase.getClassname().endsWith(category)) {
-                    ecCategory = category;
-                    base = extraCredit;
-                    break;
-                }
+            if (ignoredTests.stream().anyMatch(
+                    category -> testCase.getClassname().endsWith(category))) {
+                continue;
             }
 
             String name = testCase.getName();
@@ -66,7 +56,7 @@ public TestAnalysis parse(File junitXmlOutput, Set<String> extraCreditTests) thr
 
             TestNode node = new TestNode();
             node.setTestName(name);
-            TestNode parent = nodeForClass(base, testCase.getClassname());
+            TestNode parent = nodeForClass(root, testCase.getClassname());
             String uniqueTestNameKey = String.format("%s - %d", name, uniqueTestIndex++);
             parent.getChildren().put(uniqueTestNameKey, node);
 
@@ -75,13 +65,9 @@ public TestAnalysis parse(File junitXmlOutput, Set<String> extraCreditTests) thr
                 node.setErrorMessage(testCase.getFailure().getData());
             }
 
-            if (ecCategory != null) {
-                node.setEcCategory(ecCategory);
-                parent.setEcCategory(ecCategory);
-            }
         }
 
-        return compileAnalysis(root, extraCredit);
+        return compileAnalysis(root);
     }
 
     private TestNode nodeForClass(TestNode base, String name) {
@@ -102,11 +88,9 @@ private TestNode nodeForClass(TestNode base, String name) {
         else return nodeForClass(node, extra);
     }
 
-    private TestAnalysis compileAnalysis(TestNode root, TestNode extraCredit) {
+    private TestNode compileAnalysis(TestNode root) {
         TestNode.collapsePackages(root);
         TestNode.countTests(root);
-        TestNode.collapsePackages(extraCredit);
-        TestNode.countTests(extraCredit);
-        return new TestAnalysis(root, extraCredit);
+        return root;
     }
 }