From d88ee5c3dc85fa2ced75a096f7be25527ad7ef89 Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Thu, 6 Apr 2023 16:45:12 +0200 Subject: [PATCH] Add unit test --- .../distributors/corretto-installer.test.ts | 19 +++++++++++++++++++ dist/setup/index.js | 2 +- src/distributions/corretto/installer.ts | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/__tests__/distributors/corretto-installer.test.ts b/__tests__/distributors/corretto-installer.test.ts index a8ffef22..a7995831 100644 --- a/__tests__/distributors/corretto-installer.test.ts +++ b/__tests__/distributors/corretto-installer.test.ts @@ -241,3 +241,22 @@ describe('getAvailableVersions', () => { spyGetDownloadArchiveExtension.mockReturnValue(mockedExtension); }; }); + +describe('convertVersionToSemver', () => { + it.each([ + ['12', '12'], + ['12.0', '12.0'], + ['12.0.2', '12.0.2'], + ['12.0.2+1', '12.0.2+1'], + ['12.0.2.1.0', '12.0.2+1.0'] + ])('%s -> %s', (input: string, expected: string) => { + const distribution = new CorrettoDistribution({ + version: '12', + architecture: 'x86', + packageType: 'jdk', + checkLatest: false + }); + const actual = distribution['convertVersionToSemver'](input); + expect(actual).toBe(expected); + }); +}); diff --git a/dist/setup/index.js b/dist/setup/index.js index a833c372..b0986d48 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -104298,10 +104298,10 @@ class CorrettoDistribution extends base_installer_1.JavaBase { return match[1]; } convertVersionToSemver(version) { + // corretto uses 5 digit semver-like notation e.g. 17.0.6.10.1 const versionArray = version.split('.'); const mainVersion = versionArray.slice(0, 3).join('.'); if (versionArray.length > 3) { - // intentionally ignore more than 4 numbers because it is invalid semver return `${mainVersion}+${versionArray.slice(3).join('.')}`; } return mainVersion; diff --git a/src/distributions/corretto/installer.ts b/src/distributions/corretto/installer.ts index c5bc185a..c7e2f281 100644 --- a/src/distributions/corretto/installer.ts +++ b/src/distributions/corretto/installer.ts @@ -181,10 +181,10 @@ export class CorrettoDistribution extends JavaBase { } private convertVersionToSemver(version: string) { + // corretto uses 5 digit semver-like notation e.g. 17.0.6.10.1 const versionArray = version.split('.'); const mainVersion = versionArray.slice(0, 3).join('.'); if (versionArray.length > 3) { - // intentionally ignore more than 4 numbers because it is invalid semver return `${mainVersion}+${versionArray.slice(3).join('.')}`; }