Added test helper to prevent duplicate code

Author: Lionqueen94

backend/apportionment/src/candidate_nomination/mod.rs

@@ -262,11 +262,6 @@ fn update_candidate_ranking<T: CandidateVotesTrait>(
 mod tests {
     use test_log::test;
 
-    use crate::test_helpers::{
-        candidate_nomination_fixture_with_given_list_numbers_and_number_of_seats,
-        seat_assignment_fixture_with_given_candidate_votes,
-        seat_assignment_fixture_with_given_list_numbers_and_candidate_votes,
-    };
     use crate::{
         ApportionmentError, CandidateVotesTrait,
         candidate_nomination::{
@@ -276,8 +271,10 @@ mod tests {
         structs::ListNumber,
         test_helpers::{
             ApportionmentInputMock, CandidateVotesMock,
+            candidate_nomination_fixture_with_given_list_numbers_and_number_of_seats,
             candidate_nomination_fixture_with_given_number_of_seats,
             seat_assignment_fixture_with_given_candidate_votes,
+            seat_assignment_fixture_with_given_list_numbers_and_candidate_votes,
         },
     };
 

backend/apportionment/src/seat_assignment/mod.rs

@@ -283,8 +283,12 @@ pub(crate) mod tests {
     use crate::{
         SeatAssignmentResult,
         fraction::Fraction,
-        seat_assignment::{ListStanding, SeatChange, list_numbers},
+        seat_assignment::{
+            ListStanding, SeatChange, get_total_seats_per_list_number_from_apportionment_result,
+            list_numbers,
+        },
         structs::ListNumber,
+        test_helpers::convert_total_seats_per_u32_list_number_to_total_seats_per_list_number,
     };
     use test_log::test;
 
@@ -297,17 +301,14 @@ pub(crate) mod tests {
 
     fn check_total_seats_per_list(
         result: &SeatAssignmentResult,
-        expected_total_seats: Vec<(u32, u32)>,
+        expected_total_seats_per_list: Vec<(u32, u32)>,
     ) {
-        let total_seats_per_list_number = result
-            .final_standing
-            .iter()
-            .map(|p| (p.list_number, p.total_seats))
-            .collect::<Vec<_>>();
-        let expected_total_seats_per_list_number: Vec<(ListNumber, u32)> = expected_total_seats
-            .iter()
-            .map(|(number, seats)| (ListNumber::from(*number), *seats))
-            .collect();
+        let total_seats_per_list_number =
+            get_total_seats_per_list_number_from_apportionment_result(result);
+        let expected_total_seats_per_list_number =
+            convert_total_seats_per_u32_list_number_to_total_seats_per_list_number(
+                expected_total_seats_per_list,
+            );
         assert_eq!(
             expected_total_seats_per_list_number,
             total_seats_per_list_number

backend/apportionment/src/test_helpers.rs

@@ -84,6 +84,16 @@ impl ListVotesMock {
     }
 }
 
+#[cfg(test)]
+pub fn convert_total_seats_per_u32_list_number_to_total_seats_per_list_number(
+    total_seats_per_list_number: Vec<(u32, u32)>,
+) -> Vec<(ListNumber, u32)> {
+    total_seats_per_list_number
+        .iter()
+        .map(|(number, total_seats)| (ListNumber::from(*number), *total_seats))
+        .collect()
+}
+
 /// Create a CandidateNominationInput with consecutive list numbers and
 /// given quota, number of seats, candidate votes and total seats per list.
 pub fn candidate_nomination_fixture_with_given_number_of_seats(
@@ -116,10 +126,10 @@ pub fn candidate_nomination_fixture_with_given_list_numbers_and_number_of_seats(
         number_of_seats: seat_assignment_input.number_of_seats,
         list_votes: &seat_assignment_input.list_votes,
         quota,
-        total_seats_per_list: total_seats_per_list_number
-            .iter()
-            .map(|(number, total_seats)| (ListNumber::from(*number), *total_seats))
-            .collect(),
+        total_seats_per_list:
+            convert_total_seats_per_u32_list_number_to_total_seats_per_list_number(
+                total_seats_per_list_number,
+            ),
     }
 }