Merge branch 'fastsim-2' into fastsim-2.1.3

NREL · Sep 24, 2024 · 07a4065 · 07a4065
2 parents cdbc19a + 6ad2acb
commit 07a4065
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/rust/fastsim-core/src/utils.rs b/rust/fastsim-core/src/utils.rs
@@ -1,5 +1,7 @@
 //! Module containing miscellaneous utility functions.
 
+#[cfg(feature = "default")]
+use curl::easy::Easy;
 #[cfg(feature = "default")]
 use directories::ProjectDirs;
 use itertools::Itertools;
@@ -9,8 +11,6 @@ use regex::Regex;
 use std::collections::HashSet;
 #[cfg(feature = "default")]
 use std::io::Write;
-#[cfg(feature = "default")]
-use curl::easy::Easy;
 
 use crate::imports::*;
 #[cfg(feature = "pyo3")]
@@ -871,13 +871,13 @@ mod tests {
         let sub_dir_path = temp_sub_dir.path().to_str().unwrap();
         let still_exists_before = std::fs::metadata(sub_dir_path).is_ok();
         assert_eq!(still_exists_before, true);
-        url_to_cache("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml", "").unwrap();
+        url_to_cache("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/assets/2022_Tesla_Model_Y_RWD_example.yaml", "").unwrap();
         clear_cache(sub_dir_path).unwrap();
         let still_exists = std::fs::metadata(sub_dir_path).is_ok();
         assert_eq!(still_exists, false);
         let path_to_vehicle = path_to_cache()
             .unwrap()
-            .join("1110_2022_Tesla_Model_Y_RWD_opt45017.yaml");
+            .join("2022_Tesla_Model_Y_RWD_example.yaml");
         let vehicle_still_exists = std::fs::metadata(&path_to_vehicle).is_ok();
         assert_eq!(vehicle_still_exists, true);
         std::fs::remove_file(path_to_vehicle).unwrap();

diff --git a/rust/fastsim-core/tests/integration-tests.rs b/rust/fastsim-core/tests/integration-tests.rs
@@ -8,7 +8,8 @@ const REFERENCE_VEHICLE: &str = include_str!("assets/1110_2022_Tesla_Model_Y_RWD
 #[test]
 fn test_from_cache() {
     let test_path = "1110_2022_Tesla_Model_Y_RWD_opt45017_from_cache.yaml";
-    let comparison_vehicle = crate::vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
+    let comparison_vehicle =
+        crate::vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
     crate::vehicle::RustVehicle::to_cache(&comparison_vehicle, test_path).unwrap();
     let vehicle = crate::vehicle::RustVehicle::from_cache(test_path, false).unwrap();
     assert_eq!(comparison_vehicle, vehicle);
@@ -19,7 +20,8 @@ fn test_from_cache() {
 
 #[test]
 fn test_to_cache() {
-    let comparison_vehicle = crate::vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
+    let comparison_vehicle =
+        crate::vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
     crate::vehicle::RustVehicle::to_cache(
         &comparison_vehicle,
         "1110_2022_Tesla_Model_Y_RWD_opt45017.yaml",
@@ -36,36 +38,37 @@ fn test_to_cache() {
 
 #[test]
 fn test_url_to_cache() {
-    utils::url_to_cache("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml", "vehicles").unwrap();
+    utils::url_to_cache("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/assets/2022_Tesla_Model_Y_RWD_example.yaml", "vehicles").unwrap();
     let data_subdirectory = utils::create_project_subdir("vehicles").unwrap();
-    let file_path = data_subdirectory.join("1110_2022_Tesla_Model_Y_RWD_opt45017.yaml");
+    let file_path = data_subdirectory.join("2022_Tesla_Model_Y_RWD_example.yaml");
     println!("{}", file_path.to_string_lossy());
     let vehicle = crate::vehicle::RustVehicle::from_file(&file_path, false).unwrap();
-    let comparison_vehicle = crate::vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
+    let comparison_vehicle =
+        crate::vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
     assert_eq!(vehicle, comparison_vehicle);
     std::fs::remove_file(file_path).unwrap();
 }
 
 #[test]
 fn test_from_github_or_url() {
     let mut comparison_vehicle = vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
-    comparison_vehicle.doc = Some("Vehicle from https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml".to_owned());
+    comparison_vehicle.doc = Some("Vehicle from https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/assets/2022_Tesla_Model_Y_RWD_example.yaml".to_owned());
     // test no url provided
     let vehicle = vehicle::RustVehicle::from_github_or_url(
-        "public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml",
+        "assets/2022_Tesla_Model_Y_RWD_example.yaml",
         None,
     )
     .unwrap();
     assert_eq!(vehicle, comparison_vehicle);
     // test url provided
     let vehicle_1 = vehicle::RustVehicle::from_github_or_url(
-        "1110_2022_Tesla_Model_Y_RWD_opt45017.yaml",
-        Some("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/public/"),
+        "2022_Tesla_Model_Y_RWD_example.yaml",
+        Some("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/assets/"),
     )
     .unwrap();
     assert_eq!(vehicle_1, comparison_vehicle);
     let vehicle_2 = vehicle::RustVehicle::from_github_or_url(
-        "public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml",
+        "assets/2022_Tesla_Model_Y_RWD_example.yaml",
         Some("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/"),
     )
     .unwrap();
@@ -74,8 +77,8 @@ fn test_from_github_or_url() {
 
 #[test]
 fn test_from_url() {
-    let vehicle = vehicle::RustVehicle::from_url("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml", false).unwrap();
+    let vehicle = vehicle::RustVehicle::from_url("https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/assets/2022_Tesla_Model_Y_RWD_example.yaml", false).unwrap();
     let mut comparison_vehicle = vehicle::RustVehicle::from_yaml(REFERENCE_VEHICLE, false).unwrap();
-    comparison_vehicle.doc = Some("Vehicle from https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/public/1110_2022_Tesla_Model_Y_RWD_opt45017.yaml".to_owned());
+    comparison_vehicle.doc = Some("Vehicle from https://raw.githubusercontent.com/NREL/fastsim-vehicles/main/assets/2022_Tesla_Model_Y_RWD_example.yaml".to_owned());
     assert_eq!(vehicle, comparison_vehicle);
 }