diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPass.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPass.java index d9d28188fe..29e48e9d09 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPass.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPass.java @@ -38,7 +38,7 @@ import org.alfresco.service.cmr.repository.ContentIOException; public class ContentCleanserSevenPass extends ContentCleanser { /** - * @see org.alfresco.module.org_alfresco_module_rm.content.cleanser.ContentCleanser#cleanse(java.io.File) + * @ see org.alfresco.module.org_alfresco_module_rm.content.cleanser.ContentCleanser#cleanse(java.io.File) */ @Override public void cleanse(File file) @@ -48,8 +48,8 @@ public class ContentCleanserSevenPass extends ContentCleanser { throw new ContentIOException("Unable to write to file: " + file); } - - //Overwite file + + // Overwite file overwrite(file, overwriteOnes); overwrite(file, overwriteZeros); overwrite(file, overwriteRandom); @@ -57,8 +57,6 @@ public class ContentCleanserSevenPass extends ContentCleanser overwrite(file, overwriteZeros); overwrite(file, overwriteOnes); overwrite(file, overwriteRandom); - - - + } -} \ No newline at end of file +} diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPassUnitTest.java b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPassUnitTest.java index 886d686b2a..826d71506e 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPassUnitTest.java +++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanserSevenPassUnitTest.java @@ -32,62 +32,65 @@ import static org.mockito.Mockito.when; import java.io.File; -import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest; -import org.alfresco.service.cmr.repository.ContentIOException; import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; +import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest; +import org.alfresco.service.cmr.repository.ContentIOException; + /** * Eager content store cleaner unit test. * */ -public class ContentCleanserSevenPassUnitTest extends BaseUnitTest { - @InjectMocks - @Spy - private ContentCleanserSevenPass contentCleanserSevenPass = new ContentCleanserSevenPass() { - /** dummy implementations */ - protected void overwrite(File file, OverwriteOperation overwriteOperation) { - } - }; +public class ContentCleanserSevenPassUnitTest extends BaseUnitTest +{ + @InjectMocks + @Spy + private ContentCleanserSevenPass contentCleanserSevenPass = new ContentCleanserSevenPass() { + /** dummy implementations */ + protected void overwrite(File file, OverwriteOperation overwriteOperation) + {} + }; - @Mock - private File mockedFile; + @Mock + private File mockedFile; - /** - * Given that a file exists When I cleanse it Then the content is overwritten - */ - @Test - public void cleanseFile() { - when(mockedFile.exists()).thenReturn(true) ; - when(mockedFile.canWrite()).thenReturn(true); - contentCleanserSevenPass.cleanse(mockedFile); - verify(contentCleanserSevenPass, times(2)).overwrite(mockedFile, contentCleanserSevenPass.overwriteOnes); - verify(contentCleanserSevenPass, times(3)).overwrite(mockedFile, contentCleanserSevenPass.overwriteZeros); - verify(contentCleanserSevenPass, times(2)).overwrite(mockedFile, contentCleanserSevenPass.overwriteRandom); + /** + * Given that a file exists When I cleanse it Then the content is overwritten + */ + @Test + public void cleanseFile() + { + when(mockedFile.exists()).thenReturn(true); + when(mockedFile.canWrite()).thenReturn(true); + contentCleanserSevenPass.cleanse(mockedFile); + verify(contentCleanserSevenPass, times(2)).overwrite(mockedFile, contentCleanserSevenPass.overwriteOnes); + verify(contentCleanserSevenPass, times(3)).overwrite(mockedFile, contentCleanserSevenPass.overwriteZeros); + verify(contentCleanserSevenPass, times(2)).overwrite(mockedFile, contentCleanserSevenPass.overwriteRandom); - } + } - /** - * Given that the file does not exist When I cleanse it Then an exception is - * thrown - */ - @Test(expected = ContentIOException.class) - public void fileDoesNotExist() { - when(mockedFile.exists()).thenReturn(false); - when(mockedFile.canWrite()).thenReturn(true); - contentCleanserSevenPass.cleanse(mockedFile); - } + /** + * Given that the file does not exist When I cleanse it Then an exception is thrown + */ + @Test(expected = ContentIOException.class) + public void fileDoesNotExist() + { + when(mockedFile.exists()).thenReturn(false); + when(mockedFile.canWrite()).thenReturn(true); + contentCleanserSevenPass.cleanse(mockedFile); + } - /** - * Given that I can not write to the file When I cleanse it Then an exception is - * thrown - */ - @Test(expected = ContentIOException.class) - public void cantWriteToFile() { - when(mockedFile.exists()).thenReturn(true); - when(mockedFile.canWrite()).thenReturn(false); - contentCleanserSevenPass.cleanse(mockedFile); - } -} \ No newline at end of file + /** + * Given that I can not write to the file When I cleanse it Then an exception is thrown + */ + @Test(expected = ContentIOException.class) + public void cantWriteToFile() + { + when(mockedFile.exists()).thenReturn(true); + when(mockedFile.canWrite()).thenReturn(false); + contentCleanserSevenPass.cleanse(mockedFile); + } +}