Skip to content

Commit 09725f3

Browse files
shinmilishinmili
committed
ch11 自動テストを書くの和訳を最新版に更新
rust-lang/book@19c40bf
1 parent 4eabca9 commit 09725f3

File tree

77 files changed

+638
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+638
-830
lines changed

‎listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
5+
6+
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
67

78
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-01/output.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
$ cargo test
22
Compiling adder v0.1.0 (file:///projects/adder)
33
Finished test [unoptimized + debuginfo] target(s) in 0.57s
4-
Running target/debug/deps/adder-92948b65e88960b4
4+
Running unittests src/lib.rs (target/debug/deps/adder-92948b65e88960b4)
55

66
running 1 test
77
test tests::it_works ... ok
88

9-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
9+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1010

1111
Doc-tests adder
1212

1313
running 0 tests
1414

15-
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
15+
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1616

‎listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
// ANCHOR: here
1+
pub fn add(left: usize, right: usize) -> usize {
2+
left + right
3+
}
4+
25
#[cfg(test)]
36
mod tests {
7+
use super::*;
8+
49
#[test]
510
fn it_works() {
6-
assert_eq!(2 + 2, 4);
11+
let result = add(2, 2);
12+
assert_eq!(result, 4);
713
}
814
}
9-
// ANCHOR_END: here
10-
11-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-03/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-03/output.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ cargo test
22
Compiling adder v0.1.0 (file:///projects/adder)
33
Finished test [unoptimized + debuginfo] target(s) in 0.72s
4-
Running target/debug/deps/adder-92948b65e88960b4
4+
Running unittests src/lib.rs (target/debug/deps/adder-92948b65e88960b4)
55

66
running 2 tests
77
test tests::another ... FAILED
@@ -10,13 +10,14 @@ test tests::exploration ... ok
1010
failures:
1111

1212
---- tests::another stdout ----
13-
thread 'main' panicked at 'Make this test fail', src/lib.rs:10:9
14-
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
13+
thread 'tests::another' panicked at src/lib.rs:10:9:
14+
Make this test fail
15+
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
1516

1617

1718
failures:
1819
tests::another
1920

20-
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
21+
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
2122

22-
error: test failed, to rerun pass '--lib'
23+
error: test failed, to rerun pass `--lib`

‎listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ mod tests {
1313
}
1414
}
1515
// ANCHOR_END: here
16-
17-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-05/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "rectangle"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-05/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ impl Rectangle {
1111
}
1212
}
1313
// ANCHOR_END: here
14-
15-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-06/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "rectangle"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-06/output.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
$ cargo test
22
Compiling rectangle v0.1.0 (file:///projects/rectangle)
33
Finished test [unoptimized + debuginfo] target(s) in 0.66s
4-
Running target/debug/deps/rectangle-6584c4561e48942e
4+
Running unittests src/lib.rs (target/debug/deps/rectangle-6584c4561e48942e)
55

66
running 1 test
77
test tests::larger_can_hold_smaller ... ok
88

9-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
9+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1010

1111
Doc-tests rectangle
1212

1313
running 0 tests
1414

15-
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
15+
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1616

‎listings/ch11-writing-automated-tests/listing-11-06/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,3 @@ mod tests {
3030
}
3131
}
3232
// ANCHOR_END: here
33-
34-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-07/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-07/output.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
$ cargo test
22
Compiling adder v0.1.0 (file:///projects/adder)
33
Finished test [unoptimized + debuginfo] target(s) in 0.58s
4-
Running target/debug/deps/adder-92948b65e88960b4
4+
Running unittests src/lib.rs (target/debug/deps/adder-92948b65e88960b4)
55

66
running 1 test
77
test tests::it_adds_two ... ok
88

9-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
9+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1010

1111
Doc-tests adder
1212

1313
running 0 tests
1414

15-
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
15+
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1616

‎listings/ch11-writing-automated-tests/listing-11-07/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ANCHOR: here
21
pub fn add_two(a: i32) -> i32 {
32
a + 2
43
}
@@ -12,6 +11,3 @@ mod tests {
1211
assert_eq!(4, add_two(2));
1312
}
1413
}
15-
// ANCHOR_END: here
16-
17-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-08/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-08/output.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
$ cargo test
22
Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
33
Finished test [unoptimized + debuginfo] target(s) in 0.58s
4-
Running target/debug/deps/guessing_game-57d70c3acb738f4d
4+
Running unittests src/lib.rs (target/debug/deps/guessing_game-57d70c3acb738f4d)
55

