Merge pull request DIGI-UW#1759 from AdarshSamani/siteinformation

Site Information Service Integration Test

Author: mozzy11

src/test/java/org/openelisglobal/AppTestConfig.java

@@ -8,6 +8,7 @@
 import java.util.List;
 import lombok.NonNull;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.jasypt.util.text.TextEncryptor;
 import org.openelisglobal.audittrail.dao.AuditTrailService;
 import org.openelisglobal.citystatezip.service.CityStateZipService;
 import org.openelisglobal.common.services.IStatusService;
@@ -30,7 +31,6 @@
 import org.openelisglobal.reports.service.WHONetReportServiceImpl;
 import org.openelisglobal.requester.service.RequesterTypeService;
 import org.openelisglobal.sampleqaevent.service.SampleQaEventService;
-import org.openelisglobal.siteinformation.service.SiteInformationService;
 import org.openelisglobal.testresult.service.TestResultService;
 import org.openelisglobal.typeofsample.service.TypeOfSampleService;
 import org.openelisglobal.typeofsample.service.TypeOfSampleTestService;
@@ -72,20 +72,28 @@
         "org.openelisglobal.systemmodule", "org.openelisglobal.testdictionary", "org.openelisglobal.dictionarycategory",
         "org.openelisglobal.observationhistorytype", "org.openelisglobal.statusofsample", "org.openelisglobal.test",
         "org.openelisglobal.analyzerimport", "org.openelisglobal.analyzer", "org.openelisglobal.testanalyte",
-        "org.openelisglobal.observationhistory", "org.openelisglobal.systemusersection" }, excludeFilters = {
+        "org.openelisglobal.observationhistory", "org.openelisglobal.systemusersection",
+        "org.openelisglobal.siteinformation", "org.openelisglobal.config" }, excludeFilters = {
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.organization.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.sample.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.result.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.login.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.program.controller.*"),
+                @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.siteinformation.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.config.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.fhir.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.*.fhir.*"),
                 @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = WHONetReportServiceImpl.class) })
 @EnableWebMvc
 public class AppTestConfig implements WebMvcConfigurer {
 
+    @Bean
+    @Profile("test")
+    public TextEncryptor textEncryptor() {
+        return mock(TextEncryptor.class);
+    }
+
     @Bean()
     @Profile("test")
     public PluginAnalyzerService pluginAnalyzerService() {
@@ -236,12 +244,6 @@ public Versioning versioning() {
         return mock(Versioning.class);
     }
 
-    @Bean()
-    @Profile("test")
-    public SiteInformationService siteInformationService() {
-        return mock(SiteInformationService.class);
-    }
-
     @Bean
     @Profile("test")
     public PasswordEncoder passwordEncoder() {
@@ -296,4 +298,4 @@ public void configureMessageConverters(@NonNull List<HttpMessageConverter<?>> co
         converters.add(jsonConverter());
     }
 
-}
+}