mirror of
https://github.com/actions/setup-java.git
synced 2026-03-25 05:10:36 +00:00
refactor(tests): update error messages for version not found scenarios
This commit is contained in:
parent
102c2095e0
commit
421e43bf5a
@ -268,7 +268,7 @@ describe('findPackageForDownload', () => {
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(
|
||||
distribution['findPackageForDownload']('9.0.8')
|
||||
).rejects.toThrow(/Could not find satisfied version for SemVer */);
|
||||
).rejects.toThrow(/No matching version found for SemVer */);
|
||||
});
|
||||
|
||||
it('version is not found', async () => {
|
||||
@ -283,7 +283,7 @@ describe('findPackageForDownload', () => {
|
||||
);
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
|
||||
@ -299,7 +299,7 @@ describe('findPackageForDownload', () => {
|
||||
);
|
||||
distribution['getAvailableVersions'] = async () => [];
|
||||
await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -538,7 +538,7 @@ describe('setupJava', () => {
|
||||
])('should throw an error for version not found for %s', async input => {
|
||||
mockJavaBase = new EmptyJavaBase(input);
|
||||
await expect(mockJavaBase.setupJava()).rejects.toThrow(
|
||||
`Could not find satisfied version for SemVer '${input.version}'`
|
||||
`No matching version found for SemVer '${input.version}'`
|
||||
);
|
||||
expect(spyTcFindAllVersions).toHaveBeenCalled();
|
||||
expect(spyCoreAddPath).not.toHaveBeenCalled();
|
||||
@ -584,7 +584,7 @@ describe('createVersionNotFoundError', () => {
|
||||
const error = (mockJavaBase as any).createVersionNotFoundError('17.0.5');
|
||||
|
||||
expect(error.message).toContain(
|
||||
"Could not find satisfied version for SemVer '17.0.5'"
|
||||
"No matching version found for SemVer '17.0.5'"
|
||||
);
|
||||
expect(error.message).toContain('Distribution: Empty');
|
||||
expect(error.message).toContain('Package type: jdk');
|
||||
@ -606,7 +606,7 @@ describe('createVersionNotFoundError', () => {
|
||||
);
|
||||
|
||||
expect(error.message).toContain(
|
||||
"Could not find satisfied version for SemVer '17.0.5'"
|
||||
"No matching version found for SemVer '17.0.5'"
|
||||
);
|
||||
expect(error.message).toContain('Distribution: Empty');
|
||||
expect(error.message).toContain('Package type: jdk');
|
||||
@ -653,7 +653,7 @@ describe('createVersionNotFoundError', () => {
|
||||
);
|
||||
|
||||
expect(error.message).toContain(
|
||||
"Could not find satisfied version for SemVer '17.0.5'"
|
||||
"No matching version found for SemVer '17.0.5'"
|
||||
);
|
||||
expect(error.message).toContain('Distribution: Empty');
|
||||
expect(error.message).toContain('Package type: jdk');
|
||||
|
||||
@ -203,7 +203,7 @@ describe('getAvailableVersions', () => {
|
||||
|
||||
await expect(
|
||||
distribution['findPackageForDownload'](version)
|
||||
).rejects.toThrow("Could not find satisfied version for SemVer '4'");
|
||||
).rejects.toThrow("No matching version found for SemVer '4'");
|
||||
});
|
||||
|
||||
it.each([
|
||||
|
||||
@ -238,7 +238,7 @@ describe('getAvailableVersions', () => {
|
||||
await expect(
|
||||
distribution['findPackageForDownload'](jdkVersion)
|
||||
).rejects.toThrow(
|
||||
`Could not find satisfied version for SemVer '${jdkVersion}'`
|
||||
`No matching version found for SemVer '${jdkVersion}'`
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
@ -356,9 +356,7 @@ describe('GraalVMDistribution', () => {
|
||||
// Verify the error is thrown with the expected message
|
||||
await expect(
|
||||
(distribution as any).findPackageForDownload('17.0.99')
|
||||
).rejects.toThrow(
|
||||
"Could not find satisfied version for SemVer '17.0.99'"
|
||||
);
|
||||
).rejects.toThrow("No matching version found for SemVer '17.0.99'");
|
||||
|
||||
// Verify the hint about checking the base URL is included
|
||||
await expect(
|
||||
@ -508,7 +506,7 @@ describe('GraalVMDistribution', () => {
|
||||
await expect(
|
||||
(distribution as any).findPackageForDownload('23')
|
||||
).rejects.toThrow(
|
||||
"No EA build is marked as 'latest' for version range '23-ea'. Available EA versions: 23-ea-20240716."
|
||||
"No EA build is marked as latest for version '23-ea'. Available EA versions: ['23-ea-20240716']."
|
||||
);
|
||||
|
||||
// Verify error logging - removed as we now use the helper method which doesn't call core.error
|
||||
@ -719,7 +717,7 @@ describe('GraalVMDistribution', () => {
|
||||
await expect(
|
||||
(distribution as any).findEABuildDownloadUrl('23-ea')
|
||||
).rejects.toThrow(
|
||||
"No EA build is marked as 'latest' for version range '23-ea'. Available EA versions: 23-ea-20240716, 23-ea-20240709."
|
||||
"No EA build is marked as latest for version '23-ea'. Available EA versions: ['23-ea-20240716', '23-ea-20240709']."
|
||||
);
|
||||
|
||||
// Verify error logging - removed as we now use the helper method which doesn't call core.error
|
||||
|
||||
@ -104,7 +104,7 @@ describe('findPackageForDownload', () => {
|
||||
});
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(distribution['findPackageForDownload']('8.x')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
|
||||
@ -117,7 +117,7 @@ describe('findPackageForDownload', () => {
|
||||
});
|
||||
distribution['getAvailableVersions'] = async () => [];
|
||||
await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -215,7 +215,7 @@ describe('findPackageForDownload', () => {
|
||||
|
||||
it('should throw an error', async () => {
|
||||
await expect(distribution['findPackageForDownload']('17')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer/
|
||||
/No matching version found for SemVer/
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -215,7 +215,7 @@ describe('findPackageForDownload', () => {
|
||||
|
||||
it('should throw an error', async () => {
|
||||
await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer/
|
||||
/No matching version found for SemVer/
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -214,7 +214,7 @@ describe('findPackageForDownload', () => {
|
||||
|
||||
it('should throw an error', async () => {
|
||||
await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer/
|
||||
/No matching version found for SemVer/
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -179,7 +179,7 @@ describe('findPackageForDownload', () => {
|
||||
|
||||
it('should throw an error', async () => {
|
||||
await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -272,7 +272,7 @@ describe('getAvailableVersions', () => {
|
||||
await expect(
|
||||
distribution['findPackageForDownload'](normalizedVersion)
|
||||
).rejects.toThrow(
|
||||
`Could not find satisfied version for SemVer '${normalizedVersion}'`
|
||||
`No matching version found for SemVer '${normalizedVersion}'`
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
@ -157,7 +157,7 @@ describe('findPackageForDownload', () => {
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(
|
||||
distribution['findPackageForDownload']('9.0.8')
|
||||
).rejects.toThrow(/Could not find satisfied version for SemVer */);
|
||||
).rejects.toThrow(/No matching version found for SemVer */);
|
||||
});
|
||||
|
||||
it('version is not found', async () => {
|
||||
@ -169,7 +169,7 @@ describe('findPackageForDownload', () => {
|
||||
});
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
|
||||
@ -182,7 +182,7 @@ describe('findPackageForDownload', () => {
|
||||
});
|
||||
distribution['getAvailableVersions'] = async () => [];
|
||||
await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
@ -218,7 +218,7 @@ describe('findPackageForDownload', () => {
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(
|
||||
distribution['findPackageForDownload']('9.0.8')
|
||||
).rejects.toThrow(/Could not find satisfied version for SemVer */);
|
||||
).rejects.toThrow(/No matching version found for SemVer */);
|
||||
});
|
||||
|
||||
it('version is not found', async () => {
|
||||
@ -233,7 +233,7 @@ describe('findPackageForDownload', () => {
|
||||
);
|
||||
distribution['getAvailableVersions'] = async () => manifestData as any;
|
||||
await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
|
||||
@ -249,7 +249,7 @@ describe('findPackageForDownload', () => {
|
||||
);
|
||||
distribution['getAvailableVersions'] = async () => [];
|
||||
await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
|
||||
/Could not find satisfied version for SemVer */
|
||||
/No matching version found for SemVer */
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@ -231,6 +231,6 @@ describe('findPackageForDownload', () => {
|
||||
distribution['getAvailableVersions'] = async () => manifestData;
|
||||
await expect(
|
||||
distribution['findPackageForDownload'](distribution['version'])
|
||||
).rejects.toThrow(/Could not find satisfied version for SemVer/);
|
||||
).rejects.toThrow(/No matching version found for SemVer/);
|
||||
});
|
||||
});
|
||||
|
||||
@ -234,6 +234,6 @@ describe('findPackageForDownload', () => {
|
||||
distribution['getAvailableVersions'] = async () => manifestData;
|
||||
await expect(
|
||||
distribution['findPackageForDownload'](distribution['version'])
|
||||
).rejects.toThrow(/Could not find satisfied version for SemVer/);
|
||||
).rejects.toThrow(/No matching version found for SemVer/);
|
||||
});
|
||||
});
|
||||
|
||||
@ -232,6 +232,6 @@ describe('findPackageForDownload', () => {
|
||||
distribution['getAvailableVersions'] = async () => manifestData;
|
||||
await expect(
|
||||
distribution['findPackageForDownload'](distribution['version'])
|
||||
).rejects.toThrow(/Could not find satisfied version for SemVer/);
|
||||
).rejects.toThrow(/No matching version found for SemVer/);
|
||||
});
|
||||
});
|
||||
|
||||
6
dist/setup/index.js
vendored
6
dist/setup/index.js
vendored
@ -112571,7 +112571,7 @@ class JavaBase {
|
||||
}
|
||||
createVersionNotFoundError(versionOrRange, availableVersions, additionalContext) {
|
||||
const parts = [
|
||||
`Could not find satisfied version for SemVer '${versionOrRange}'.`,
|
||||
`No matching version found for SemVer '${versionOrRange}'.`,
|
||||
`Distribution: ${this.distribution}`,
|
||||
`Package type: ${this.packageType}`,
|
||||
`Architecture: ${this.architecture}`
|
||||
@ -113238,9 +113238,9 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
|
||||
const latestVersion = versions.find(v => v.latest);
|
||||
if (!latestVersion) {
|
||||
const availableVersions = versions.map(v => v.version);
|
||||
let message = `No EA build is marked as 'latest' for version range '${javaEaVersion}'.`;
|
||||
let message = `No EA build is marked as latest for version '${javaEaVersion}'.`;
|
||||
if (availableVersions.length > 0) {
|
||||
message += ` Available EA versions: ${availableVersions.join(', ')}.`;
|
||||
message += ` Available EA versions: [${availableVersions.map(v => `'${v}'`).join(', ')}].`;
|
||||
}
|
||||
throw new Error(message);
|
||||
}
|
||||
|
||||
@ -265,7 +265,7 @@ export abstract class JavaBase {
|
||||
additionalContext?: string
|
||||
): Error {
|
||||
const parts = [
|
||||
`Could not find satisfied version for SemVer '${versionOrRange}'.`,
|
||||
`No matching version found for SemVer '${versionOrRange}'.`,
|
||||
`Distribution: ${this.distribution}`,
|
||||
`Package type: ${this.packageType}`,
|
||||
`Architecture: ${this.architecture}`
|
||||
|
||||
@ -182,9 +182,9 @@ export class GraalVMDistribution extends JavaBase {
|
||||
const latestVersion = versions.find(v => v.latest);
|
||||
if (!latestVersion) {
|
||||
const availableVersions = versions.map(v => v.version);
|
||||
let message = `No EA build is marked as 'latest' for version range '${javaEaVersion}'.`;
|
||||
let message = `No EA build is marked as latest for version '${javaEaVersion}'.`;
|
||||
if (availableVersions.length > 0) {
|
||||
message += ` Available EA versions: ${availableVersions.join(', ')}.`;
|
||||
message += ` Available EA versions: [${availableVersions.map(v => `'${v}'`).join(', ')}].`;
|
||||
}
|
||||
throw new Error(message);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user