From 352267871cbc30d201c53179da3a31d9f5657d44 Mon Sep 17 00:00:00 2001
From: Your Name <ben290996@gmail.com>
Date: Sat, 15 Apr 2023 17:19:16 +0100
Subject: [PATCH 1/2] fix: Added some extra tests to validate iterators5
 solution

closes: #1387
---
 exercises/iterators/iterators5.rs | 53 ++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/exercises/iterators/iterators5.rs b/exercises/iterators/iterators5.rs
index 8709795..45f0d48 100644
--- a/exercises/iterators/iterators5.rs
+++ b/exercises/iterators/iterators5.rs
@@ -65,12 +65,27 @@ mod tests {
     }
 
     #[test]
-    fn count_equals_for() {
+    fn count_some() {
         let map = get_map();
-        assert_eq!(
-            count_for(&map, Progress::Complete),
-            count_iterator(&map, Progress::Complete)
-        );
+        assert_eq!(1, count_iterator(&map, Progress::Some));
+    }
+
+    #[test]
+    fn count_none() {
+        let map = get_map();
+        assert_eq!(2, count_iterator(&map, Progress::None));
+    }
+
+    #[test]
+    fn count_complete_equals_for() {       
+        let map = get_map();
+        let progressStates = vec![Progress::Complete, Progress::Some, Progress::None];
+        for progressState in progressStates {
+            assert_eq!(
+                count_for(&map, progressState),
+                count_iterator(&map, progressState)
+            );
+        }
     }
 
     #[test]
@@ -83,14 +98,36 @@ mod tests {
     }
 
     #[test]
-    fn count_collection_equals_for() {
+    fn count_collection_some() {
         let collection = get_vec_map();
         assert_eq!(
-            count_collection_for(&collection, Progress::Complete),
-            count_collection_iterator(&collection, Progress::Complete)
+            1,
+            count_collection_iterator(&collection, Progress::Some)
         );
     }
 
+    #[test]
+    fn count_collection_none() {
+        let collection = get_vec_map();
+        assert_eq!(
+            4,
+            count_collection_iterator(&collection, Progress::None)
+        );
+    }
+
+    #[test]
+    fn count_collection_equals_for() {
+        let progressStates = vec![Progress::Complete, Progress::Some, Progress::None];
+        let collection = get_vec_map();
+
+        for progressState in progressStates {
+            assert_eq!(
+                count_collection_for(&collection, progressState),
+                count_collection_iterator(&collection, progressState)
+            );
+        }
+    }
+
     fn get_map() -> HashMap<String, Progress> {
         use Progress::*;
 

From a6f99645c6cb1b5493e1fbf16576ab5c0f1dd88c Mon Sep 17 00:00:00 2001
From: liv <shadows_withal@fastmail.com>
Date: Wed, 17 May 2023 16:02:39 +0200
Subject: [PATCH 2/2] chore: rustfmt

---
 exercises/iterators/iterators5.rs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/exercises/iterators/iterators5.rs b/exercises/iterators/iterators5.rs
index 45f0d48..dcf0742 100644
--- a/exercises/iterators/iterators5.rs
+++ b/exercises/iterators/iterators5.rs
@@ -77,7 +77,7 @@ mod tests {
     }
 
     #[test]
-    fn count_complete_equals_for() {       
+    fn count_complete_equals_for() {
         let map = get_map();
         let progressStates = vec![Progress::Complete, Progress::Some, Progress::None];
         for progressState in progressStates {
@@ -100,19 +100,13 @@ mod tests {
     #[test]
     fn count_collection_some() {
         let collection = get_vec_map();
-        assert_eq!(
-            1,
-            count_collection_iterator(&collection, Progress::Some)
-        );
+        assert_eq!(1, count_collection_iterator(&collection, Progress::Some));
     }
 
     #[test]
     fn count_collection_none() {
         let collection = get_vec_map();
-        assert_eq!(
-            4,
-            count_collection_iterator(&collection, Progress::None)
-        );
+        assert_eq!(4, count_collection_iterator(&collection, Progress::None));
     }
 
     #[test]