test: comparator expectations

Not very comprehensive but provides an option to pickup some errors

Author: c-git

Cargo.lock

@@ -44,6 +44,7 @@ insta = { version = "1.34.0", features = ["ron", "glob", "yaml"] }
 pretty_assertions = "1.4.0"
 ron = "0.8.1"
 rstest = "0.21.0"
+strum = { version = "0.26.3", features = ["derive"] }
 
 # If you want to use the bleeding edge version of egui and eframe:
 # egui = { git = "https://github.com/emilk/egui", branch = "master" }

Cargo.toml

@@ -299,9 +299,13 @@ impl TryFrom<&str> for Data {
 mod tests {
     use std::fmt::{Debug, Display};
 
+    use filter::Comparator;
     use insta::glob;
     use pretty_assertions::assert_eq;
     use rstest::{fixture, rstest};
+    use strum::IntoEnumIterator;
+
+    use crate::app::data_display_options::DataDisplayOptions;
 
     use super::*;
 
@@ -418,5 +422,57 @@ mod tests {
         assert_eq!(after, before);
     }
 
-    // TODO 1: Add tests for filters
+    #[rstest]
+    fn comparisons_specific_field(insta_settings: insta::Settings) {
+        let row0 = create_log_row_no_extra();
+        let row1 = create_log_row_with_extra();
+        let mut data = Data {
+            rows: vec![row0.clone(), row1.clone()],
+            ..Default::default()
+        };
+
+        data.filter = Some(FilterConfig {
+            search_key: "200".to_string(),
+            filter_on: filter::FilterOn::Field(FieldSpecifier {
+                name: "http.status_code".to_string(),
+            }),
+            is_case_sensitive: false,
+            comparator: Default::default(),
+        });
+
+        let display_options = DataDisplayOptions::default();
+        let common_fields = display_options.common_fields();
+
+        for comparator in Comparator::iter() {
+            data.filter.as_mut().unwrap().comparator = comparator;
+            data.apply_filter(common_fields);
+            insta_settings.bind(|| insta::assert_yaml_snapshot!(data));
+        }
+    }
+
+    #[rstest]
+    fn comparisons_any(insta_settings: insta::Settings) {
+        let row0 = create_log_row_no_extra();
+        let row1 = create_log_row_with_extra();
+        let mut data = Data {
+            rows: vec![row0.clone(), row1.clone()],
+            ..Default::default()
+        };
+
+        data.filter = Some(FilterConfig {
+            search_key: "20".to_string(),
+            filter_on: filter::FilterOn::Any,
+            is_case_sensitive: false,
+            comparator: Default::default(),
+        });
+
+        let display_options = DataDisplayOptions::default();
+        let common_fields = display_options.common_fields();
+
+        for comparator in Comparator::iter() {
+            data.filter.as_mut().unwrap().comparator = comparator;
+            data.apply_filter(common_fields);
+            insta_settings.bind(|| insta::assert_yaml_snapshot!(data));
+        }
+    }
 }

src/app/data.rs

@@ -39,6 +39,7 @@ impl FilterOn {
     }
 }
 
+#[cfg_attr(test, derive(strum::EnumIter))]
 #[derive(Debug, Default, serde::Serialize, serde::Deserialize, PartialEq, Eq, Clone, Copy)]
 pub enum Comparator {
     LessThan,

src/app/data/filter.rs

@@ -0,0 +1,19 @@
+---
+source: src/app/data.rs
+expression: data
+---
+selected_row: ~
+filter:
+  search_key: "20"
+  filter_on: Any
+  is_case_sensitive: false
+  comparator: LessThanEqual
+rows:
+  - data:
+      otel.name: HTTP GET /status
+      time: time value
+  - data:
+      http.status_code: 200
+      otel.name: HTTP GET /status
+      time: time value
+filtered_rows: []

tests/snapshots/log_viewer__app__data__tests__comparisons_any-2.snap

@@ -0,0 +1,19 @@
+---
+source: src/app/data.rs
+expression: data
+---
+selected_row: ~
+filter:
+  search_key: "20"
+  filter_on: Any
+  is_case_sensitive: false
+  comparator: Equal
+rows:
+  - data:
+      otel.name: HTTP GET /status
+      time: time value
+  - data:
+      http.status_code: 200
+      otel.name: HTTP GET /status
+      time: time value
+filtered_rows: []

tests/snapshots/log_viewer__app__data__tests__comparisons_any-3.snap

@@ -0,0 +1,21 @@
+---
+source: src/app/data.rs
+expression: data
+---
+selected_row: ~
+filter:
+  search_key: "20"
+  filter_on: Any
+  is_case_sensitive: false
+  comparator: GreaterThan
+rows:
+  - data:
+      otel.name: HTTP GET /status
+      time: time value
+  - data:
+      http.status_code: 200
+      otel.name: HTTP GET /status
+      time: time value
+filtered_rows:
+  - 0
+  - 1

tests/snapshots/log_viewer__app__data__tests__comparisons_any-4.snap

@@ -0,0 +1,21 @@
+---
+source: src/app/data.rs
+expression: data
+---
+selected_row: ~
+filter:
+  search_key: "20"
+  filter_on: Any
+  is_case_sensitive: false
+  comparator: GreaterThanEqual
+rows:
+  - data:
+      otel.name: HTTP GET /status
+      time: time value
+  - data:
+      http.status_code: 200
+      otel.name: HTTP GET /status
+      time: time value
+filtered_rows:
+  - 0
+  - 1

tests/snapshots/log_viewer__app__data__tests__comparisons_any-5.snap

@@ -0,0 +1,21 @@
+---
+source: src/app/data.rs
+expression: data
+---
+selected_row: ~
+filter:
+  search_key: "20"
+  filter_on: Any
+  is_case_sensitive: false
+  comparator: NotEqual
+rows:
+  - data:
+      otel.name: HTTP GET /status
+      time: time value
+  - data:
+      http.status_code: 200
+      otel.name: HTTP GET /status
+      time: time value
+filtered_rows:
+  - 0
+  - 1

tests/snapshots/log_viewer__app__data__tests__comparisons_any-6.snap

@@ -0,0 +1,20 @@
+---
+source: src/app/data.rs
+expression: data
+---
+selected_row: ~
+filter:
+  search_key: "20"
+  filter_on: Any
+  is_case_sensitive: false
+  comparator: Contains
+rows:
+  - data:
+      otel.name: HTTP GET /status
+      time: time value
+  - data:
+      http.status_code: 200
+      otel.name: HTTP GET /status
+      time: time value
+filtered_rows:
+  - 1