Skip to content

Commit 1216290

Browse files
committed
Fix unit tests under windows
1 parent 64cd667 commit 1216290

File tree

8 files changed

+57
-5
lines changed

8 files changed

+57
-5
lines changed

tests/data/pmd-bin-6.39.0.zip

322 Bytes
Binary file not shown.

tests/data/pmd-bin-6.39.0/pmd.bat

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@echo off
2+
echo Running PMD 6.39.0 with: %*
3+
4+
(
5+
echo {
6+
echo "runs": [
7+
echo {
8+
echo "tool": {
9+
echo "driver": {
10+
echo "name": "PMD",
11+
echo "version": "6.39.0"
12+
echo }
13+
echo }
14+
echo }
15+
echo ]
16+
echo }
17+
)>"pmd-report.sarif"

tests/data/pmd-bin-6.40.0.zip

330 Bytes
Binary file not shown.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@echo off
2+
echo Running PMD 6.40.0 with: %*
3+
4+
(
5+
echo {
6+
echo "runs": [
7+
echo {
8+
echo "tool": {
9+
echo "driver": {
10+
echo "name": "PMD",
11+
echo "version": "6.40.0"
12+
echo }
13+
echo }
14+
echo }
15+
echo ]
16+
echo }
17+
)>"pmd-report.sarif"

tests/data/pmd-bin-6.41.0.zip

330 Bytes
Binary file not shown.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@echo off
2+
echo Running PMD 6.41.0 with: %*
3+
4+
(
5+
echo {
6+
echo "runs": [
7+
echo {
8+
echo "tool": {
9+
echo "driver": {
10+
echo "name": "PMD",
11+
echo "version": "6.41.0"
12+
echo }
13+
echo }
14+
echo }
15+
echo ]
16+
echo }
17+
)>"pmd-report.sarif"

tests/util.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('pmd-github-action-util', function () {
5858

5959
const pmdInfo = await util.downloadPmd('latest', 'my_test_token');
6060

61-
const toolCache = path.join(cachePath, 'pmd', '6.40.0', os.arch(), 'pmd-bin-6.40.0');
61+
const toolCache = path.normalize(path.join(cachePath, 'pmd', '6.40.0', os.arch(), 'pmd-bin-6.40.0'));
6262
expect(pmdInfo).toStrictEqual({ path: toolCache, version: '6.40.0' });
6363
await expect(fs.access(toolCache)).resolves.toBe(undefined);
6464
})
@@ -74,7 +74,7 @@ describe('pmd-github-action-util', function () {
7474
.replyWithFile(200, __dirname + '/data/pmd-bin-6.39.0.zip');
7575
const pmdInfo = await util.downloadPmd('6.39.0', 'my_test_token');
7676

77-
const toolCache = path.join(cachePath, 'pmd', '6.39.0', os.arch(), 'pmd-bin-6.39.0');
77+
const toolCache = path.normalize(path.join(cachePath, 'pmd', '6.39.0', os.arch(), 'pmd-bin-6.39.0'));
7878
expect(pmdInfo).toStrictEqual({ path: toolCache, version: '6.39.0' });
7979
await expect(fs.access(toolCache)).resolves.toBe(undefined);
8080
})
@@ -93,7 +93,7 @@ describe('pmd-github-action-util', function () {
9393
const pmdInfo = await util.downloadPmd('6.39.0', 'my_test_token');
9494
const pmdInfo2 = await util.downloadPmd('6.39.0', 'my_test_token');
9595

96-
const toolCache = path.join(cachePath, 'pmd', '6.39.0', os.arch(), 'pmd-bin-6.39.0');
96+
const toolCache = path.normalize(path.join(cachePath, 'pmd', '6.39.0', os.arch(), 'pmd-bin-6.39.0'));
9797
expect(pmdInfo).toStrictEqual({ path: toolCache, version: '6.39.0' });
9898
expect(pmdInfo2).toStrictEqual({ path: pmdInfo.path, version: '6.39.0' });
9999
await expect(fs.access(toolCache)).resolves.toBe(undefined);

tests/validator.test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
const path = require('path');
12
const validator = require('../lib/validator');
23

3-
describe('pmd-github-action-util', function() {
4+
describe('pmd-github-action-validator', function() {
45
it('validate input version', () => {
56
expect(validator.validateVersion('latest')).toBe('latest');
67
expect(validator.validateVersion('6.40.0')).toBe('6.40.0');
@@ -14,7 +15,7 @@ describe('pmd-github-action-util', function() {
1415
expect(validator.validateSourcePath('.')).toBe('.');
1516
expect(validator.validateSourcePath('./src')).toBe('src');
1617
expect(validator.validateSourcePath('src')).toBe('src');
17-
expect(validator.validateSourcePath('src/main/java')).toBe('src/main/java');
18+
expect(validator.validateSourcePath('src/main/java')).toBe(path.normalize('src/main/java'));
1819
});
1920

2021
it('validate source path should throw', () => {

0 commit comments

Comments
 (0)