test: updated tests scripts

scripts/testScripts/check_pr.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Tests for Graded Instance Generation
+
 # Runs all scripts put in ./tests and makes sure that the run at some point contains provided lines.
 
 # This script runs more intensive tests, intended for PRs to main.
@@ -16,7 +18,7 @@ testsRun=0
 start=$(date +%s)
 
 # Loop through each script in the tests directory
-for file in pr_tests/*; do
+for file in pr_graded_tests/*; do
     ((testsRun++))
     # Check if file
     if [[ -f "$file" ]]; then

scripts/testScripts/check_pr_discrim.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Tests for Discriminating Instance Generation
+
+# Runs all scripts put in ./tests and makes sure that the run at some point contains provided lines
+
+# This script runs less intensive tests, intended for push requests rather than a PR
+
+# Lines being checked for
+lines=(
+    "too difficult instances for the favoured solver"
+)
+
+testsPassed=0
+testsRun=0
+
+start=$(date +%s)
+
+# Loop through each script in the tests directory
+for file in pr_discrim_tests/*; do
+    ((testsRun++))
+    # Check if file
+    if [[ -f "$file" ]]; then
+
+        # Run contents of file
+        output=$(bash "$file")
+        all_lines_found=true
+
+        # Check for each line in the array
+        for line in "${lines[@]}"; do
+            if [[ "$output" != *"$line"* ]]; then
+                all_lines_found=false
+                echo "Test $testsRun: $file failed, line not found: $line"
+            fi
+        done
+
+        # If all lines are found, count as passed
+        if $all_lines_found; then
+            echo "Test $testsRun: $file passed, all lines found in output"
+            ((testsPassed++))
+        fi
+    fi
+    # Record end time and calculate elapsed time
+    end=$(date +%s)
+    elapsedTime=$((end - start))
+
+    # Display time elapsed
+    echo "Time elapsed: $elapsedTime seconds"
+done
+
+# Final results
+if [[ "$testsRun" -eq "$testsPassed" ]]; then
+    printf "\e[32mAll tests passed: %d/%d! :D\e[0m\n" "$testsPassed" "$testsRun"
+    exit 0
+else
+    printf "\e[31mSome cases failing, only %d/%d passed.\e[0m\n" "$testsPassed" "$testsRun"
+    exit 1
+fi

scripts/testScripts/check_push.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Tests for graded instance generation
+
 # Runs all scripts put in ./tests and makes sure that the run at some point contains provided lines
 
 # This script runs less intensive tests, intended for push requests rather than a PR
@@ -16,7 +18,7 @@ testsRun=0
 start=$(date +%s)
 
 # Loop through each script in the tests directory
-for file in tests/*; do
+for file in push_graded_tests/*; do
     ((testsRun++))
     # Check if file
     if [[ -f "$file" ]]; then

scripts/testScripts/check_push_discrim.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Tests for discriminating instance generation
+
+# Runs all scripts put in ./tests and makes sure that the run at some point contains provided lines
+
+# This script runs less intensive tests, intended for push requests rather than a PR
+
+# Lines being checked for
+lines=(
+    "instances where the base solver wins"
+    "too easy instances for the base solver"
+    "Info of discriminating instances is saved to"
+)
+
+testsPassed=0
+testsRun=0
+
+start=$(date +%s)
+
+# Loop through each script in the tests directory
+for file in push_discrim_tests/*; do
+    ((testsRun++))
+    # Check if file
+    if [[ -f "$file" ]]; then
+
+        # Run contents of file
+        output=$(bash "$file")
+        all_lines_found=true
+
+        # Check for each line in the array
+        for line in "${lines[@]}"; do
+            if [[ "$output" != *"$line"* ]]; then
+                all_lines_found=false
+                echo "Test $testsRun: $file failed, line not found: $line"
+            fi
+        done
+
+        # If all lines are found, count as passed
+        if $all_lines_found; then
+            echo "Test $testsRun: $file passed, all lines found in output"
+            ((testsPassed++))
+        fi
+    fi
+    # Record end time and calculate elapsed time
+    end=$(date +%s)
+    elapsedTime=$((end - start))
+
+    # Display time elapsed
+    echo "Time elapsed: $elapsedTime seconds"
+done
+
+# Final results
+if [[ "$testsRun" -eq "$testsPassed" ]]; then
+    printf "\e[32mAll tests passed: %d/%d! :D\e[0m\n" "$testsPassed" "$testsRun"
+    exit 0
+else
+    printf "\e[31mSome cases failing, only %d/%d passed.\e[0m\n" "$testsPassed" "$testsRun"
+    exit 1
+fi