Extract read_logs helper

Author: RReverser

crates/testing/tests/standalone_integration_test.rs

@@ -1,6 +1,7 @@
-use serde_json::Value;
 use serial_test::serial;
-use spacetimedb_testing::modules::{CompilationMode, CompiledModule, LogLevel, LoggerRecord, DEFAULT_CONFIG};
+use spacetimedb_testing::modules::{
+    CompilationMode, CompiledModule, LogLevel, LoggerRecord, ModuleHandle, DEFAULT_CONFIG,
+};
 
 fn init() {
     let _ = env_logger::builder()
@@ -13,6 +14,24 @@ fn init() {
         .try_init();
 }
 
+async fn read_logs(module: &ModuleHandle) -> Vec<String> {
+    module
+        .read_log(None)
+        .await
+        .trim()
+        .split('\n')
+        .map(|line| {
+            let record: LoggerRecord = serde_json::from_str(line).unwrap();
+            if matches!(record.level, LogLevel::Panic | LogLevel::Error | LogLevel::Warn) {
+                panic!("Found an error-like log line: {line}");
+            }
+            record.message
+        })
+        .skip_while(|line| line != "Database initialized")
+        .skip(1)
+        .collect::<Vec<_>>()
+}
+
 // The tests MUST be run in sequence because they read the OS environment
 // and can cause a race when run in parallel.
 
@@ -34,25 +53,9 @@ fn test_calling_a_reducer_in_module(module_name: &'static str) {
             let json = r#"{"call": {"fn": "list_over_age", "args": [30]}}"#.to_string();
             module.send(json).await.unwrap();
 
-            let logs = module
-                .read_log(None)
-                .await
-                .trim()
-                .split('\n')
-                .map(|line| {
-                    let record: LoggerRecord = serde_json::from_str(line).unwrap();
-                    if matches!(record.level, LogLevel::Panic | LogLevel::Error | LogLevel::Warn) {
-                        panic!("Found an error-like log line: {line}");
-                    }
-                    record.message
-                })
-                .skip_while(|line| line != "Database initialized")
-                .collect::<Vec<_>>();
-
             assert_eq!(
-                logs,
+                read_logs(&module).await,
                 [
-                    "Database initialized",
                     "Hello, Tyrion!",
                     "Hello, Cersei!",
                     "Hello, World!",
@@ -89,18 +92,10 @@ fn test_calling_a_reducer_with_private_table() {
             let json = r#"{"call": {"fn": "query_private", "args": []}}"#.to_string();
             module.send(json).await.unwrap();
 
-            let logs = module
-                .read_log(None)
-                .await
-                .trim()
-                .split('\n')
-                .map(|line| serde_json::from_str::<LoggerRecord>(line).unwrap())
-                .collect::<Vec<_>>();
-
-            assert_eq!(logs.len(), 10);
-
-            assert_eq!(logs[7].message, "Private, Tyrion!");
-            assert_eq!(logs[8].message, "Private, World!");
+            assert_eq!(
+                read_logs(&module).await,
+                ["Private, Tyrion!", "Private, World!",].map(String::from)
+            );
         },
     );
 }
@@ -120,30 +115,15 @@ fn test_call_query_macro() {
                 .to_string();
             module.send(json).await.unwrap();
 
-            let lines = module.read_log(Some(13)).await;
-            let lines: Vec<&str> = lines.trim().split('\n').collect();
-
-            assert_eq!(lines.len(), 13);
-
-            let json: Value = serde_json::from_str(lines[6]).unwrap();
             assert_eq!(
-                json["message"],
-                Value::String("Row count before delete: 1000".to_string())
-            );
-            let json: Value = serde_json::from_str(lines[8]).unwrap();
-            assert_eq!(
-                json["message"],
-                Value::String("Row count after delete: 995".to_string())
-            );
-            let json: Value = serde_json::from_str(lines[9]).unwrap();
-            assert_eq!(
-                json["message"],
-                Value::String("Row count filtered by condition: 995".to_string())
-            );
-            let json: Value = serde_json::from_str(lines[11]).unwrap();
-            assert_eq!(
-                json["message"],
-                Value::String("Row count filtered by multi-column condition: 199".to_string())
+                read_logs(&module).await,
+                [
+                    "Row count before delete: 1000",
+                    "Row count after delete: 995",
+                    "Row count filtered by condition: 995",
+                    "Row count filtered by multi-column condition: 199",
+                ]
+                .map(String::from)
             );
         },
     );