diff --git a/.astro/astro/content.d.ts b/.astro/astro/content.d.ts index 4aa0015..25296b2 100644 --- a/.astro/astro/content.d.ts +++ b/.astro/astro/content.d.ts @@ -327,6 +327,13 @@ declare module 'astro:content' { collection: "docs"; data: InferEntrySchema<"docs"> } & { render(): Render[".mdx"] }; +"developing/testing/cli.mdx": { + id: "developing/testing/cli.mdx"; + slug: "developing/testing/cli"; + body: string; + collection: "docs"; + data: InferEntrySchema<"docs"> +} & { render(): Render[".mdx"] }; "developing/testing/configuring.mdx": { id: "developing/testing/configuring.mdx"; slug: "developing/testing/configuring"; diff --git a/astro.config.mjs b/astro.config.mjs index 3aa2bfd..3ca7f45 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -88,6 +88,10 @@ export default defineConfig({ label: 'Configuring Tests', link: 'developing/testing/configuring', }, + { + label: 'CLI & Automated Tests', + link: 'developing/testing/cli', + }, { label: 'Troubleshooting', link: 'developing/testing/troubleshooting', diff --git a/src/content/docs/developing/testing/Testing_CLI.png b/src/content/docs/developing/testing/Testing_CLI.png new file mode 100644 index 0000000..4dedfe5 Binary files /dev/null and b/src/content/docs/developing/testing/Testing_CLI.png differ diff --git a/src/content/docs/developing/testing/Testing_GitHubAction.png b/src/content/docs/developing/testing/Testing_GitHubAction.png new file mode 100644 index 0000000..162d311 Binary files /dev/null and b/src/content/docs/developing/testing/Testing_GitHubAction.png differ diff --git a/src/content/docs/developing/testing/Testing_TestProfiles.png b/src/content/docs/developing/testing/Testing_TestProfiles.png index f75129a..f0382f3 100644 Binary files a/src/content/docs/developing/testing/Testing_TestProfiles.png and b/src/content/docs/developing/testing/Testing_TestProfiles.png differ diff --git a/src/content/docs/developing/testing/cli.mdx b/src/content/docs/developing/testing/cli.mdx new file mode 100644 index 0000000..41fdf0c --- /dev/null +++ b/src/content/docs/developing/testing/cli.mdx @@ -0,0 +1,146 @@ +--- +title: CLI & Automated Tests +--- + +import { Aside, CardGrid, Card, Steps } from '@astrojs/starlight/components'; + +
+ + Version + + + Installs + +
+ +The [IBM i Testing CLI](https://www.npmjs.com/package/@ibm/itest) (`itest`) is a companion to the [IBM i Testing](https://marketplace.visualstudio.com/items?itemName=IBM.vscode-ibmi-testing) VS Code extension, which allows you to run unit tests and generate code coverage results for RPG and COBOL programs on IBM i. With this CLI, you can run tests in your terminal on your local PC or in PASE on IBM i. This enables you to even script the execution of tests in a CI/CD pipeline. + +![](Testing_CLI.png) + +## Installation + +This CLI can be used on your local PC or directly on IBM i. In either case, it can be installed globally via NPM: + +```sh +npm i -g itest +``` + +## Usage + +Once installed, you can run the `itest` command in your terminal along with various [options](#options) which configure what tests are run, the environment they are run in, how to run them, and what logs to generate. At a minimum, there are a few options that must be specified based on where you are running the command from and where your tests are located: + +1. **Local PC + Local Tests**: Specify the `--ld, --local-directory [path]` option to point to a local directory containing your test files and the `--id, --ifs-directory [path]` option to point to the IFS directory on your IBM i where the project will be deployed. +2. **Local PC + Tests in Library**: Specify the `--l, --library ` option to point to a library on your IBM i containing your test members. +3. **IBM i + Tests in IFS**: Specify the `--id, --ifs-directory [path]` option to point to an IFS directory on your IBM i containing your test files. +4. **IBM i + Tests in Library**: Specify the `--l, --library ` option to point to a library on your IBM i containing your test members. + +Check out the [examples](#examples) section below for more details. + + + +## Options + +Listed below are all the available options for the `itest` command. For convenience, use the `itest --help` command to see all these options and their descriptions directly in your terminal. + +| Flag | Description | +|------------------------------------------------|------------------------------------------------------------------------------| +| `--v, --version` | Display the version number | +| `--ld, --local-directory [path]` | Local directory containing tests (preset: ".") | +| `--id, --ifs-directory [path]` | IFS directory containing containing tests or deploy directory (preset: ".") | +| `--l, --library ` | Library containing tests. | +| `--sf, --source-files ` | Source files to search for tests. (default: ["QTESTSRC"]) | +| `--ll, --library-list ` | Libraries to add to the library list. | +| `--cl, --current-library ` | The current library to use for the test run. | +| `--cc, --code-coverage [ccLvl]` | Run with code coverage (choices: "*LINE", "*PROC", preset: "*LINE") | +| `--ct, --coverage-thresholds ` | Set the code coverage thresholds (yellow and green). (default: ["60","90"]) | +| `--sc, --skip-compilation` | Skip compilation | +| `--sr, --summary-report [path]` | Save summary report (preset: "./.itest/summary-report.md") | +| `--tr, --test-result [path]` | Save test result logs (preset: "./.itest/test-result.log") | +| `--to, --test-output [path]` | Save test output logs (preset: "./.itest/test-output.log") | +| `--co, --command-output [path]` | Save command output logs (preset: "./.itest/command-output.log") | +| `--h, --help` | Display help for command | + + + +## Examples + +1. Run tests in local directory: + ```sh + itest --ld . --id /home/USER/builds/ibmi-company_system --ll RPGUNIT QDEVTOOLS --cl MYLIB --cc + ``` + + *This first example command will deploy the contents of the current directory on your PC to the specified IFS directory, setup both the library list and current library, and finally run all tests with code coverage.** + +2. Run tests in IFS directory: + ```sh + itest --id /home/USER/builds/ibmi-company_system --ll RPGUNIT QDEVTOOLS --cl MYLIB --cc + ``` + + *This second example is the exact same as the first one except it is run on your on IBM i because no local directory option is specified.* + +3. Run tests in library: + ```sh + itest --l RPGUTILS --ll RPGUNIT QDEVTOOLS --cl RPGUTILS --cc + ```` + + *This third example is similar to the second except it will run tests in the specified library. This command can be run both on your local PC or IBM i.* + +4. Run tests in library (more customized): + ```sh + itest --l RPGUTILS --ll RPGUNIT QDEVTOOLS --cl RPGUTILS --cc *PROC --ct 70 95 --sr --tr --to --co + ```` + + *This fourth example is similar to the third one except it generates procedure coverage, customizes the yellow and green coverage thresholds, and saves all logs to the default log directory (`.itest`).* + +## Logs + +There are various logs that can be generated by the CLI to help you understand the results of your tests and diagnose any failures or issues. By default, all logs are saved to the `.itest` in the current working directory, but you can customize the path for each log via the corresponding option. The following logs can be generated: + +* **Summary Report**: Markdown file that with a summary of the test results and code coverage results in a human readable format. This report is particularly useful when running tests in a CI/CD pipeline. +* **Test Result**: Log file with a copy of the standard output of this command. +* **Test Output**: Log file with information about which tests are discovered, what test configuration is used, all standard output/errors for any commands, and more. It will have the equivalent of what is shown in the [IBM i Testing output channel](../troubleshooting/#extension-logs) when running tests in VS Code. This log file is the most useful for diagnosing issues. +* **Command Output**: Log file with standard output/errors and error codes for all commands run on the IBM i. It will have the equivalent of what is shown in the `Code for IBM i` output channel when running tests in VS Code. + +## Automated Tests + +Given that this CLI tool can be used to run tests from the command line, it can be easily integrated into any CI/CD pipeline. As a reference, use the below GitHub Action workflow snippet which uses the `itest` command to run tests and generate code coverage for the `my-sample-application` project: + +```yaml +- name: Run Unit Tests + id: test + run: | + itest \ + --ld . \ + --id /home/$IBMI_USER/builds/my-sample-application \ + --ll MYAPP RPGUNIT QDEVTOOLS \ + --cl MYAPP \ + --cc --sr --tr --to --co + env: + IBMI_HOST: ${{ secrets.IBMI_HOST }} + IBMI_USER: ${{ secrets.IBMI_USER }} + IBMI_PASSWORD: ${{ secrets.IBMI_PASSWORD }} + IBMI_SSH_PORT: ${{ secrets.IBMI_SSH_PORT }} +``` + +This step can be used in a workflow that is triggered on pull requests to ensure that all tests pass and code coverage is acceptable before allowing the pull request to be merged. The markdown summary report can even be rendered in the PR comments making it easier for reviewers to see the results. + +![](Testing_GitHubAction.png) + +Check out the full [pr.yaml](https://github.com/IBM/ibmi-company_system/blob/main/.github/workflows/pr.yaml) file example in the [ibmi-company_system](https://github.com/IBM/ibmi-company_system) repository. This workflow showcases an end-to-end CI/CD pipeline that consists of build, impact analysis, unit tests, and code coverage! \ No newline at end of file diff --git a/src/content/docs/developing/testing/configuring.mdx b/src/content/docs/developing/testing/configuring.mdx index 0571a0a..d5e7116 100644 --- a/src/content/docs/developing/testing/configuring.mdx +++ b/src/content/docs/developing/testing/configuring.mdx @@ -189,50 +189,49 @@ Here is an example with all execution parameters set in the `testing.json` file: - \ No newline at end of file + } +} +``` +**Compile Command**: +```js +MYLIB/MYCMD TSTCMD(RPGUNIT/RUCRTRPG TSTPGM(MYUSER/TEMPDET) +SRCSTMF('/home/MYUSER/builds/ibmi-company_system/qtestsrc/empdet.test.sqlrpgle') +TGTCCSID(*JOB) DBGVIEW(*SOURCE) COPTION(*EVENTF) RPGPPOPT(*LVL2) +INCDIR('''/home/MYUSER/builds/ibmi-company_system''')) DESC('My description') +``` + +**Execution Command**: +```js +MYLIB/MYCMD CALLCMD(RPGUNIT/RUCALLTST TSTPGM(MYUSER/TEMPDET) ORDER(*REVERSE) +DETAIL(*ALL) OUTPUT(*ALLWAYS) LIBL(*CURRENT) JOBD(*DFT) RCLRSC(*NO) +XMLSTMF('/tmp/testing/vscode-ibmi-testing/RPGUNIT/TEMPDET_1751646914682.xml')) +DESC('My description') +``` \ No newline at end of file diff --git a/src/content/docs/developing/testing/overview.mdx b/src/content/docs/developing/testing/overview.mdx index baf7e87..d26049c 100644 --- a/src/content/docs/developing/testing/overview.mdx +++ b/src/content/docs/developing/testing/overview.mdx @@ -19,7 +19,7 @@ The [IBM i Testing](https://marketplace.visualstudio.com/items?itemName=IBM.vsco * 👨‍💻 **Run Tests**: Visualize and run tests suites out of local files or source members. * ✍️ **Generate Stubs**: Generate test stubs for individual test cases or an entire test suite. -* ⚙️ **Configure Tests**: Configure parameters to compile (`RUCRTRPG`/`RUCRTCLB`) and run (`RUCALLTST`) tests. +* ⚙️ **Configure Tests**: Configure parameters to compile (`RUCRTRPG`/`RUCRTCBL`) and run (`RUCALLTST`) tests. * 📋 **View Test Results**: View detailed test results along with inline failure/error messages. * 🎯 **Generate Code Coverage**: View line and procedure level code coverage results as an overlay in the editor. diff --git a/src/content/docs/developing/testing/running.mdx b/src/content/docs/developing/testing/running.mdx index f39ce0d..28f34f9 100644 --- a/src/content/docs/developing/testing/running.mdx +++ b/src/content/docs/developing/testing/running.mdx @@ -23,7 +23,7 @@ From here you can hover on any test case, test suite, folder, library, or source 1. **Deployment *(Local Files Only)***: The contents of your workspace folder will be deployed to a directory in the IFS. The default deployment directory suggested will be of the following format: `/home//builds//`. This is the same deployment process that takes place when you compile any local files via Code for IBM i. 2. **Read Compile Configuration**: To customize the parameters used to compile your tests, a global and directory specific test configuration file will be read. Learn more about this in the [Compile Configuration](../configuring/#compile-configuration) section. - 3. **Compilation**: Given the compile configuration and tests selected for execution, the tests will be compiled via the `RUCRTRPG` or `RUCRTCLB` command. This step will be skipped for tests which have had no change since the last compilation. + 3. **Compilation**: Given the compile configuration and tests selected for execution, the tests will be compiled via the `RUCRTRPG` or `RUCRTCBL` command. This step will be skipped for tests which have had no change since the last compilation. 4. **Execution**: The compiled test program will be executed via the `RUCALLTST` command. The parameters for this command are configured in the VS Code settings or the test configuration file. Learn more about this in the [Execution Configuration](../configuring/#execution-configuration) section. @@ -56,7 +56,7 @@ The relevant files under test will also be highlighted in the editor where the e ## Test Profiles -The extension provides two kinds of test profiles (**Run** and **Coverage**) which represent different ways of executing tests. The standard profiles only compile the test if they have not already been compiled since loading them in. Variants of these profiles are also available that always re-compile the test (refer to the profiles with the `(Compile)` suffix). +The extension provides two kinds of test profiles (**Run** and **Coverage**) which represent different ways of executing tests. The standard profiles only compile the test if they have not already been compiled since loading them in. Variants of these profiles are also available which can always re-compile the test (refer to the profiles with the `(Force Compile)` suffix) or skip compilation entirely (refer to the profiles with the `(Skip Compile)` suffix). To run a set of tests with a specific profile: