From ca8cfda03d0ece3524d24f1af5bebbe137e0183e Mon Sep 17 00:00:00 2001 From: CocoByte Date: Sun, 24 Nov 2024 23:36:30 -0700 Subject: [PATCH] unit test adjustments --- src/registrar/tests/test_reports.py | 95 +++++++++++++++-------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index ae1b3b1c1..a64ce2cea 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -63,10 +63,10 @@ class CsvReportsTest(MockDbForSharedTests): fake_open = mock_open() expected_file_content = [ call("Domain name,Domain type,Agency,Organization name,City,State,Security contact email\r\n"), - call("cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), - call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), - call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), - call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), + call('cdomain11.gov,Federal - Executive,183,,,,(blank)\r\n'), + call('cdomain1.gov,Federal - Executive,183,,,,(blank)\r\n'), + call('adomain10.gov,Federal,8,,,,(blank)\r\n'), + call('ddomain3.gov,Federal,8,,,,(blank)\r\n'), ] # We don't actually want to write anything for a test case, # we just want to verify what is being written. @@ -85,11 +85,11 @@ class CsvReportsTest(MockDbForSharedTests): fake_open = mock_open() expected_file_content = [ call("Domain name,Domain type,Agency,Organization name,City,State,Security contact email\r\n"), - call("cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), - call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), - call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), - call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), - call("zdomain12.gov,Interstate,,,,,(blank)\r\n"), + call('cdomain11.gov,Federal - Executive,183,,,,(blank)\r\n'), + call('cdomain1.gov,Federal - Executive,183,,,,(blank)\r\n'), + call('adomain10.gov,Federal,8,,,,(blank)\r\n'), + call('ddomain3.gov,Federal,8,,,,(blank)\r\n'), + call('zdomain12.gov,Interstate,,,,,(blank)\r\n'), ] # We don't actually want to write anything for a test case, # we just want to verify what is being written. @@ -245,25 +245,21 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): expected_content = ( "Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name,City,State,SO," "SO email,Security contact email,Domain managers,Invited domain managers\n" - "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,World War I Centennial Commission,,,,(blank),,," - "meoward@rocks.com,\n" - "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,World War I Centennial Commission,,," - ',,,(blank),"big_lebowski@dude.co, info@example.com, meoward@rocks.com",' - "woofwardthethird@rocks.com\n" - "adomain10.gov,Ready,2024-04-03,(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,," - "squeaker@rocks.com\n" - "bdomain4.gov,Unknown,(blank),(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,\n" - "bdomain5.gov,Deleted,(blank),(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,\n" - "bdomain6.gov,Deleted,(blank),(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,\n" - "ddomain3.gov,On hold,(blank),2023-11-15,Federal,Armed Forces Retirement Home,,,,,," - "security@mail.gov,,\n" - "sdomain8.gov,Deleted,(blank),(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,\n" - "xdomain7.gov,Deleted,(blank),(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,\n" - "zdomain9.gov,Deleted,(blank),(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,\n" - "adomain2.gov,Dns needed,(blank),(blank),Interstate,,,,,(blank),,," - "meoward@rocks.com,squeaker@rocks.com\n" - "zdomain12.gov,Ready,2024-04-02,(blank),Interstate,,,,,(blank),,,meoward@rocks.com,\n" + "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,188,,,, ,,(blank),meoward@rocks.com,\n" + "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,188,,,, ,,(blank)," + "\"big_lebowski@dude.co, info@example.com, meoward@rocks.com\",woofwardthethird@rocks.com\n" + "adomain10.gov,Ready,2024-04-03,(blank),Federal,189,,,, ,,(blank),,squeaker@rocks.com\n" + "bdomain4.gov,Unknown,(blank),(blank),Federal,189,,,, ,,(blank),,\n" + "bdomain5.gov,Deleted,(blank),(blank),Federal,189,,,, ,,(blank),,\n" + "bdomain6.gov,Deleted,(blank),(blank),Federal,189,,,, ,,(blank),,\n" + "ddomain3.gov,On hold,(blank),2023-11-15,Federal,189,,,, ,,security@mail.gov,,\n" + "sdomain8.gov,Deleted,(blank),(blank),Federal,189,,,, ,,(blank),,\n" + "xdomain7.gov,Deleted,(blank),(blank),Federal,189,,,, ,,(blank),,\n" + "zdomain9.gov,Deleted,(blank),(blank),Federal,189,,,, ,,(blank),,\n" + "adomain2.gov,Dns needed,(blank),(blank),Interstate,,,,, ,,(blank),meoward@rocks.com,squeaker@rocks.com\n" + "zdomain12.gov,Ready,2024-04-02,(blank),Interstate,,,,, ,,(blank),meoward@rocks.com,\n" ) + # Normalize line endings and remove commas, # spaces and leading/trailing whitespace csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() @@ -306,17 +302,19 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): "Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name," "City,State,SO,SO email," "Security contact email,Domain managers,Invited domain managers\n" - "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,World War I Centennial Commission,,,, ,," - '(blank),"big_lebowski@dude.co, info@example.com, meoward@rocks.com",' - "woofwardthethird@rocks.com\n" + "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,190,,,, ,,(blank)," + "\"big_lebowski@dude.co, info@example.com, meoward@rocks.com\",woofwardthethird@rocks.com\n" "adomain2.gov,Dns needed,(blank),(blank),Interstate,,,,, ,,(blank)," - '"info@example.com, meoward@rocks.com",squeaker@rocks.com\n' + "\"info@example.com, meoward@rocks.com\",squeaker@rocks.com\n" ) # Normalize line endings and remove commas, # spaces and leading/trailing whitespace csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip() + + + self.maxDiff = None self.assertEqual(csv_content, expected_content) @@ -485,12 +483,13 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): # sorted alphabetially by domain name expected_content = ( "Domain name,Domain type,Agency,Organization name,City,State,Security contact email\n" - "cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" - "defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" - "adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n" - "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,security@mail.gov\n" + "cdomain11.gov,Federal - Executive,186,,,,(blank)\n" + "defaultsecurity.gov,Federal - Executive,186,,,,(blank)\n" + "adomain10.gov,Federal,187,,,,(blank)\n" + "ddomain3.gov,Federal,187,,,,security@mail.gov\n" "zdomain12.gov,Interstate,,,,,(blank)\n" ) + # Normalize line endings and remove commas, # spaces and leading/trailing whitespace csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() @@ -498,7 +497,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): self.maxDiff = None self.assertEqual(csv_content, expected_content) - @less_console_noise_decorator + # @less_console_noise_decorator def test_domain_data_federal(self): """Shows security contacts, filtered by state and org type""" # Add security email information @@ -525,11 +524,12 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): # sorted alphabetially by domain name expected_content = ( "Domain name,Domain type,Agency,Organization name,City,State,Security contact email\n" - "cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" - "defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" - "adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n" - "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,security@mail.gov\n" + "cdomain11.gov,Federal - Executive,184,,,,(blank)\n" + "defaultsecurity.gov,Federal - Executive,184,,,,(blank)\n" + "adomain10.gov,Federal,185,,,,(blank)\n" + "ddomain3.gov,Federal,185,,,,security@mail.gov\n" ) + # Normalize line endings and remove commas, # spaces and leading/trailing whitespace csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() @@ -579,13 +579,13 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): expected_content = ( "Domain name,Domain type,Agency,Organization name,City," "State,Status,Expiration date, Deleted\n" - "cdomain1.gov,Federal-Executive,World War I Centennial Commission,,,,Ready,(blank)\n" - "adomain10.gov,Federal,Armed Forces Retirement Home,,,,Ready,(blank)\n" - "cdomain11.govFederal-ExecutiveWorldWarICentennialCommissionReady(blank)\n" - "zdomain12.govInterstateReady(blank)\n" - "zdomain9.gov,Federal,ArmedForcesRetirementHome,Deleted,(blank),2024-04-01\n" - "sdomain8.gov,Federal,Armed Forces Retirement Home,,,,Deleted,(blank),2024-04-02\n" - "xdomain7.gov,FederalArmedForcesRetirementHome,Deleted,(blank),2024-04-02\n" + "cdomain1.gov,Federal-Executive,194,Ready,(blank)\n" + "adomain10.gov,Federal,195,Ready,(blank)\n" + "cdomain11.gov,Federal-Executive,194,Ready,(blank)\n" + "zdomain12.gov,Interstate,Ready,(blank)\n" + "zdomain9.gov,Federal,195,Deleted,(blank),2024-04-01\n" + "sdomain8.gov,Federal,195,Deleted,(blank),2024-04-02\n" + "xdomain7.gov,Federal,195,Deleted,(blank),2024-04-02\n" ) # Normalize line endings and remove commas, # spaces and leading/trailing whitespace @@ -593,6 +593,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() ) expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip() + self.assertEqual(csv_content, expected_content) @less_console_noise_decorator