diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/domain/ConfigurationDomainServiceJpaTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/domain/ConfigurationDomainServiceJpaTest.java deleted file mode 100644 index 5fe094e14..000000000 --- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/domain/ConfigurationDomainServiceJpaTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.mifosplatform.infrastructure.configuration.domain; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mifosplatform.useradministration.domain.Permission; -import org.mifosplatform.useradministration.domain.PermissionRepository; -import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; - -import java.util.List; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@SuppressWarnings("unused") -@RunWith(MockitoJUnitRunner.class) -public class ConfigurationDomainServiceJpaTest { - - private final String S3 = "amazon-S3"; - private PermissionRepository permissionRepositoryMock = mock(PermissionRepository.class);; - private GlobalConfigurationRepository globalConfigurationRepositoryMock = mock(GlobalConfigurationRepository.class); - - @Test - public void shouldReturnTrueIfAmazonS3ConfigurationIsEnabled(){ - when(globalConfigurationRepositoryMock.findOneByName(S3)).thenReturn(new GlobalConfigurationProperty(S3, true)); - ConfigurationDomainServiceJpa configurationDomainServiceJpa = new ConfigurationDomainServiceJpa(permissionRepositoryMock, globalConfigurationRepositoryMock); - - boolean actualIsS3Enabled = configurationDomainServiceJpa.isAmazonS3Enabled(); - - assertTrue(actualIsS3Enabled); - } - - @Test - public void shouldReturnFalseIfAmazonS3ConfigurationIsDisabled(){ - when(globalConfigurationRepositoryMock.findOneByName(S3)).thenReturn(new GlobalConfigurationProperty(S3, false)); - ConfigurationDomainServiceJpa configurationDomainServiceJpa = new ConfigurationDomainServiceJpa(permissionRepositoryMock, globalConfigurationRepositoryMock); - - boolean actualIsS3Enabled = configurationDomainServiceJpa.isAmazonS3Enabled(); - - assertFalse(actualIsS3Enabled); - } -} diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java deleted file mode 100644 index fd54df1db..000000000 --- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.mifosplatform.infrastructure.core.service; - -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) -public class DocumentStoreFactoryTest { -/** - @Test - public void shouldReturnS3DocumentStoreObjectIfS3Enabled() { - S3ClientFactory s3ClientFactoryMock = mock(S3ClientFactory.class); - when(s3ClientFactoryMock.getS3Client()).thenReturn(null); - - ExternalServicesReadPlatformServiceImpl externalServicesDomainServiceMock = mock(ExternalServicesReadPlatformServiceImpl.class); - when(externalServicesDomainServiceMock.getValue("s3_bucket_name")).thenReturn("bucket_name"); - - ConfigurationDomainService configurationDomainServiceMock = mock(ConfigurationDomainService.class); - when(configurationDomainServiceMock.isAmazonS3Enabled()).thenReturn(true); - - ApplicationContext applicationContextMock = mock(ApplicationContext.class); - - when(applicationContextMock.getBean("configurationDomainServiceJpa", ConfigurationDomainService.class)).thenReturn( - configurationDomainServiceMock); - when(applicationContextMock.getBean("s3ClientFactory", S3ClientFactory.class)).thenReturn(s3ClientFactoryMock); - when(applicationContextMock.getBean("externalServicesDomainService", ExternalServicesReadPlatformServiceImpl.class)).thenReturn( - externalServicesDomainServiceMock); - - ContentRepositoryFactory documentStoreFactory = new ContentRepositoryFactory(applicationContextMock); - assertEquals(documentStoreFactory.getInstanceFromConfiguration().getClass(), S3ContentRepository.class); - } - - @Test - public void shouldReturnFileSystemDocumentStoreObjectIfS3IsDisabled() { - ConfigurationDomainService configurationDomainService = mock(ConfigurationDomainService.class); - when(configurationDomainService.isAmazonS3Enabled()).thenReturn(false); - - ApplicationContext applicationContext = mock(ApplicationContext.class); - when(applicationContext.getBean("configurationDomainServiceJpa", ConfigurationDomainService.class)).thenReturn( - configurationDomainService); - - ContentRepositoryFactory documentStoreFactory = new ContentRepositoryFactory(applicationContext); - assertEquals(documentStoreFactory.getInstanceFromConfiguration().getClass(), FileSystemContentRepository.class); - } -**/ -} diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java deleted file mode 100644 index 37c8a367a..000000000 --- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.mifosplatform.infrastructure.core.service; - -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) -public class FileDocumentStoreTest { -/** - @Test - public void shouldRetrieveDocument() { - FileSystemContentRepository fileSystemDocumentStore = new FileSystemContentRepository(); - DocumentData documentDataMock = mock(DocumentData.class); - when(documentDataMock.fileName()).thenReturn("some_file"); - when(documentDataMock.fileName()).thenReturn("content_type"); - when(documentDataMock.fileLocation()).thenReturn("abcd"); - - FileData fileData = fileSystemDocumentStore.retrieveDocument(documentDataMock); - - assertEquals(fileData.name(), documentDataMock.fileName()); - assertEquals(fileData.contentType(), documentDataMock.contentType()); - } -**/ -} diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java deleted file mode 100644 index 8b6e4ab53..000000000 --- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.mifosplatform.infrastructure.core.service; - -import java.io.InputStream; - -import org.junit.runner.RunWith; -import org.mifosplatform.infrastructure.documentmanagement.command.DocumentCommand; -import org.mifosplatform.infrastructure.documentmanagement.data.DocumentData; -import org.mockito.runners.MockitoJUnitRunner; - -import com.amazonaws.services.s3.AmazonS3Client; - -@RunWith(MockitoJUnitRunner.class) -public class S3DocumentStoreTest { - - InputStream inputStream; - AmazonS3Client s3ClientMock; - DocumentCommand documentCommand; - DocumentData documentDataMock; -/** - @Test - public void shouldGenerateParentDirectoryFromEntityDetails() { - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", null); - String actualParentDirectory = s3DocumentStore.generateFileParentDirectory("entity_type", 1234L); - assertTrue(actualParentDirectory.startsWith("documents/entity_type/1234")); - } - - @Test - public void shouldGenerateClientImageDirectoryFromResourceId() { - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", null); - String actualParentDirectory = s3DocumentStore.generateClientImageParentDirectory(1234L); - assertTrue(actualParentDirectory.startsWith("images/clients/1234")); - } - - @Test - public void shouldSaveADocumentToS3() throws IOException { - initUpload(); - when(s3ClientMock.putObject(Matchers. anyObject())).thenReturn(new PutObjectResult()); - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - s3DocumentStore.saveDocument(inputStream, documentCommand); - - verify(s3ClientMock, times(1)).putObject(Matchers. anyObject()); - } - - @Test(expected = DocumentManagementException.class) - public void shouldCatchAmazonServiceExceptionWhenUnableToUploadDocumentToS3() throws IOException { - initUpload(); - when(s3ClientMock.putObject(Matchers. anyObject())).thenThrow(new AmazonServiceException("serviceException")); - - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - s3DocumentStore.saveDocument(inputStream, documentCommand); - } - - @Test(expected = DocumentManagementException.class) - public void shouldCatchAmazonClientExceptionWhenUnableToUploadDocumentToS3() throws IOException { - initUpload(); - when(s3ClientMock.putObject(Matchers. anyObject())).thenThrow(new AmazonClientException("clientException")); - - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - s3DocumentStore.saveDocument(inputStream, documentCommand); - } - - @Test - public void shouldRetrieveDocumentFromS3() throws IOException { - initRetrieve(); - when(s3ClientMock.getObject(Matchers. anyObject())).thenReturn(new S3Object()); - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - FileData fileData = s3DocumentStore.retrieveDocument(documentDataMock); - - verify(s3ClientMock, times(1)).getObject(Matchers. anyObject()); - assertEquals(fileData.name(), "name"); - assertEquals(fileData.contentType(), "type"); - } - - @Test(expected = DocumentNotFoundException.class) - public void shouldCatchAmazonServiceExceptionWhenUnableToRetrieveDocumentFromS3() throws IOException { - initRetrieve(); - when(s3ClientMock.getObject(Matchers. anyObject())).thenThrow(new AmazonServiceException("serviceException")); - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - s3DocumentStore.retrieveDocument(documentDataMock); - } - - @Test(expected = DocumentNotFoundException.class) - public void shouldCatchAmazonClientExceptionWhenUnableToRetrieveDocumentFromS3() throws IOException { - initRetrieve(); - when(s3ClientMock.getObject(Matchers. anyObject())).thenThrow(new AmazonClientException("clientException")); - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - s3DocumentStore.retrieveDocument(documentDataMock); - } - - @Test - public void shouldDeleteImageFromS3() throws IOException { - AmazonS3Client s3ClientMock = mock(AmazonS3Client.class); - S3ContentRepository s3DocumentStore = new S3ContentRepository("bucketName", s3ClientMock); - - s3DocumentStore.deleteImage(123L, "imagekey"); - - verify(s3ClientMock, times(1)).deleteObject(Matchers. anyObject()); - } - - private void initRetrieve() { - s3ClientMock = mock(AmazonS3Client.class); - - documentDataMock = mock(DocumentData.class); - when(documentDataMock.fileLocation()).thenReturn("path"); - when(documentDataMock.fileName()).thenReturn("name"); - when(documentDataMock.contentType()).thenReturn("type"); - } - - private void initUpload() { - inputStream = S3DocumentStoreTest.class.getResourceAsStream("DummyString"); - s3ClientMock = mock(AmazonS3Client.class); - documentCommand = new DocumentCommand(null, -1l, "parentEntityType", 1l, null, "someFileName", 3l, null, null, null); - } - **/ -}