Make tests work on macOS and Windows

actions · Nov 15, 2022 · 43a44e9 · 43a44e9
1 parent 46d7903
commit 43a44e9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/__tests__/distributors/oracle-installer.test.ts b/__tests__/distributors/oracle-installer.test.ts
@@ -1,6 +1,7 @@
 import { OracleDistribution } from '../../src/distributions/oracle/installer';
 import os from 'os';
 import * as core from '@actions/core';
+import { getDownloadArchiveExtension } from '../../src/util';
 
 describe('findPackageForDownload', () => {
   let distribution: OracleDistribution;
@@ -47,23 +48,9 @@ describe('findPackageForDownload', () => {
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
     const result = await distribution['findPackageForDownload'](input);
     expect(result.version).toBe(expectedVersion);
-    let os: string;
-    let archive: string;
-    switch (process.platform) {
-      case 'darwin':
-        os = 'macos';
-        archive = 'tar.gz';
-        break;
-      case 'win32':
-        os = 'windows';
-        archive = 'zip';
-        break;
-      default:
-        os = process.platform.toString();
-        archive = 'tar.gz';
-        break;
-    }
-    const url = expectedUrl.replace('{{OS_TYPE}}', os).replace('{{ARCHIVE_TYPE}}', archive);
+    const osType = distribution.getPlatform();
+    const archiveType = getDownloadArchiveExtension();
+    const url = expectedUrl.replace('{{OS_TYPE}}', osType).replace('{{ARCHIVE_TYPE}}', archiveType);
     expect(result.url).toBe(url);
   });
 
@@ -84,8 +71,13 @@ describe('findPackageForDownload', () => {
         checkLatest: false
       });
 
+      const osType = distribution.getPlatform();
+      if (osType === 'windows' && distroArch == 'aarch64') {
+        return; // skip, aarch64 is not available for Windows
+      }
+      const archiveType = getDownloadArchiveExtension();
       const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://download.oracle.com/java/17/latest/jdk-17_linux-${distroArch}_bin.tar.gz`;
+      const expectedUrl = `https://download.oracle.com/java/17/latest/jdk-17_${osType}-${distroArch}_bin.${archiveType}`;
 
       expect(result.url).toBe(expectedUrl);
     }

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -104682,7 +104682,6 @@ class OracleDistribution extends base_installer_1.JavaBase {
             case 'darwin':
                 return 'macos';
             case 'win32':
-            case 'cygwin':
                 return 'windows';
             case 'linux':
                 return 'linux';

diff --git a/src/distributions/oracle/installer.ts b/src/distributions/oracle/installer.ts
@@ -86,12 +86,11 @@ export class OracleDistribution extends JavaBase {
     return { url: fileUrl, version: range };
   }
 
-  private getPlatform(platform: NodeJS.Platform = process.platform): OsVersions {
+  public getPlatform(platform: NodeJS.Platform = process.platform): OsVersions {
     switch (platform) {
       case 'darwin':
         return 'macos';
       case 'win32':
-      case 'cygwin':
         return 'windows';
       case 'linux':
         return 'linux';