Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions tests/snapshots/test_java__basic_windows.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
source: tests\test_java.rs
info:
program: log2src
args:
- "-d"
- tests\java\Basic.java
- "-l"
- tests\resources\java\basic.log
---
success: true
exit_code: 0
----- stdout -----
{"srcRef":{"sourcePath":"tests\\java\\Basic.java","lineNumber":18,"column":16,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\Basic.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\Basic.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\Basic.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}

----- stderr -----
21 changes: 21 additions & 0 deletions tests/snapshots/test_java__basic_with_log_format_windows.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
source: tests\test_java.rs
info:
program: log2src
args:
- "-d"
- tests\java\BasicWithCustom.java
- "-l"
- tests\resources\java\basic-class-line.log
- "-f"
- "^(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}) (?<level>\\w+) (?<file>[\\w$.]+):(?<line>\\d+) (?<method>[\\w$]+): (?<body>.*)$"
---
success: true
exit_code: 0
----- stdout -----
{"srcRef":{"sourcePath":"tests\\java\\BasicWithCustom.java","lineNumber":15,"column":16,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithCustom.java","lineNumber":22,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithCustom.java","lineNumber":22,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithCustom.java","lineNumber":22,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}

----- stderr -----
19 changes: 19 additions & 0 deletions tests/snapshots/test_java__basic_with_log_windows.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
source: tests\test_java.rs
info:
program: log2src
args:
- "-d"
- tests\java\BasicWithLog.java
- "-l"
- tests\resources\java\basic.log
---
success: true
exit_code: 0
----- stdout -----
{"srcRef":{"sourcePath":"tests\\java\\BasicWithLog.java","lineNumber":18,"column":13,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithLog.java","lineNumber":25,"column":17,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithLog.java","lineNumber":25,"column":17,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithLog.java","lineNumber":25,"column":17,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}

----- stderr -----
19 changes: 19 additions & 0 deletions tests/snapshots/test_java__basic_with_upper_windows.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
source: tests\test_java.rs
info:
program: log2src
args:
- "-d"
- tests\java\BasicWithUpper.java
- "-l"
- tests\resources\java\basic.log
---
success: true
exit_code: 0
----- stdout -----
{"srcRef":{"sourcePath":"tests\\java\\BasicWithUpper.java","lineNumber":18,"column":16,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithUpper.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithUpper.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
{"srcRef":{"sourcePath":"tests\\java\\BasicWithUpper.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}

----- stderr -----
19 changes: 19 additions & 0 deletions tests/snapshots/test_rust__basic_windows.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
source: tests\test_rust.rs
info:
program: log2src
args:
- "-d"
- examples\basic.rs
- "-l"
- tests\resources\rust\basic.log
---
success: true
exit_code: 0
----- stdout -----
{"srcRef":{"sourcePath":"examples\\basic.rs","lineNumber":6,"column":11,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[[{"sourcePath":"examples\\basic.rs","lineNumber":8,"column":8,"name":"main","text":"foo","vars":[]}]]}
{"srcRef":{"sourcePath":"examples\\basic.rs","lineNumber":13,"column":11,"name":"foo","text":"\"Hello from foo i={}\"","vars":["i"]},"variables":{"i":"0"},"stack":[[{"sourcePath":"examples\\basic.rs","lineNumber":8,"column":8,"name":"main","text":"foo","vars":[]}]]}
{"srcRef":{"sourcePath":"examples\\basic.rs","lineNumber":13,"column":11,"name":"foo","text":"\"Hello from foo i={}\"","vars":["i"]},"variables":{"i":"1"},"stack":[[{"sourcePath":"examples\\basic.rs","lineNumber":8,"column":8,"name":"main","text":"foo","vars":[]}]]}
{"srcRef":{"sourcePath":"examples\\basic.rs","lineNumber":13,"column":11,"name":"foo","text":"\"Hello from foo i={}\"","vars":["i"]},"variables":{"i":"2"},"stack":[[{"sourcePath":"examples\\basic.rs","lineNumber":8,"column":8,"name":"main","text":"foo","vars":[]}]]}

----- stderr -----
18 changes: 18 additions & 0 deletions tests/snapshots/test_rust__stack_windows.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
source: tests\test_rust.rs
info:
program: log2src
args:
- "-d"
- examples\stack.rs
- "-l"
- tests\resources\rust\stack.log
- "-s"
- "1"
---
success: true
exit_code: 0
----- stdout -----
{"srcRef":{"sourcePath":"examples\\stack.rs","lineNumber":15,"column":11,"name":"b","text":"\"Hello from b\"","vars":[]},"variables":{},"stack":[[{"sourcePath":"examples\\stack.rs","lineNumber":11,"column":4,"name":"a","text":"b","vars":[]},{"sourcePath":"examples\\stack.rs","lineNumber":7,"column":4,"name":"main","text":"a","vars":[]}]]}

----- stderr -----
20 changes: 16 additions & 4 deletions tests/test_java.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ use assert_cmd::prelude::*;
use std::{path::Path, process::Command};
use insta_cmd::assert_cmd_snapshot;

fn get_platform_suffix() -> &'static str {
if cfg!(target_os = "windows") {
"windows"
} else {
"unix"
}
}

#[test]
fn basic() -> Result<(), Box<dyn std::error::Error>> {
let mut cmd = Command::cargo_bin("log2src")?;
Expand All @@ -15,7 +23,8 @@ fn basic() -> Result<(), Box<dyn std::error::Error>> {
.arg("-l")
.arg(basic_log.to_str().expect("test case log exists"));

assert_cmd_snapshot!(cmd);
let snapshot_name = format!("basic_{}", get_platform_suffix());
assert_cmd_snapshot!(snapshot_name, cmd);
Ok(())
}

Expand All @@ -32,7 +41,8 @@ fn basic_with_log() -> Result<(), Box<dyn std::error::Error>> {
.arg("-l")
.arg(basic_log.to_str().expect("test case log exists"));

assert_cmd_snapshot!(cmd);
let snapshot_name = format!("basic_with_log_{}", get_platform_suffix());
assert_cmd_snapshot!(snapshot_name, cmd);
Ok(())
}

Expand All @@ -49,7 +59,8 @@ fn basic_with_upper() -> Result<(), Box<dyn std::error::Error>> {
.arg("-l")
.arg(basic_log.to_str().expect("test case log exists"));

assert_cmd_snapshot!(cmd);
let snapshot_name = format!("basic_with_upper_{}", get_platform_suffix());
assert_cmd_snapshot!(snapshot_name, cmd);
Ok(())
}

Expand All @@ -68,6 +79,7 @@ fn basic_with_log_format() -> Result<(), Box<dyn std::error::Error>> {
.arg("-f")
.arg("^(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}) (?<level>\\w+) (?<file>[\\w$.]+):(?<line>\\d+) (?<method>[\\w$]+): (?<body>.*)$");

assert_cmd_snapshot!(cmd);
let snapshot_name = format!("basic_with_log_format_{}", get_platform_suffix());
assert_cmd_snapshot!(snapshot_name, cmd);
Ok(())
}
14 changes: 12 additions & 2 deletions tests/test_rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ use assert_cmd::prelude::*;
use std::{path::Path, process::Command};
use insta_cmd::assert_cmd_snapshot;

fn get_platform_suffix() -> &'static str {
if cfg!(target_os = "windows") {
"windows"
} else {
"unix"
}
}

#[test]
fn basic() -> Result<(), Box<dyn std::error::Error>> {
let mut cmd = Command::cargo_bin("log2src")?;
Expand All @@ -15,7 +23,8 @@ fn basic() -> Result<(), Box<dyn std::error::Error>> {
.arg("-l")
.arg(log.to_str().expect("test case log path is valid"));

assert_cmd_snapshot!(cmd);
let snapshot_name = format!("basic_{}", get_platform_suffix());
assert_cmd_snapshot!(snapshot_name, cmd);

Ok(())
}
Expand All @@ -35,6 +44,7 @@ fn stack() -> Result<(), Box<dyn std::error::Error>> {
.arg("-s")
.arg("1");

assert_cmd_snapshot!(cmd);
let snapshot_name = format!("stack_{}", get_platform_suffix());
assert_cmd_snapshot!(snapshot_name, cmd);
Ok(())
}
Loading