Skip to content

Commit dccb84f

Browse files
ttiimmttiimm
authored
Merge pull request ttiimm#2 from tstack/instatests
[tests] switch to using insta for handling expected results
2 parents de277d7 + 5c16784 commit dccb84f

11 files changed

+216
-163
lines changed

‎Cargo.lock‎

Lines changed: 89 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ cc="*"
2121
[dev-dependencies]
2222
assert_cmd = "2.0.16"
2323
env_logger = "0.11.8"
24+
insta = { version = "1.43.1", features = ["yaml"] }
25+
insta-cmd = "0.6.0"
2426
log = "0.4.27"
2527
rand = "0.9.0"

‎tests/snapshots/test_java__basic.snap‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
source: tests/test_java.rs
3+
info:
4+
program: log2src
5+
args:
6+
- "-d"
7+
- tests/java/Basic.java
8+
- "-l"
9+
- tests/resources/java/basic.log
10+
---
11+
success: true
12+
exit_code: 0
13+
----- stdout -----
14+
{"srcRef":{"sourcePath":"tests/java/Basic.java","lineNumber":18,"column":16,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
15+
{"srcRef":{"sourcePath":"tests/java/Basic.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
16+
{"srcRef":{"sourcePath":"tests/java/Basic.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
17+
{"srcRef":{"sourcePath":"tests/java/Basic.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}
18+
19+
----- stderr -----

‎tests/snapshots/test_java__basic_with_log.snap‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
source: tests/test_java.rs
3+
info:
4+
program: log2src
5+
args:
6+
- "-d"
7+
- tests/java/BasicWithLog.java
8+
- "-l"
9+
- tests/resources/java/basic.log
10+
---
11+
success: true
12+
exit_code: 0
13+
----- stdout -----
14+
{"srcRef":{"sourcePath":"tests/java/BasicWithLog.java","lineNumber":18,"column":13,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
15+
{"srcRef":{"sourcePath":"tests/java/BasicWithLog.java","lineNumber":25,"column":17,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
16+
{"srcRef":{"sourcePath":"tests/java/BasicWithLog.java","lineNumber":25,"column":17,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
17+
{"srcRef":{"sourcePath":"tests/java/BasicWithLog.java","lineNumber":25,"column":17,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}
18+
19+
----- stderr -----

‎tests/snapshots/test_java__basic_with_log_format.snap‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
source: tests/test_java.rs
3+
info:
4+
program: log2src
5+
args:
6+
- "-d"
7+
- tests/java/BasicWithCustom.java
8+
- "-l"
9+
- tests/resources/java/basic-class-line.log
10+
- "-f"
11+
- "^(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}) (?<level>\\w+) (?<file>[\\w$.]+):(?<line>\\d+) (?<method>[\\w$]+): (?<body>.*)$"
12+
---
13+
success: true
14+
exit_code: 0
15+
----- stdout -----
16+
{"srcRef":{"sourcePath":"tests/java/BasicWithCustom.java","lineNumber":15,"column":16,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
17+
{"srcRef":{"sourcePath":"tests/java/BasicWithCustom.java","lineNumber":22,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
18+
{"srcRef":{"sourcePath":"tests/java/BasicWithCustom.java","lineNumber":22,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
19+
{"srcRef":{"sourcePath":"tests/java/BasicWithCustom.java","lineNumber":22,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}
20+
21+
----- stderr -----

‎tests/snapshots/test_java__basic_with_upper.snap‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
source: tests/test_java.rs
3+
info:
4+
program: log2src
5+
args:
6+
- "-d"
7+
- tests/java/BasicWithUpper.java
8+
- "-l"
9+
- tests/resources/java/basic.log
10+
---
11+
success: true
12+
exit_code: 0
13+
----- stdout -----
14+
{"srcRef":{"sourcePath":"tests/java/BasicWithUpper.java","lineNumber":18,"column":16,"name":"main","text":"\"Hello from main\"","vars":[]},"variables":{},"stack":[]}
15+
{"srcRef":{"sourcePath":"tests/java/BasicWithUpper.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"0"},"stack":[]}
16+
{"srcRef":{"sourcePath":"tests/java/BasicWithUpper.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"1"},"stack":[]}
17+
{"srcRef":{"sourcePath":"tests/java/BasicWithUpper.java","lineNumber":25,"column":20,"name":"foo","text":"\"Hello from foo i=\\{i}\"","vars":["i"]},"variables":{"i":"2"},"stack":[]}
18+
19+
----- stderr -----

‎tests/snapshots/test_rust__basic.snap‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
source: tests/test_rust.rs
3+
info:
4+
program: log2src
5+
args:
6+
- "-d"
7+
- examples/basic.rs
8+
- "-l"
9+
- tests/resources/rust/basic.log
10+
---
11+
success: true
12+
exit_code: 0
13+
----- stdout -----
14+
{"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":[]}]]}
15+
{"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":[]}]]}
16+
{"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":[]}]]}
17+
{"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":[]}]]}
18+
19+
----- stderr -----

‎tests/snapshots/test_rust__stack.snap‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
source: tests/test_rust.rs
3+
info:
4+
program: log2src
5+
args:
6+
- "-d"
7+
- examples/stack.rs
8+
- "-l"
9+
- tests/resources/rust/stack.log
10+
- "-s"
11+
- "1"
12+
---
13+
success: true
14+
exit_code: 0
15+
----- stdout -----
16+
{"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":[]}]]}
17+
18+
----- stderr -----

0 commit comments

Comments
 (0)