Skip to content

Commit

Permalink
Revert change in previous commit - for discussion
Browse files Browse the repository at this point in the history
  • Loading branch information
JenCheshire committed Nov 1, 2024
1 parent cd40813 commit 1339dea
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions tests/test_site_apportionment/test_site_apportionment.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ def create_exp_to_apportion_output(self):
data1 = [
[2, 1, "0001", "CB1 3NF", 60.0, 2.0, "Clear", "R", "CB1 3NF", "cym"],
[2, 2, "0001", "BA1 5DA", 40.0, 2.0, "Clear", "R", "BA1 5DA", "cym"],
[3, 1, "0001", "DE72 3AU", 100.0, 1.0, "Check needed", "TMI", "DE72 3AU", "cym"],
[3, 2, "0001", np.nan, np.nan, 1.0, "Check needed", "No mean found", "NP30 7ZZ", "cym"],
[4, 1, "0001", "CF10 BZZ", 100.0, 1.0, "Form sent out", "TMI", "CF10 BZZ", "cym"],
[5, 1, "0001", "SA50 5BE", 100.0, 1.0, "Form sent out", "No mean found", "SA50 5BE", "cym"],
]

exp_output_df1 = pandasDF(data=data1, columns=exp_output_cols1)
Expand Down Expand Up @@ -158,8 +162,6 @@ def create_exp_remaining_output(self):
[1, 2, "0006", np.nan, 100.0, np.nan, "Clear", "R", "NP10 5XX", "cym"],
[2, 0, "0001", np.nan, np.nan, 2.0, "Clear", "R", "NP20 6YY", "cym"],
[3, 0, "0001", np.nan, np.nan, 1.0, "Check needed", "TMI", "NP30 7ZZ", "cym"],
[3, 1, "0001", "DE72 3AU", 100.0, 1.0, "Check needed", "TMI", "DE72 3AU", "cym"],
[4, 1, "0001", "CF10 BZZ", 100.0, 1.0, "Form sent out", "TMI", "CF10 BZZ", "cym"],
]
exp_output_df2 = pandasDF(data=data2, columns=exp_output_cols2)
exp_output_df2 = exp_output_df2.astype({"601": object})
Expand All @@ -179,9 +181,6 @@ def test_split_sites_df(self, create_exp_percent_test_output_df):
assert_frame_equal(
result_to_apportion.reset_index(drop=True), exp_to_apportion_df
)

print(result_df_out)
print(exp_df_out)
assert_frame_equal(result_df_out.reset_index(drop=True), exp_df_out)


Expand Down

0 comments on commit 1339dea

Please sign in to comment.