Further fix after review

Author: guillaume-dequenne

src/pysonar_scanner/utils.py

@@ -24,7 +24,7 @@
 from enum import Enum
 
 OsStr = typing.Literal["windows", "linux", "mac", "alpine", "other"]
-ArchStr = typing.Literal["x86_64", "aarch64", "x86"]
+ArchStr = typing.Literal["x64", "aarch64", "other"]
 
 
 def remove_trailing_slash(url: str) -> str:

tests/sq_api_utils.py

@@ -80,13 +80,16 @@ def mock_analysis_jres(
         self,
         body: Optional[list[dict]] = None,
         status: int = 200,
+        os_matcher: Optional[str] = "linux",
+        arch_matcher: Optional[str] = "x64",
     ) -> responses.BaseResponse:
         return self.rsps.get(
             url=f"{self.api_url}/analysis/jres",
             json=body,
             status=status,
             match=[
                 matchers.header_matcher({"Accept": "application/json"}),
+                matchers.query_param_matcher(utils.filter_none_values({"os": os_matcher, "arch": arch_matcher})),
             ],
         )
 

tests/test_api.py

@@ -317,10 +317,17 @@ def test_get_analysis_jres(self):
             ),
         ]
 
-        with self.subTest("get_analysis_jres works"), sq_api_mocker() as mocker:
+        with self.subTest("get_analysis_jres works (linux)"), sq_api_mocker() as mocker:
             mocker.mock_analysis_jres([sq_api_utils.jre_to_dict(jre) for jre in expected_jres])
 
-            actual_jres = self.sq.get_analysis_jres(os="linux", arch="x86_64")
+            actual_jres = self.sq.get_analysis_jres(os="linux", arch="x64")
+            self.assertEqual(actual_jres, expected_jres)
+
+        with self.subTest("get_analysis_jres works (windows)"), sq_api_mocker() as mocker:
+            mocker.mock_analysis_jres(
+                [sq_api_utils.jre_to_dict(jre) for jre in expected_jres], os_matcher="windows", arch_matcher="aarch64"
+            )
+            actual_jres = self.sq.get_analysis_jres(os="windows", arch="aarch64")
             self.assertEqual(actual_jres, expected_jres)
 
         with (
@@ -329,15 +336,15 @@ def test_get_analysis_jres(self):
             self.assertRaises(SonarQubeApiException),
         ):
             mocker.mock_analysis_jres(status=404)
-            self.sq.get_analysis_jres(os="linux", arch="x86_64")
+            self.sq.get_analysis_jres(os="linux", arch="x64")
 
         with (
             self.subTest("get_analysis_jres returns error when keys are missing"),
             sq_api_mocker() as mocker,
             self.assertRaises(SonarQubeApiException),
         ):
             mocker.mock_analysis_jres([{"id": "jre1"}])
-            self.sq.get_analysis_jres(os="linux", arch="x86_64")
+            self.sq.get_analysis_jres(os="linux", arch="x64")
 
     def test_download_analysis_jre(self):
         jre_id = "jre1"

tests/test_jre.py

@@ -41,7 +41,7 @@
 
 
 @patch("pysonar_scanner.utils.get_os", return_value=Os.LINUX)
-@patch("pysonar_scanner.utils.get_arch", return_value=Arch.AARCH64)
+@patch("pysonar_scanner.utils.get_arch", return_value=Arch.X64)
 class TestJREProvisioner(pyfakefs.TestCase):
     def setUp(self):
         self.setUpPyfakefs(allow_root_user=False)
@@ -115,7 +115,7 @@ def __setup_tar_file(self):
 
     def test_if_patching_worked(self, get_os_mock, get_arch_mock):
         self.assertEqual(utils.get_os(), Os.LINUX)
-        self.assertEqual(utils.get_arch(), Arch.AARCH64)
+        self.assertEqual(utils.get_arch(), Arch.X64)
 
     def test_successfully_downloading_jre(self, get_os_mock, get_arch_mock):
         class JRETestCase(TypedDict):