66
running 1 test
7-
test tests::greater_than_100 ... ok
7+
test tests::greater_than_100 - should panic ... ok
88

9-
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
9+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1010

1111
Doc-tests guessing_game
1212

1313
running 0 tests
1414

15-
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
15+
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1616

‎listings/ch11-writing-automated-tests/listing-11-08/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ANCHOR: here
21
pub struct Guess {
32
value: i32,
43
}
@@ -24,6 +23,3 @@ mod tests {
2423
Guess::new(200);
2524
}
2625
}
27-
// ANCHOR_END: here
28-
29-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-09/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "guessing_game"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-09/src/lib.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ pub struct Guess {
44

55
// ANCHOR: here
66
// --snip--
7+
78
impl Guess {
89
pub fn new(value: i32) -> Guess {
910
if value < 1 {
@@ -29,12 +30,10 @@ mod tests {
2930
use super::*;
3031

3132
#[test]
32-
//予想値は100以下でなければなりません
33-
#[should_panic(expected = "Guess value must be less than or equal to 100")]
33+
//100以下
34+
#[should_panic(expected = "less than or equal to 100")]
3435
fn greater_than_100() {
3536
Guess::new(200);
3637
}
3738
}
3839
// ANCHOR_END: here
39-
40-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-10/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "silly-function"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-10/output.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ cargo test
22
Compiling silly-function v0.1.0 (file:///projects/silly-function)
33
Finished test [unoptimized + debuginfo] target(s) in 0.58s
4-
Running target/debug/deps/silly_function-160869f38cff9166
4+
Running unittests src/lib.rs (target/debug/deps/silly_function-160869f38cff9166)
55

66
running 2 tests
77
test tests::this_test_will_fail ... FAILED
@@ -11,15 +11,16 @@ failures:
1111

1212
---- tests::this_test_will_fail stdout ----
1313
I got the value 8
14-
thread 'main' panicked at 'assertion failed: `(left == right)`
15-
left: `5`,
16-
right: `10`', src/lib.rs:19:9
17-
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
14+
thread 'tests::this_test_will_fail' panicked at src/lib.rs:19:9:
15+
assertion `left == right` failed
16+
left: 5
17+
right: 10
18+
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
1819

1920

2021
failures:
2122
tests::this_test_will_fail
2223

23-
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
24+
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
2425

25-
error: test failed, to rerun pass '--lib'
26+
error: test failed, to rerun pass `--lib`

‎listings/ch11-writing-automated-tests/listing-11-10/src/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
fn main() {}
2-
3-
// ANCHOR: here
41
fn prints_and_returns_10(a: i32) -> i32 {
2+
//{}という値を得た
53
println!("I got the value {}", a);
64
10
75
}
@@ -22,4 +20,3 @@ mod tests {
2220
assert_eq!(5, value);
2321
}
2422
}
25-
// ANCHOR_END: here

‎listings/ch11-writing-automated-tests/listing-11-11/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-11/output.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
$ cargo test
22
Compiling adder v0.1.0 (file:///projects/adder)
33
Finished test [unoptimized + debuginfo] target(s) in 0.62s
4-
Running target/debug/deps/adder-92948b65e88960b4
4+
Running unittests src/lib.rs (target/debug/deps/adder-92948b65e88960b4)
55

66
running 3 tests
77
test tests::add_three_and_two ... ok
88
test tests::add_two_and_two ... ok
99
test tests::one_hundred ... ok
1010

11-
test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
11+
test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1212

1313
Doc-tests adder
1414

1515
running 0 tests
1616

17-
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
17+
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
1818

‎listings/ch11-writing-automated-tests/listing-11-12/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

‎listings/ch11-writing-automated-tests/listing-11-12/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ANCHOR: here
21
pub fn add_two(a: i32) -> i32 {
32
internal_adder(a, 2)
43
}
@@ -16,6 +15,3 @@ mod tests {
1615
assert_eq!(4, internal_adder(2, 2));
1716
}
1817
}
19-
// ANCHOR_END: here
20-
21-
fn main() {}

‎listings/ch11-writing-automated-tests/listing-11-13/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "adder"
33
version = "0.1.0"
4-
authors = ["Your Name <you@example.com>"]
5-
edition = "2018"
4+
edition = "2021"
65

76
[dependencies]

0 commit comments

Comments
 (0)