Merge pull request #822 from NHSDigital/MAV-2790

chinmaymudholkar1 · web-flow · commit 7d810e496361 · 2025-12-09T18:43:14.000Z
Added three new postcodes from MAV-2790
diff --git a/mavis/test/data/child/i_positive.csv b/mavis/test/data/child/i_positive.csv
@@ -7,3 +7,7 @@ UnicodeApostrophe1,Tʼest1,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_
 UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,<<RANDOM_POSTCODE>>,8T5,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
 UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,<<RANDOM_POSTCODE>>,8T5,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
 DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,<<RANDOM_POSTCODE>>,8T5,Parent1,Dad,dad@example.com,,Parent2,Mum,dad@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeNFA,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,ZZ99 3VZ,8T5,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeAddressNotKnown,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,ZZ99 3WZ,8T5,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeAddressNotSpecified,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,ZZ99 3CZ,8T5,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+
diff --git a/mavis/test/data/child/o_positive.txt b/mavis/test/data/child/o_positive.txt
@@ -1 +1 @@
-8 imported records
+11 imported records
diff --git a/mavis/test/data/class_list/i_positive.csv b/mavis/test/data/class_list/i_positive.csv
@@ -3,8 +3,11 @@ AllValidValues,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YE
 YearGroupOverride,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<DOB_YEAR_8>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
 SameYearGroup,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
 EmptyPostCode,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
-EmptyYearGroup,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,
-UnicodeApostrophe1,Tʼest1,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
-UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
-UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
-DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,dad@example.com,,Parent2,Mum,dad@example.com,,<<FIXED_YEAR_GROUP>>
+EmptyYearGroup,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,
+UnicodeApostrophe1,Tʼest1,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,dad@example.com,,Parent2,Mum,dad@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeNFA,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,ZZ99 3VZ,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeAddressNotKnown,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,ZZ99 3WZ,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeAddressNotSpecified,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,ZZ99 3CZ,Parent1,Dad,dad@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
diff --git a/mavis/test/data/class_list/o_positive.txt b/mavis/test/data/class_list/o_positive.txt
@@ -1 +1 @@
-9 imported records
+12 imported records
diff --git a/mavis/test/data/cohorts/i_positive.csv b/mavis/test/data/cohorts/i_positive.csv
@@ -6,3 +6,6 @@ UnicodeApostrophe1,Tʼest1,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>
 UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,<<RANDOM_POSTCODE>>,Parent1,Dad,dad1@example.com,,Parent2,Mum,mum1@example.com,,<<FIXED_YEAR_GROUP>>
 UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,<<RANDOM_POSTCODE>>,Parent1,Dad,dad1@example.com,,Parent2,Mum,mum1@example.com,,<<FIXED_YEAR_GROUP>>
 DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,<<RANDOM_POSTCODE>>,Parent1,Dad,dad1@example.com,,Parent2,Mum,dad1@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeNFA,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,ZZ99 3VZ,Parent1,Dad,dad1@example.com,,Parent2,Mum,mum1@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeAddressNotKnown,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,ZZ99 3WZ,Parent1,Dad,dad1@example.com,,Parent2,Mum,mum@example.com,,<<FIXED_YEAR_GROUP>>
+PostcodeAddressNotSpecified,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,ZZ99 3CZ,Parent1,Dad,dad1@example.com,,Parent2,Mum,mum1@example.com,,<<FIXED_YEAR_GROUP>>
diff --git a/mavis/test/data/cohorts/o_positive.txt b/mavis/test/data/cohorts/o_positive.txt
@@ -1 +1 @@
-7 imported records
+10 imported records
diff --git a/mavis/test/data/vaccs/i_hist_positive.csv b/mavis/test/data/vaccs/i_hist_positive.csv
@@ -33,3 +33,6 @@ MMR_SiteRAL,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<
 MMR_NotVaccinated,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Priorix,,,,,N,1,,,<<NURSE_EMAIL>>,Clinic,00:01,Refused,,MMR
 MMR_DoseSeq1,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,20231028,Priorix,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
 MMR_DoseSeq2,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,20231114,Priorix,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
