SORMAS-Foundation#2993 update importer tests

Author: [email protected]

sormas-ui/src/test/java/de/symeda/sormas/ui/FacadeProviderMock.java

@@ -17,6 +17,7 @@
 import de.symeda.sormas.api.outbreak.OutbreakFacade;
 import de.symeda.sormas.api.person.PersonFacade;
 import de.symeda.sormas.api.region.CommunityFacade;
+import de.symeda.sormas.api.region.CountryFacade;
 import de.symeda.sormas.api.region.DistrictFacade;
 import de.symeda.sormas.api.region.GeoShapeProvider;
 import de.symeda.sormas.api.region.RegionFacade;
@@ -43,6 +44,7 @@
 import de.symeda.sormas.backend.outbreak.OutbreakFacadeEjb.OutbreakFacadeEjbLocal;
 import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal;
 import de.symeda.sormas.backend.region.CommunityFacadeEjb.CommunityFacadeEjbLocal;
+import de.symeda.sormas.backend.region.CountryFacadeEjb;
 import de.symeda.sormas.backend.region.DistrictFacadeEjb.DistrictFacadeEjbLocal;
 import de.symeda.sormas.backend.region.GeoShapeProviderEjb.GeoShapeProviderEjbLocal;
 import de.symeda.sormas.backend.region.RegionFacadeEjb.RegionFacadeEjbLocal;
@@ -83,6 +85,8 @@ public <P> P lookupEjbRemote(Class<P> clazz) {
 			return (P) bm.getBean(SymptomsFacadeEjbLocal.class);
 		} else if (FacilityFacade.class == clazz) {
 			return (P) bm.getBean(FacilityFacadeEjbLocal.class);
+		} else if (CountryFacade.class == clazz) {
+			return (P) bm.getBean(CountryFacadeEjb.CountryFacadeEjbLocal.class);
 		} else if (RegionFacade.class == clazz) {
 			return (P) bm.getBean(RegionFacadeEjbLocal.class);
 		} else if (DistrictFacade.class == clazz) {

sormas-ui/src/test/java/de/symeda/sormas/ui/importer/InfrastructureImporterTest.java

@@ -84,11 +84,11 @@ public void testDontImportDuplicateInfrastructure() throws IOException, InvalidC
 		RDCF rdcf = new TestDataCreator().createRDCF("Default Region", "Default District", "Default Community", "Default Facility");
 		UserDto user = creator.createUser(rdcf.region.getUuid(), rdcf.district.getUuid(), rdcf.facility.getUuid(), "Default", "User", UserRole.ADMIN);
 
-		// Import region
+		// Import country
 		File countryCsvFile = new File(getClass().getClassLoader().getResource("sormas_country_import_test.csv").getFile());
 		InfrastructureImporter importer = new InfrastructureImporterExtension(countryCsvFile, user.toReference(), InfrastructureType.COUNTRY);
 		assertEquals(ImportResultStatus.COMPLETED_WITH_ERRORS, importer.runImport());
-		assertEquals(2, getCountryFacade().count(new CountryCriteria()));
+		assertEquals(1, getCountryFacade().count(new CountryCriteria()));
 
 		// Import region
 		File regionCsvFile = new File(getClass().getClassLoader().getResource("sormas_region_import_test.csv").getFile());

sormas-ui/src/test/resources/META-INF/persistence.xml

@@ -26,6 +26,7 @@
 		<class>de.symeda.sormas.backend.region.Community</class>
 		<class>de.symeda.sormas.backend.region.District</class>
 		<class>de.symeda.sormas.backend.region.Region</class>
+		<class>de.symeda.sormas.backend.region.Country</class>
 		<class>de.symeda.sormas.backend.report.WeeklyReport</class>
 		<class>de.symeda.sormas.backend.report.WeeklyReportEntry</class>
 		<class>de.symeda.sormas.backend.sample.Sample</class>

sormas-ui/src/test/resources/sormas_country_import_test.csv

@@ -0,0 +1,3 @@
+defaultName,externalId,isoCode,unoCode,archived
+Country with ä,123,XYZ,456,false
+Country with ä,123,XYZ,456,false