Skip to content

Commit

Permalink
fix(ZNTA-1745): Mock virus scanner in upload tests
Browse files Browse the repository at this point in the history
  • Loading branch information
djansen-redhat committed Feb 16, 2017
1 parent 6daf026 commit 9bae755
Showing 1 changed file with 6 additions and 5 deletions.
Expand Up @@ -25,6 +25,7 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;

Expand All @@ -38,15 +39,13 @@
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.*;
import org.zanata.common.DocumentType;
import org.zanata.exception.ChunkUploadException;
import org.zanata.model.HDocument;
import org.zanata.model.HRawDocument;
import org.zanata.rest.dto.resource.Resource;
import org.zanata.rest.service.VirusScanner;
import org.zanata.security.ZanataCredentials;
import org.zanata.service.DocumentService;
import org.zanata.service.TranslationFileService;
Expand Down Expand Up @@ -76,6 +75,8 @@ public class SourceDocumentUploadTest extends DocumentUploadTest {
WindowContext windowContext;
@Produces @Mock
UrlUtil urlUtil;
@Produces @Mock
VirusScanner virusScanner;

@Produces @Mock Session session;
@Produces @SessionId String sessionId = "";
Expand Down Expand Up @@ -108,7 +109,7 @@ private void mockRequiredServices() throws IOException {
File someFile = File.createTempFile("tests", "something");
when(documentUploadUtil.persistTempFileFromUpload(conf.uploadForm))
.thenReturn(someFile);

doNothing().when(virusScanner).scan(someFile, "myproject:myversion:mydoc");
when(
documentDAO.getAdapterParams(conf.projectSlug,
conf.versionSlug, conf.docId)).thenReturn(
Expand Down

0 comments on commit 9bae755

Please sign in to comment.