From a46dec8ba6af53b9200ece584487bf7a7a7fb6aa Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 24 May 2024 07:43:39 +1000
Subject: [PATCH] Fix tests

---
 native_locator/tests/common_python_test.rs |  1 +
 native_locator/tests/conda_test.rs         | 11 +++++++++-
 native_locator/tests/pyenv_test.rs         | 25 ++++++++++++++++------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/native_locator/tests/common_python_test.rs b/native_locator/tests/common_python_test.rs
index c8a5baa3b10a..ceebf4931ab6 100644
--- a/native_locator/tests/common_python_test.rs
+++ b/native_locator/tests/common_python_test.rs
@@ -42,6 +42,7 @@ fn find_python_in_path_this() {
         python_run_command: Some(vec![unix_python_exe.clone().to_str().unwrap().to_string()]),
         env_path: Some(user_home.clone()),
         arch: None,
+        ..Default::default()
     };
     assert_messages(
         &[json!(env)],
diff --git a/native_locator/tests/conda_test.rs b/native_locator/tests/conda_test.rs
index 95e48917bd82..db6c1338ca9f 100644
--- a/native_locator/tests/conda_test.rs
+++ b/native_locator/tests/conda_test.rs
@@ -136,6 +136,8 @@ fn find_conda_exe_and_empty_envs() {
         executable_path: conda_exe.clone(),
         version: Some("4.0.2".to_string()),
         tool: EnvManagerType::Conda,
+        company: None,
+        company_display_name: None,
     };
     assert_eq!(managers.len(), 1);
     assert_eq!(json!(expected_conda_manager), json!(managers[0]));
@@ -177,12 +179,14 @@ fn find_conda_from_custom_install_location() {
         executable_path: conda_exe.clone(),
         version: Some("4.0.2".to_string()),
         tool: EnvManagerType::Conda,
+        company: None,
+        company_display_name: None,
     };
     assert_eq!(json!(expected_conda_manager), json!(result.managers[0]));
 
     let expected_conda_env = PythonEnvironment {
         display_name: None,
-        name: Some("base".to_string()),
+        name: None,
         project_path: None,
         python_executable_path: Some(conda_dir.clone().join("bin").join("python")),
         category: python_finder::messaging::PythonEnvironmentCategory::Conda,
@@ -197,6 +201,7 @@ fn find_conda_from_custom_install_location() {
             "python".to_string(),
         ]),
         arch: None,
+        ..Default::default()
     };
     assert_eq!(json!(expected_conda_env), json!(result.environments[0]));
 
@@ -245,6 +250,8 @@ fn finds_two_conda_envs_from_known_location() {
         executable_path: conda_exe.clone(),
         version: Some("4.0.2".to_string()),
         tool: EnvManagerType::Conda,
+        company: None,
+        company_display_name: None,
     };
 
     assert_eq!(managers.len(), 1);
@@ -267,6 +274,7 @@ fn finds_two_conda_envs_from_known_location() {
             "python".to_string(),
         ]),
         arch: None,
+        ..Default::default()
     };
     let expected_conda_2 = PythonEnvironment {
         display_name: None,
@@ -285,6 +293,7 @@ fn finds_two_conda_envs_from_known_location() {
             "python".to_string(),
         ]),
         arch: None,
+        ..Default::default()
     };
     assert_messages(
         &[json!(expected_conda_1), json!(expected_conda_2)],
diff --git a/native_locator/tests/pyenv_test.rs b/native_locator/tests/pyenv_test.rs
index c9782e9c5d35..132cc4160a6c 100644
--- a/native_locator/tests/pyenv_test.rs
+++ b/native_locator/tests/pyenv_test.rs
@@ -30,6 +30,7 @@ fn does_not_find_any_pyenv_envs_even_with_pyenv_installed() {
     use crate::common::{
         assert_messages, create_test_environment, join_test_paths, test_file_path,
     };
+    use python_finder::messaging::{EnvManager, EnvManagerType};
     use python_finder::pyenv;
     use python_finder::{conda::Conda, locator::Locator};
     use serde_json::json;
@@ -57,14 +58,17 @@ fn does_not_find_any_pyenv_envs_even_with_pyenv_installed() {
     let mut locator = pyenv::PyEnv::with(&known, &mut conda);
     let result = locator.find().unwrap();
 
-    let managers = result.managers;
+    let managers = result.clone().managers;
     assert_eq!(managers.len(), 1);
 
-    let expected_json = json!({"executablePath":pyenv_exe,"version":null, "tool": "pyenv"});
-    assert_messages(
-        &[expected_json],
-        &managers.iter().map(|e| json!(e)).collect::<Vec<_>>(),
-    )
+    let expected_manager = EnvManager {
+        executable_path: pyenv_exe.clone(),
+        version: None,
+        tool: EnvManagerType::Pyenv,
+        company: None,
+        company_display_name: None,
+    };
+    assert_eq!(json!(expected_manager), json!(result.managers[0]));
 }
 
 #[test]
@@ -103,6 +107,8 @@ fn find_pyenv_envs() {
         executable_path: pyenv_exe.clone(),
         version: None,
         tool: EnvManagerType::Pyenv,
+        company: None,
+        company_display_name: None,
     };
     assert_eq!(json!(expected_manager), json!(result.managers[0]));
 
@@ -128,7 +134,8 @@ fn find_pyenv_envs() {
             ".pyenv/versions/3.9.9"
         ])),
         env_manager: Some(expected_manager.clone()),
-        arch: None
+        arch: None,
+        ..Default::default()
     });
     let expected_virtual_env = PythonEnvironment {
         display_name: None,
@@ -153,6 +160,7 @@ fn find_pyenv_envs() {
         ])),
         env_manager: Some(expected_manager.clone()),
         arch: None,
+        ..Default::default()
     };
     let expected_3_12_1 = PythonEnvironment {
         display_name: None,
@@ -177,6 +185,7 @@ fn find_pyenv_envs() {
         ])),
         env_manager: Some(expected_manager.clone()),
         arch: None,
+        ..Default::default()
     };
     let expected_3_13_dev = PythonEnvironment {
         display_name: None,
@@ -201,6 +210,7 @@ fn find_pyenv_envs() {
         ])),
         env_manager: Some(expected_manager.clone()),
         arch: None,
+        ..Default::default()
     };
     let expected_3_12_1a3 = PythonEnvironment {
         display_name: None,
@@ -225,6 +235,7 @@ fn find_pyenv_envs() {
         ])),
         env_manager: Some(expected_manager.clone()),
         arch: None,
+        ..Default::default()
     };
 
     assert_messages(