+HPV_PostcodeNFA,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3VZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_PostcodeAddressNotKnown,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3WZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_PostcodeAddressNotSpecified,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3CZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
diff --git a/mavis/test/data/vaccs/i_positive.csv b/mavis/test/data/vaccs/i_positive.csv
@@ -45,4 +45,7 @@ MMR_DoseSeq2WithoutSess,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM
 MMR_UnknownDoseSeq,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Priorix,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,<<SESSION_ID>>,MMR
 MMR_NoDelayDose1,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<CHILD_0_NHS_NO>>,<<CHILD_0_FIRST_NAME>>,<<CHILD_0_LAST_NAME>>,<<CHILD_0_DATE_OF_BIRTH>>,Male,<<CHILD_0_POSTCODE>>,<<VACCS_DATE>>,Priorix,AutoBatch1,20300730,left upper arm,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
 MMR_NoDelayDose2,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<CHILD_0_NHS_NO>>,<<CHILD_0_FIRST_NAME>>,<<CHILD_0_LAST_NAME>>,<<CHILD_0_DATE_OF_BIRTH>>,Male,<<CHILD_0_POSTCODE>>,<<VACCS_DATE>>,Priorix,AutoBatch1,20300730,left upper arm,2,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
-MMR_NoDelayDoseUnknown,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<CHILD_0_NHS_NO>>,<<CHILD_0_FIRST_NAME>>,<<CHILD_0_LAST_NAME>>,<<CHILD_0_DATE_OF_BIRTH>>,Male,<<CHILD_0_POSTCODE>>,<<VACCS_DATE>>,Priorix,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
+MMR_NoDelayDoseUnknown,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<CHILD_0_NHS_NO>>,<<CHILD_0_FIRST_NAME>>,<<CHILD_0_LAST_NAME>>,<<CHILD_0_DATE_OF_BIRTH>>,Male,<<CHILD_0_POSTCODE>>,<<VACCS_DATE>>,Priorix,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
+HPV_PostcodeNFA,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3VZ,<<VACCS_DATE>>,Gardasil9,,,,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_PostcodeAddressNotKnown,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3WZ,<<VACCS_DATE>>,Gardasil9,,,,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_PostcodeAddressNotSpecified,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3CZ,<<VACCS_DATE>>,Gardasil9,,,,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
diff --git a/mavis/test/data/vaccs/o_hist_positive.txt b/mavis/test/data/vaccs/o_hist_positive.txt
@@ -1 +1 @@
-34 imported records
+37 imported records
diff --git a/mavis/test/data/vaccs/o_positive.txt b/mavis/test/data/vaccs/o_positive.txt
@@ -1 +1 @@
-47 imported records
+50 imported records
diff --git a/tests/test_import_child_lists.py b/tests/test_import_child_lists.py
@@ -36,7 +36,8 @@ def test_child_list_file_upload_valid_data(
     - Output indicates successful import of records.
     Scenarios covered:
     AllValidValues, Homeschooled, UnknownSchool, YearGroupEmpty, UnicodeApostrophe1,
-    UnicodeApostrophe2, UnicodeApostrophe3, DuplicateEmail
+    UnicodeApostrophe2, UnicodeApostrophe3, DuplicateEmail, PostcodeNFA,
+    PostcodeAddressNotKnown, PostcodeAddressNotSpecified
     """
     ImportRecordsWizardPage(page, file_generator).upload_and_verify_output(
         ChildFileMapping.POSITIVE
diff --git a/tests/test_import_class_lists.py b/tests/test_import_class_lists.py
@@ -54,7 +54,8 @@ def test_class_list_file_upload_valid_data(
     - Output indicates successful import of records.
     Scenarios covered:
     AllValidValues, YearGroupOverride, SameYearGroup, EmptyPostCode, EmptyYearGroup,
-    UnicodeApostrophe1, UnicodeApostrophe2, UnicodeApostrophe3, DuplicateEmail
+    UnicodeApostrophe1, UnicodeApostrophe2, UnicodeApostrophe3, DuplicateEmail,
+    PostcodeNFA, PostcodeAddressNotKnown, PostcodeAddressNotSpecified
     """
     ImportRecordsWizardPage(page, file_generator).upload_and_verify_output(
         ClassFileMapping.POSITIVE
diff --git a/tests/test_import_historical_vaccinations.py b/tests/test_import_historical_vaccinations.py
@@ -41,6 +41,7 @@ def test_vaccination_file_upload_historic_valid_data(
     HPV:
     HPV_Gardasil9, HPV_Gardasil, HPV_Cervarix, HPV_NFA, HPV_Add_Not_Known,
     HPV_AllowPastExpiryDate, HPV_SiteRAU, HPV_SiteRAL, HPV_NotVaccinated,
+    HPV_AddressNFA, HPV_AddressNotKnown, HPV_AddressNotSpecified
     Doubles:
     TDIPV_Revaxis, TDIPV_NFA, TDIPV_Add_Not_Known, TDIPV_AllowPastExpiryDate,
     TDIPV_SiteRAU, TDIPV_SiteRAL, TDIPV_NotVaccinated, MenACWY_MenQuadfi, MenACWY_NFA,
diff --git a/tests/test_import_offline_vaccinations.py b/tests/test_import_offline_vaccinations.py
@@ -69,6 +69,7 @@ def test_vaccination_file_upload_valid_data(setup_vaccs, page, file_generator):
     HPV:
     HPV_Optional, HPV_Gardasil9, HPV_Gardasil, HPV_Cervarix, HPV_NFA, HPV_Add_Not_Known,
     HPV_AllowPastExpiryDate, HPV_SiteRAU, HPV_SiteRAL, HPV_NotVaccinated,
+    HPV_AddressNFA, HPV_AddressNotKnown, HPV_AddressNotSpecified
     Doubles:
     TDIPV_Optional, TDIPV_NFA, TDIPV_Add_Not_Known, TDIPV_AllowPastExpiryDate,
     TDIPV_SiteRAU, TDIPV_SiteRAL, TDIPV_NotVaccinated, MenACWY_Optional, MenACWY_NFA,

-Original file line number
+Diff line change
 UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,<<RANDOM_POSTCODE>>,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,<<RANDOM_POSTCODE>>,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,<<RANDOM_POSTCODE>>,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeNFA,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,ZZ99 3VZ,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeAddressNotKnown,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,ZZ99 3WZ,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeAddressNotSpecified,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<SCHOOL_0_URN>>,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,ZZ99 3CZ,8T5,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
++
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-8 imported records`
	`1`	`+11 imported records`
-Original file line number
+Diff line change
 YearGroupOverride,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<DOB_YEAR_8>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 SameYearGroup,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 EmptyPostCode,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 -EmptyYearGroup,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,
 -UnicodeApostrophe1,Tʼest1,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 -UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 -UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 -DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +EmptyYearGroup,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,
 +UnicodeApostrophe1,Tʼest1,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeNFA,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,ZZ99 3VZ,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeAddressNotKnown,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,ZZ99 3WZ,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeAddressNotSpecified,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,PrefFirst1,PrefLast1,<<FIXED_YEAR_GROUP_DOB>>,<<RANDOM_NHS_NO>>,Male,Addr1,Addr2,Town,8T5,ZZ99 3CZ,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-9 imported records`
	`1`	`+12 imported records`
-Original file line number
+Diff line change
 UnicodeApostrophe2,T`est2,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 UnicodeApostrophe3,T’est3,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 DuplicateEmail,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,<<RANDOM_POSTCODE>>,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeNFA,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,ZZ99 3VZ,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeAddressNotKnown,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,ZZ99 3WZ,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
 +PostcodeAddressNotSpecified,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,ChildCommon,<<FIXED_YEAR_GROUP_DOB>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,Addr1,Add2,City,ZZ99 3CZ,Parent1,Dad,[email protected],,Parent2,Mum,[email protected],,<<FIXED_YEAR_GROUP>>
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-7 imported records`
	`1`	`+10 imported records`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-34 imported records`
	`1`	`+37 imported records`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-47 imported records`
	`1`	`+50 imported records`