Commit 471fd112 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

spring conflict resolved

parent 9e0da04c
......@@ -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");
}
......
......@@ -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";
......
......@@ -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");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment