Add test-ci build target with collected results

Author: amkillam

.config/dotnet-tools.json

@@ -15,6 +15,13 @@
         "docfx"
       ],
       "rollForward": false
+    },
+    "trx2junit": {
+      "version": "2.1.0",
+      "commands": [
+        "trx2junit"
+      ],
+      "rollForward": false
     }
   }
 }

.github/workflows/cd.yml

@@ -92,11 +92,11 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: build/docs/site
-          destination_dir: docs/${{ steps.get_version.outputs.VERSION }}
+          destination_dir: archive/${{ steps.get_version.outputs.VERSION }}
 
       - name: Update latest docs symlink
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: build/docs/site
-          destination_dir: docs/latest
+          destination_dir: docs

.github/workflows/ci.yml

@@ -71,7 +71,7 @@ jobs:
           git diff --exit-code || (echo "Code is not properly formatted. Please run 'cmake --build build --target format'" && exit 1)
 
       - name: Run tests
-        run: cmake --build build --target test
+        run: cmake --build build --target test-ci
 
       - name: Upload test results
         uses: actions/upload-artifact@v4
@@ -85,13 +85,13 @@ jobs:
       - name: Generate code coverage (Linux only)
         if: matrix.os == 'ubuntu-latest'
         run: |
-          dotnet test --configuration Release --collect:"XPlat Code Coverage" --results-directory ./coverage
+          dotnet test --configuration Release --collect:"XPlat Code Coverage" -f "net9.0" --results-directory OpenLanguage.Test/coverage
 
       - name: Upload coverage to Codecov (Linux only)
         if: matrix.os == 'ubuntu-latest'
         uses: codecov/codecov-action@v4
         with:
-          directory: ./coverage
+          directory: OpenLanguage.Test/coverage
           fail_ci_if_error: false
           verbose: true
 

.gitignore

@@ -2,6 +2,8 @@
 **/obj/
 **/bin/
 **/*.lst
+**/TestResults/
+**/coverage/
 
 # CMake build directories
 build/

CMakeLists.txt

@@ -70,6 +70,10 @@ set(SOLUTION_FILE "${CMAKE_SOURCE_DIR}/OpenLanguage.sln")
 set(PROJECT_DIR "${CMAKE_SOURCE_DIR}/OpenLanguage")
 set(GENERATED_DIR "${PROJECT_DIR}/Generated")
 set(TEST_PROJECT_DIR "${CMAKE_SOURCE_DIR}/OpenLanguage.Test")
+set(TEST_RESULTS_DIR "${TEST_PROJECT_DIR}/TestResults")
+set (TEST_RESULTS_TRX_BASENAME "TestResults.trx")
+set(TEST_RESULTS_TRX "${TEST_RESULTS_DIR}/${TEST_RESULTS_TRX_BASENAME}")
+set(TEST_RESULTS_XML "${TEST_RESULTS_DIR}/TestResults.xml")
 
 file (GLOB_RECURSE PROJECT_LIST "${PROJECT_DIR}/*.csproj")
 
@@ -174,12 +178,40 @@ add_custom_target(tool_restore
     COMMENT "Restoring dotnet tools"
 )
 
+add_custom_target(create_test_results_directory
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_RESULTS_DIR}
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMENT "Creating TestResults directory"
+)
 
+add_custom_target(run_tests
+    COMMAND dotnet test "${TEST_PROJECT_DIR}/OpenLanguage.Test.csproj"
+        --results-directory="${TEST_RESULTS_DIR}"
+        --configuration="Release"
+        --framework="net9.0"
+        --logger="trx\;LogFileName=\"${TEST_RESULTS_TRX}\""
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    DEPENDS build create_test_results_directory
+    COMMENT "Running unit tests. Outputting results to \"${TEST_RESULTS_TRX}\""
+)
+
+add_custom_target(convert_test_results
+    COMMAND dotnet tool run trx2junit "${TEST_RESULTS_TRX}" --output "${TEST_RESULTS_DIR}"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    DEPENDS run_tests tool_restore
+    COMMENT "Converting test results from TRX to JUnit XML format. Outputting results to \"${TEST_RESULTS_XML}\""
+)
 
 # Test target - dependent on build
+add_custom_target(test-ci
+    DEPENDS convert_test_results
+)
+
 add_custom_target(test
-    COMMAND dotnet test --configuration Release
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND dotnet test "${TEST_PROJECT_DIR}/OpenLanguage.Test.csproj"
+        --configuration="Release"
+        --framework="net9.0"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     DEPENDS build
     COMMENT "Running unit tests"
 )

OpenLanguage/SpreadsheetML/Formula/FormulaParser.cs

@@ -89,11 +89,8 @@ public static Ast.Node Parse(IEnumerable<char>? chars)
             {
                 return FormulaParser.Parse(chars);
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                Console.Error.WriteLine(
-                    $"Encountered error while trying to parse formula text: \"{e}\""
-                );
                 return null;
             }
         }

OpenLanguage/SpreadsheetML/Formula/Lang/Lex/formula.lex

@@ -51,7 +51,7 @@ QS_RUN              [^'\r\n\[\]]+
     private int sr_bracket_nesting_level = 0;
 
     // true iff the last significant token was an identifier or a right bracket
-    // Whitespace and newlines do NOT reset this; all other tokens do.
+    // Whitespace and newlines do not reset this; all other tokens do.
     private bool lastIdOrRbrack = false;
 
     // Tracks whether we are immediately after a leading '=' (ignoring whitespace)

hooks/pre-commit

@@ -7,9 +7,12 @@ set -e
 
 echo "Running pre-commit checks..."
 
+echo "Preparing CMake build..."
+cmake -B build -DCMAKE_BUILD_TYPE=Release
+
 # Run formatter
 echo "Formatting code..."
-cmake --build . --target format
+cmake --build build --target format
 
 # Check if there are any formatting changes
 if ! git diff --quiet; then
@@ -19,7 +22,7 @@ fi
 
 # Run tests
 echo "Running tests..."
-cmake --build . --target test
+cmake --build build --target test
 
 echo "Pre-commit checks passed!"
 exit 0