Skip to content

Commit e36c863

Browse files
committed
Moved tests into examples and added 'cargo t' alias
1 parent d4813f3 commit e36c863

29 files changed

+70
-254
lines changed

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[alias]
2+
t = "test --all-targets -- --nocapture"

examples/example_enable_disable.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,10 @@ fn enabled_arg(a: i32, b: i32) -> i32 {
5353
fn disabled_arg(a: i32, b: i32) -> i32 {
5454
a + b
5555
}
56+
57+
#[cfg(test)]
58+
#[macro_use]
59+
mod trace_test;
60+
61+
#[cfg(test)]
62+
trace_test!(test_enable_disable, main());

examples/example_impl.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ impl Foo {
2020
a
2121
}
2222
}
23+
24+
#[cfg(test)]
25+
#[macro_use]
26+
mod trace_test;
27+
28+
#[cfg(test)]
29+
trace_test!(test_impl, main());

examples/example_impl_method.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,10 @@ impl Foo {
1919
a
2020
}
2121
}
22+
23+
#[cfg(test)]
24+
#[macro_use]
25+
mod trace_test;
26+
27+
#[cfg(test)]
28+
trace_test!(test_impl_method, main());

examples/example_logging.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ fn main() {
1414
fn foo(a: i32, b: i32) {
1515
println!("I'm in foo!");
1616
}
17+
18+
#[cfg(test)]
19+
#[macro_use]
20+
mod trace_test;
21+
22+
#[cfg(test)]
23+
trace_test!(test_logging, main());

examples/example_mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ mod foo {
1717
pub(super) fn bar(&self) {}
1818
}
1919
}
20+
21+
#[cfg(test)]
22+
#[macro_use]
23+
mod trace_test;
24+
25+
#[cfg(test)]
26+
trace_test!(test_mod, main());

examples/example_mut_ref.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ fn foo(a: &mut u32, b: &mut u32) {
2020
fn bar(x: &mut u32) {
2121
*x -= 5;
2222
}
23+
24+
#[cfg(test)]
25+
#[macro_use]
26+
mod trace_test;
27+
28+
#[cfg(test)]
29+
trace_test!(test_mut_ref, main());

examples/example_prefix.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,10 @@ fn bar((a, b): (i32, i32)) -> i32 {
2121
b
2222
}
2323
}
24+
25+
#[cfg(test)]
26+
#[macro_use]
27+
mod trace_test;
28+
29+
#[cfg(test)]
30+
trace_test!(test_prefix, main());

examples/example_pretty.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@ struct Foo(String);
1313
fn foo(a: Foo) -> Foo {
1414
a
1515
}
16+
17+
#[cfg(test)]
18+
#[macro_use]
19+
mod trace_test;
20+
21+
#[cfg(test)]
22+
trace_test!(test_pretty, main());

examples/example_thread.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,10 @@ fn bar(x: u32) -> u32 {
2525
thread::sleep(Duration::from_millis(200));
2626
x + 10
2727
}
28+
29+
#[cfg(test)]
30+
#[macro_use]
31+
mod trace_test;
32+
33+
#[cfg(test)]
34+
trace_test!(test_thread, main());

tests/trace_test.rs renamed to examples/trace_test/mod.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ macro_rules! trace_test {
1212
buf.read_to_string(&mut actual_output).unwrap();
1313
}
1414

15-
let test_filename = concat!("tests/", stringify!($test_name), ".expected");
15+
let test_filename = concat!(
16+
"examples/expected_test_outputs/",
17+
stringify!($test_name),
18+
".expected"
19+
);
1620
let expected_output = std::fs::read_to_string(test_filename).unwrap();
1721
assert_eq!(actual_output, expected_output);
1822
}

tests/test_enable_disable.rs

Lines changed: 0 additions & 58 deletions
This file was deleted.

tests/test_impl.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/test_impl_method.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/test_logging.rs

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/test_mod.rs

Lines changed: 0 additions & 30 deletions
This file was deleted.

tests/test_mut_ref.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/test_prefix.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/test_pretty.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

tests/test_thread.rs

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)