summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2025-02-18 15:08:28 +0100
committerLinus Färnstrand <linus@mullvad.net>2025-02-18 15:08:28 +0100
commitde76d2680db89a9db413133227247748cc89338b (patch)
tree4ac85a8956dd940da8389ecd13425618229224f2
parent0f0135ab612358af34c1e15adb545cfd30750e81 (diff)
downloadmullvadvpn-fix-alpha-builds-are-crashing-droid-1693-linus.tar.xz
mullvadvpn-fix-alpha-builds-are-crashing-droid-1693-linus.zip
Add test for to_windows_version_hfix-alpha-builds-are-crashing-droid-1693-linus
-rw-r--r--mullvad-version/src/main.rs19
1 files changed, 7 insertions, 12 deletions
diff --git a/mullvad-version/src/main.rs b/mullvad-version/src/main.rs
index 3c8ca10bcb..9d5cf6d152 100644
--- a/mullvad-version/src/main.rs
+++ b/mullvad-version/src/main.rs
@@ -85,10 +85,6 @@ fn to_android_version_code(version: &str) -> String {
fn to_windows_h_format(version_str: &str) -> String {
let version = version_str.parse().unwrap();
- assert!(
- is_valid_windows_version(&version),
- "Invalid Windows version: {version:?}"
- );
let Version {
year, incremental, ..
@@ -102,11 +98,6 @@ fn to_windows_h_format(version_str: &str) -> String {
)
}
-/// On Windows we currently support the following versions: stable, beta and dev.
-fn is_valid_windows_version(version: &Version) -> bool {
- version.is_stable() || version.is_beta() || (version.is_dev() && !version.is_alpha())
-}
-
#[cfg(test)]
mod tests {
use super::*;
@@ -132,8 +123,12 @@ mod tests {
}
#[test]
- #[should_panic]
- fn test_invalid_windows_version_code() {
- to_windows_h_format("2021.34-alpha1");
+ fn test_windows_version_h() {
+ let version_h = to_windows_h_format("2025.4-beta2-dev-abcdef");
+ let expected_version_h = "#define MAJOR_VERSION 2025
+#define MINOR_VERSION 4
+#define PATCH_VERSION 0
+#define PRODUCT_VERSION \"2025.4-beta2-dev-abcdef\"";
+ assert_eq!(expected_version_h, version_h);
}
}