From 3763e7149da213c56efd06c44c521b47a9364bca Mon Sep 17 00:00:00 2001 From: Tim Leavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Tue, 24 Jan 2023 09:30:10 -0500 Subject: [PATCH 1/3] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 46fd6cd..5d732be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: env: # ** FOR GENERAL USE, LIKELY NEED TO CHANGE: ** package: TestCoverage - container_image: intersystemsdc/iris-community:2019.4.0.383.0-zpm + container_image: intersystemsdc/iris-community:latest-zpm # ** FOR GENERAL USE, MAY NEED TO CHANGE: ** build_flags: -dev -verbose # Load in -dev mode to get unit test code preloaded @@ -81,4 +81,4 @@ jobs: if: always() with: name: ${{ steps.xunit-viewer.outputs.report-name }} - path: ${{ steps.xunit-viewer.outputs.report-dir }} \ No newline at end of file + path: ${{ steps.xunit-viewer.outputs.report-dir }} From 343c5c324c60df4b2b09bd9c3d4577aba26492e7 Mon Sep 17 00:00:00 2001 From: Tim Leavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Tue, 24 Jan 2023 09:32:57 -0500 Subject: [PATCH 2/3] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d732be..77160ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: env: # ** FOR GENERAL USE, LIKELY NEED TO CHANGE: ** package: TestCoverage - container_image: intersystemsdc/iris-community:latest-zpm + container_image: intersystemsdc/iris-community:latest # ** FOR GENERAL USE, MAY NEED TO CHANGE: ** build_flags: -dev -verbose # Load in -dev mode to get unit test code preloaded From 40e76dadfb83d573416758c9749dc594467bb1f5 Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Wed, 1 Feb 2023 08:48:28 -0500 Subject: [PATCH 3/3] Fix test Also update changelog, also reflects #18 --- CHANGELOG.md | 15 +++++++++++++++ .../UnitTest/TestCoverage/Unit/TestComplexity.cls | 5 +++-- module.xml | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..29cc46f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,15 @@ +# TestCoverage + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [2.1.4] - Unreleased + +### Fixed +- #18: EOL normalization in coverage.list +- #19: Update CI to latest IRIS community (and corresponding test updates) + +## [2.1.3] - 2022-03-30 +- Last released version before CHANGELOG existed. \ No newline at end of file diff --git a/internal/testing/unit_tests/UnitTest/TestCoverage/Unit/TestComplexity.cls b/internal/testing/unit_tests/UnitTest/TestCoverage/Unit/TestComplexity.cls index 33a27ac..e8942eb 100644 --- a/internal/testing/unit_tests/UnitTest/TestCoverage/Unit/TestComplexity.cls +++ b/internal/testing/unit_tests/UnitTest/TestCoverage/Unit/TestComplexity.cls @@ -225,8 +225,9 @@ Method FunctionWithAppropriateScope(pArgument As %String) Quit tSC } -/// Complexity: 7 (1 + UCQ) -/// Was 2 on earlier IRIS versions; UCQ adds a bit. +/// Complexity: 14 (1 + UCQ) +/// Was 2, and then 7, on earlier IRIS versions; UCQ adds a bit (and then a bit more) +/// At some point we might want to just remove this test Method MethodWithEmbeddedSQL() { &sql(select top 1 1 into :foo) diff --git a/module.xml b/module.xml index e7f92c0..401f3af 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ TestCoverage - 2.1.3 + 2.1.4 Run your typical ObjectScript %UnitTest tests and see which lines of your code are executed. Includes Cobertura-style reporting for use in continuous integration tools. module