spring conflict resolved

service/src/test/java/lcsb/mapviewer/services/search/chemical/CtdDapiConfiguration.java → service/src/test/java/lcsb/mapviewer/services/search/chemical/ServiceCtdDapiConfiguration.java

@@ -10,7 +10,7 @@ import lcsb.mapviewer.annotation.services.dapi.*;
 
 @Profile("ctdTestProfile")
 @Configuration
-public class CtdDapiConfiguration {
+public class ServiceCtdDapiConfiguration {
 
   @Autowired
   private DapiConnector dapiConnector;
@@ -18,7 +18,7 @@ public class CtdDapiConfiguration {
   private String dapiLogin;
   private String dapiPassword;
 
-  public CtdDapiConfiguration() {
+  public ServiceCtdDapiConfiguration() {
     dapiLogin = System.getenv("DAPI_TEST_LOGIN");
     dapiPassword = System.getenv("DAPI_TEST_PASSWORD");
   }

web/src/test/java/lcsb/mapviewer/web/ChemicalControllerIntegrationTest.java

@@ -31,7 +31,7 @@ import lcsb.mapviewer.services.interfaces.IProjectService;
 @RunWith(SpringJUnit4ClassRunner.class)
 @Transactional
 @Rollback
-@ActiveProfiles("ctdTestProfile")
+@ActiveProfiles("webCtdTestProfile")
 public class ChemicalControllerIntegrationTest extends ControllerIntegrationTest {
 
   private static String TEST_PROJECT = "TEST_PROJECT";

web/src/test/java/lcsb/mapviewer/web/CtdDapiConfiguration.java → web/src/test/java/lcsb/mapviewer/web/WebCtdDapiConfiguration.java

@@ -6,9 +6,9 @@ import org.springframework.context.annotation.*;
 
 import lcsb.mapviewer.annotation.services.dapi.*;
 
-@Profile("ctdTestProfile")
+@Profile("webCtdTestProfile")
 @Configuration
-public class CtdDapiConfiguration {
+public class WebCtdDapiConfiguration {
 
   @Autowired
   private DapiConnector dapiConnector;
@@ -16,7 +16,7 @@ public class CtdDapiConfiguration {
   private String dapiLogin;
   private String dapiPassword;
 
-  public CtdDapiConfiguration() {
+  public WebCtdDapiConfiguration() {
     dapiLogin = System.getenv("DAPI_TEST_LOGIN");
     dapiPassword = System.getenv("DAPI_TEST_PASSWORD");
   }