1- use pascals_triangle:: * ;
1+ use pascals_triangle:: PascalsTriangle ;
22
33#[ test]
4- fn no_rows ( ) {
4+ fn zero_rows ( ) {
55 let pt = PascalsTriangle :: new ( 0 ) ;
6- let expected: Vec < Vec < u32 > > = Vec :: new ( ) ;
7- assert_eq ! ( expected , pt. rows( ) ) ;
6+ let expected: Vec < Vec < u32 > > = vec ! [ ] ;
7+ assert_eq ! ( pt. rows( ) , expected ) ;
88}
99
1010#[ test]
1111#[ ignore]
12- fn one_row ( ) {
12+ fn single_row ( ) {
1313 let pt = PascalsTriangle :: new ( 1 ) ;
1414 let expected: Vec < Vec < u32 > > = vec ! [ vec![ 1 ] ] ;
15- assert_eq ! ( expected , pt. rows( ) ) ;
15+ assert_eq ! ( pt. rows( ) , expected ) ;
1616}
1717
1818#[ test]
1919#[ ignore]
2020fn two_rows ( ) {
2121 let pt = PascalsTriangle :: new ( 2 ) ;
2222 let expected: Vec < Vec < u32 > > = vec ! [ vec![ 1 ] , vec![ 1 , 1 ] ] ;
23- assert_eq ! ( expected , pt. rows( ) ) ;
23+ assert_eq ! ( pt. rows( ) , expected ) ;
2424}
2525
2626#[ test]
2727#[ ignore]
2828fn three_rows ( ) {
2929 let pt = PascalsTriangle :: new ( 3 ) ;
3030 let expected: Vec < Vec < u32 > > = vec ! [ vec![ 1 ] , vec![ 1 , 1 ] , vec![ 1 , 2 , 1 ] ] ;
31- assert_eq ! ( expected , pt. rows( ) ) ;
31+ assert_eq ! ( pt. rows( ) , expected ) ;
3232}
3333
3434#[ test]
3535#[ ignore]
36- fn last_of_four_rows ( ) {
36+ fn four_rows ( ) {
3737 let pt = PascalsTriangle :: new ( 4 ) ;
38- let expected: Vec < u32 > = vec ! [ 1 , 3 , 3 , 1 ] ;
39- assert_eq ! ( Some ( expected ) , pt. rows( ) . pop ( ) ) ;
38+ let expected: Vec < Vec < u32 > > = vec ! [ vec! [ 1 ] , vec! [ 1 , 1 ] , vec! [ 1 , 2 , 1 ] , vec! [ 1 , 3 , 3 , 1 ] ] ;
39+ assert_eq ! ( pt. rows( ) , expected ) ;
4040}
4141
4242#[ test]
@@ -50,7 +50,7 @@ fn five_rows() {
5050 vec![ 1 , 3 , 3 , 1 ] ,
5151 vec![ 1 , 4 , 6 , 4 , 1 ] ,
5252 ] ;
53- assert_eq ! ( expected , pt. rows( ) ) ;
53+ assert_eq ! ( pt. rows( ) , expected ) ;
5454}
5555
5656#[ test]
@@ -65,23 +65,7 @@ fn six_rows() {
6565 vec![ 1 , 4 , 6 , 4 , 1 ] ,
6666 vec![ 1 , 5 , 10 , 10 , 5 , 1 ] ,
6767 ] ;
68- assert_eq ! ( expected, pt. rows( ) ) ;
69- }
70-
71- #[ test]
72- #[ ignore]
73- fn seven_rows ( ) {
74- let pt = PascalsTriangle :: new ( 7 ) ;
75- let expected: Vec < Vec < u32 > > = vec ! [
76- vec![ 1 ] ,
77- vec![ 1 , 1 ] ,
78- vec![ 1 , 2 , 1 ] ,
79- vec![ 1 , 3 , 3 , 1 ] ,
80- vec![ 1 , 4 , 6 , 4 , 1 ] ,
81- vec![ 1 , 5 , 10 , 10 , 5 , 1 ] ,
82- vec![ 1 , 6 , 15 , 20 , 15 , 6 , 1 ] ,
83- ] ;
84- assert_eq ! ( expected, pt. rows( ) ) ;
68+ assert_eq ! ( pt. rows( ) , expected) ;
8569}
8670
8771#[ test]
@@ -100,5 +84,5 @@ fn ten_rows() {
10084 vec![ 1 , 8 , 28 , 56 , 70 , 56 , 28 , 8 , 1 ] ,
10185 vec![ 1 , 9 , 36 , 84 , 126 , 126 , 84 , 36 , 9 , 1 ] ,
10286 ] ;
103- assert_eq ! ( expected , pt. rows( ) ) ;
87+ assert_eq ! ( pt. rows( ) , expected ) ;
10488}
0 commit comments