diff --git a/exercises/practice/list-ops/.meta/test_template.tera b/exercises/practice/list-ops/.meta/test_template.tera index 9250e335c9d..aa5890ca2b6 100644 --- a/exercises/practice/list-ops/.meta/test_template.tera +++ b/exercises/practice/list-ops/.meta/test_template.tera @@ -56,9 +56,7 @@ fn {{ test.description | make_ident }}() { {% endif %} {% endfor %} ); - let expected = {{ test.expected }}{% if test.property is starting_with("fold") %}.0{% endif %}; - assert_eq!( output {% if test.expected is iterable %} diff --git a/exercises/practice/list-ops/.meta/tests.toml b/exercises/practice/list-ops/.meta/tests.toml index 08b1edc0443..893becc9799 100644 --- a/exercises/practice/list-ops/.meta/tests.toml +++ b/exercises/practice/list-ops/.meta/tests.toml @@ -100,7 +100,10 @@ reimplements = "be396a53-c074-4db3-8dd6-f7ed003cce7c" description = "reverse the elements of the list -> empty list" [fcc03d1e-42e0-4712-b689-d54ad761f360] -description = "reverse the elements of the list -> non-empty list" +description = "reverse the elements of the list -> non-empty even-length list" + +[64d77184-5f74-4845-b158-545d2dd2df98] +description = "reverse the elements of the list -> non-empty odd-length list" [40872990-b5b8-4cb8-9085-d91fc0d05d26] description = "reverse the elements of the list -> list of lists is not flattened" diff --git a/exercises/practice/list-ops/tests/list_ops.rs b/exercises/practice/list-ops/tests/list_ops.rs index 96c1c654dd4..0429d806de7 100644 --- a/exercises/practice/list-ops/tests/list_ops.rs +++ b/exercises/practice/list-ops/tests/list_ops.rs @@ -8,9 +8,7 @@ mod append { let list1 = vec![0i32; 0].into_iter(); let list2 = vec![0i32; 0].into_iter(); let output = append(list1, list2); - let expected = vec![]; - assert_eq!(output.collect::>(), expected); } @@ -20,9 +18,7 @@ mod append { let list1 = vec![0i32; 0].into_iter(); let list2 = vec![1, 2, 3, 4].into_iter(); let output = append(list1, list2); - let expected = vec![1, 2, 3, 4]; - assert_eq!(output.collect::>(), expected); } @@ -32,9 +28,7 @@ mod append { let list1 = vec![1, 2, 3, 4].into_iter(); let list2 = vec![0i32; 0].into_iter(); let output = append(list1, list2); - let expected = vec![1, 2, 3, 4]; - assert_eq!(output.collect::>(), expected); } @@ -44,9 +38,7 @@ mod append { let list1 = vec![1, 2].into_iter(); let list2 = vec![2, 3, 4, 5].into_iter(); let output = append(list1, list2); - let expected = vec![1, 2, 2, 3, 4, 5]; - assert_eq!(output.collect::>(), expected); } } @@ -60,9 +52,7 @@ mod concat { fn empty_list() { let lists = vec![vec![0i32; 0]; 0].into_iter().map(Vec::into_iter); let output = concat(lists); - let expected = vec![]; - assert_eq!(output.collect::>(), expected); } @@ -73,9 +63,7 @@ mod concat { .into_iter() .map(Vec::into_iter); let output = concat(lists); - let expected = vec![1, 2, 3, 4, 5, 6]; - assert_eq!(output.collect::>(), expected); } @@ -91,9 +79,7 @@ mod concat { .into_iter() .map(Vec::into_iter); let output = concat(lists); - let expected = vec![vec![1], vec![2], vec![3], vec![], vec![4, 5, 6]]; - assert_eq!(output.collect::>(), expected); } } @@ -106,9 +92,7 @@ mod filter { fn empty_list() { let list = vec![0i32; 0].into_iter(); let output = filter(list, |x| x % 2 == 1); - let expected = vec![]; - assert_eq!(output.collect::>(), expected); } @@ -117,9 +101,7 @@ mod filter { fn non_empty_list() { let list = vec![1, 2, 3, 5].into_iter(); let output = filter(list, |x| x % 2 == 1); - let expected = vec![1, 3, 5]; - assert_eq!(output.collect::>(), expected); } } @@ -132,9 +114,7 @@ mod length { fn empty_list() { let list = vec![0i32; 0].into_iter(); let output = length(list); - let expected = 0; - assert_eq!(output, expected); } @@ -143,9 +123,7 @@ mod length { fn non_empty_list() { let list = vec![1, 2, 3, 4].into_iter(); let output = length(list); - let expected = 4; - assert_eq!(output, expected); } } @@ -158,9 +136,7 @@ mod map { fn empty_list() { let list = vec![0i32; 0].into_iter(); let output = map(list, |x| x + 1); - let expected = vec![]; - assert_eq!(output.collect::>(), expected); } @@ -169,9 +145,7 @@ mod map { fn non_empty_list() { let list = vec![1, 3, 5, 7].into_iter(); let output = map(list, |x| x + 1); - let expected = vec![2, 4, 6, 8]; - assert_eq!(output.collect::>(), expected); } } @@ -185,9 +159,7 @@ mod foldl { let list = vec![0.0f64; 0].into_iter(); let initial = 2.0; let output = foldl(list, initial, |acc, el| el * acc); - let expected = 2.0; - assert_eq!(output, expected); } @@ -197,9 +169,7 @@ mod foldl { let list = vec![1.0, 2.0, 3.0, 4.0].into_iter(); let initial = 5.0; let output = foldl(list, initial, |acc, el| el + acc); - let expected = 15.0; - assert_eq!(output, expected); } @@ -209,9 +179,7 @@ mod foldl { let list = vec![1.0, 2.0, 3.0, 4.0].into_iter(); let initial = 24.0; let output = foldl(list, initial, |acc, el| el / acc); - let expected = 64.0; - assert_eq!(output, expected); } } @@ -225,9 +193,7 @@ mod foldr { let list = vec![0.0f64; 0].into_iter(); let initial = 2.0; let output = foldr(list, initial, |acc, el| el * acc); - let expected = 2.0; - assert_eq!(output, expected); } @@ -237,9 +203,7 @@ mod foldr { let list = vec![1.0, 2.0, 3.0, 4.0].into_iter(); let initial = 5.0; let output = foldr(list, initial, |acc, el| el + acc); - let expected = 15.0; - assert_eq!(output, expected); } @@ -249,9 +213,7 @@ mod foldr { let list = vec![1.0, 2.0, 3.0, 4.0].into_iter(); let initial = 24.0; let output = foldr(list, initial, |acc, el| el / acc); - let expected = 9.0; - assert_eq!(output, expected); } } @@ -264,20 +226,25 @@ mod reverse { fn empty_list() { let list = vec![0i32; 0].into_iter(); let output = reverse(list); - let expected = vec![]; - assert_eq!(output.collect::>(), expected); } #[test] #[ignore] - fn non_empty_list() { + fn non_empty_even_length_list() { let list = vec![1, 3, 5, 7].into_iter(); let output = reverse(list); - let expected = vec![7, 5, 3, 1]; + assert_eq!(output.collect::>(), expected); + } + #[test] + #[ignore] + fn non_empty_odd_length_list() { + let list = vec![1, 3, 5, 7, 9, 11, 13].into_iter(); + let output = reverse(list); + let expected = vec![13, 11, 9, 7, 5, 3, 1]; assert_eq!(output.collect::>(), expected); } @@ -288,9 +255,7 @@ mod reverse { .into_iter() .map(Vec::into_iter); let output = reverse(list); - let expected = vec![vec![4, 5, 6], vec![], vec![3], vec![1, 2]]; - assert_eq!( output .map(|subiter| subiter.collect::>())