diff --git a/service/src/main/java/lcsb/mapviewer/services/interfaces/IExternalServicesService.java b/service/src/main/java/lcsb/mapviewer/services/interfaces/IExternalServicesService.java deleted file mode 100644 index 241fdc2422aadcf35674235c59bb7584ace569c8..0000000000000000000000000000000000000000 --- a/service/src/main/java/lcsb/mapviewer/services/interfaces/IExternalServicesService.java +++ /dev/null @@ -1,42 +0,0 @@ -package lcsb.mapviewer.services.interfaces; - -import java.util.List; - -import lcsb.mapviewer.annotation.services.ExternalServiceStatus; -import lcsb.mapviewer.annotation.services.IExternalService; - -/** - * Service that retrieves information about services that access external - * resources (like chebi, chembl, etc.). - * - * @author Piotr Gawron - * - */ -public interface IExternalServicesService { - - /** - * Returns status information about all services. - * - * @return status information about all services - */ - List<ExternalServiceStatus> getExternalServiceStatuses(); - - /** - * Registers service that access external resource. - * - * @param service - * service that access external resource - */ - void registerService(IExternalService service); - - /** - * Registers default list of services. - */ - void registerDefaultServices(); - - /** - * Clears list of known services. - */ - void clearServices(); - -} diff --git a/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java b/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java index fdc74c0f972fcf266ca51e885b64d4857aec4107..d90d28f73b8f52ea3adec670f62d21b145f049bb 100644 --- a/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java +++ b/service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java @@ -69,7 +69,6 @@ import lcsb.mapviewer.persist.dao.user.PrivilegeDao; import lcsb.mapviewer.persist.dao.user.UserDao; import lcsb.mapviewer.services.interfaces.ICommentService; import lcsb.mapviewer.services.interfaces.IConfigurationService; -import lcsb.mapviewer.services.interfaces.IExternalServicesService; import lcsb.mapviewer.services.interfaces.ILayoutService; import lcsb.mapviewer.services.interfaces.IModelService; import lcsb.mapviewer.services.interfaces.IProjectService; @@ -85,9 +84,6 @@ import lcsb.mapviewer.services.search.drug.IDrugService; public abstract class ServiceTestFunctions { private Logger logger = LogManager.getLogger(ServiceTestFunctions.class); - @Autowired - protected ChEMBLParser chemblParser; - @Autowired protected DrugbankHTMLParser drugBankHTMLParser; @@ -102,9 +98,6 @@ public abstract class ServiceTestFunctions { @Autowired protected IModelService modelService; - @Autowired - protected IExternalServicesService externalServicesService; - @Autowired protected ILayoutService layoutService; diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/AllImplServiceTests.java b/service/src/test/java/lcsb/mapviewer/services/impl/AllImplServiceTests.java index cc2d3256ee8978e95d67e8393838719d1f42c26e..8f0f6c8e27e20a9e51e87b40406efc898142a125 100644 --- a/service/src/test/java/lcsb/mapviewer/services/impl/AllImplServiceTests.java +++ b/service/src/test/java/lcsb/mapviewer/services/impl/AllImplServiceTests.java @@ -7,7 +7,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({ CommentServiceTest.class, ConfigurationServiceTest.class, - ExternalServicesServiceTest.class, LayoutServiceTest.class, LdapServiceTest.class, Md5PasswordEncoderTest.class, diff --git a/service/src/test/java/lcsb/mapviewer/services/impl/ExternalServicesServiceTest.java b/service/src/test/java/lcsb/mapviewer/services/impl/ExternalServicesServiceTest.java deleted file mode 100644 index 8b1db0dd70a9f843ffce67bf3e115f37b694ddb8..0000000000000000000000000000000000000000 --- a/service/src/test/java/lcsb/mapviewer/services/impl/ExternalServicesServiceTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package lcsb.mapviewer.services.impl; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.List; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import lcsb.mapviewer.annotation.services.ExternalServiceStatus; -import lcsb.mapviewer.annotation.services.ExternalServiceStatusType; -import lcsb.mapviewer.services.ServiceTestFunctions; - -public class ExternalServicesServiceTest extends ServiceTestFunctions { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test(timeout = 60000) - @Ignore("Bug 451") - public void testDefaultServices() throws Exception { - try { - externalServicesService.clearServices(); - externalServicesService.registerDefaultServices(); - List<ExternalServiceStatus> statuses = externalServicesService.getExternalServiceStatuses(); - assertNotNull(statuses); - assertTrue(statuses.size() > 0); - - for (ExternalServiceStatus externalServiceStatus : statuses) { - assertEquals(externalServiceStatus.getName() + " is down", ExternalServiceStatusType.OK, externalServiceStatus.getStatus()); - } - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testRegister() throws Exception { - try { - externalServicesService.clearServices(); - externalServicesService.registerService(new OkServiceMock()); - externalServicesService.registerService(new FailServiceMock()); - - List<ExternalServiceStatus> statuses = externalServicesService.getExternalServiceStatuses(); - assertNotNull(statuses); - assertEquals(2, statuses.size()); - - assertEquals(ExternalServiceStatusType.OK, statuses.get(0).getStatus()); - assertEquals(ExternalServiceStatusType.DOWN, statuses.get(1).getStatus()); - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - -}