m/cup
1
0
Fork 0
mirror of https://github.com/sergi0g/cup.git synced 2025-11-17 01:23:39 -05:00
Code Wiki Activity

Fix broken tests

Browse Source
This commit is contained in:
Sergio
2024-11-16 13:14:52 +02:00
parent 88d346b480
commit 9e9bb78db7
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/structs/version.rs
View File

@@ -145,14 +145,14 @@ mod tests {
#[rustfmt::skip] #[rustfmt::skip]
fn version() { fn version() {
assert_eq!(Version::from_tag("5.3.2" ), Some(Version { major: 5, minor: Some(3), patch: Some(2) })); assert_eq!(Version::from_tag("5.3.2" ), Some(Version { major: 5, minor: Some(3), patch: Some(2) }));
assert_eq!(Version::from_tag("14" ), Some(Version { major: 14, minor: Some(0), patch: Some(0) })); assert_eq!(Version::from_tag("14" ), Some(Version { major: 14, minor: None, patch: None }));
assert_eq!(Version::from_tag("v0.107.53" ), Some(Version { major: 0, minor: Some(107), patch: Some(53) })); assert_eq!(Version::from_tag("v0.107.53" ), Some(Version { major: 0, minor: Some(107), patch: Some(53) }));
assert_eq!(Version::from_tag("12-alpine" ), Some(Version { major: 12, minor: Some(0), patch: Some(0) })); assert_eq!(Version::from_tag("12-alpine" ), Some(Version { major: 12, minor: None, patch: None }));
assert_eq!(Version::from_tag("0.9.5-nginx" ), Some(Version { major: 0, minor: Some(9), patch: Some(5) })); assert_eq!(Version::from_tag("0.9.5-nginx" ), Some(Version { major: 0, minor: Some(9), patch: Some(5) }));
assert_eq!(Version::from_tag("v27.0" ), Some(Version { major: 27, minor: Some(0), patch: Some(0) })); assert_eq!(Version::from_tag("v27.0" ), Some(Version { major: 27, minor: Some(0), patch: None }));
assert_eq!(Version::from_tag("16.1" ), Some(Version { major: 16, minor: Some(1), patch: Some(0) })); assert_eq!(Version::from_tag("16.1" ), Some(Version { major: 16, minor: Some(1), patch: None }));
assert_eq!(Version::from_tag("version-1.5.6" ), Some(Version { major: 1, minor: Some(5), patch: Some(6) })); assert_eq!(Version::from_tag("version-1.5.6" ), Some(Version { major: 1, minor: Some(5), patch: Some(6) }));
assert_eq!(Version::from_tag("15.4-alpine" ), Some(Version { major: 15, minor: Some(4), patch: Some(0) })); assert_eq!(Version::from_tag("15.4-alpine" ), Some(Version { major: 15, minor: Some(4), patch: None }));
assert_eq!(Version::from_tag("pg14-v0.2.0" ), Some(Version { major: 0, minor: Some(2), patch: Some(0) })); assert_eq!(Version::from_tag("pg14-v0.2.0" ), Some(Version { major: 0, minor: Some(2), patch: Some(0) }));
assert_eq!(Version::from_tag("18-jammy-full.s6-v0.88.0"), Some(Version { major: 0, minor: Some(88), patch: Some(0) })); assert_eq!(Version::from_tag("18-jammy-full.s6-v0.88.0"), Some(Version { major: 0, minor: Some(88), patch: Some(0) }));
assert_eq!(Version::from_tag("fpm-2.1.0-prod" ), Some(Version { major: 2, minor: Some(1), patch: Some(0) })); assert_eq!(Version::from_tag("fpm-2.1.0-prod" ), Some(Version { major: 2, minor: Some(1), patch: Some(0) }));

13
src/utils/sort_update_vec.rs
View File

@@ -1,9 +1,18 @@
use std::cmp::Ordering;
use crate::structs::image::Image; use crate::structs::image::Image;
/// Sorts the update vector alphabetically and where Some(true) > Some(false) > None /// Sorts the update vector alphabetically and where Some(true) > Some(false) > None
pub fn sort_image_vec(updates: &[Image]) -> Vec<Image> { pub fn sort_image_vec(updates: &[Image]) -> Vec<Image> {
let mut sorted_updates = updates.to_vec(); let mut sorted_updates = updates.to_vec();
sorted_updates.sort_unstable_by_key(|img| img.has_update()); sorted_updates.sort_by(|a, b| {
let cmp = a.has_update().cmp(&b.has_update());
if cmp == Ordering::Equal {
a.reference.cmp(&b.reference)
} else {
cmp
}
});
sorted_updates.to_vec() sorted_updates.to_vec()
} }
@@ -14,7 +23,7 @@ mod tests {
use super::*; use super::*;
/// Test the `sort_update_vec` function /// Test the `sort_update_vec` function
/// TODO: test semver as well /// TODO: test versioning as well
#[test] #[test]
fn test_ordering() { fn test_ordering() {
// Create test objects // Create test objects