From aebcbc01a91e4065f8289e844ce79b123fce5d2b Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 10 Sep 2018 13:12:52 +0200
Subject: [PATCH] no need for turing off cache - we are running tests on clean
db
---
.../services/TaxonomyBackendTest.java | 183 ++++++++----------
1 file changed, 81 insertions(+), 102 deletions(-)
diff --git a/annotation/src/test/java/lcsb/mapviewer/annotation/services/TaxonomyBackendTest.java b/annotation/src/test/java/lcsb/mapviewer/annotation/services/TaxonomyBackendTest.java
index 1feb63abce..f2e585e743 100644
--- a/annotation/src/test/java/lcsb/mapviewer/annotation/services/TaxonomyBackendTest.java
+++ b/annotation/src/test/java/lcsb/mapviewer/annotation/services/TaxonomyBackendTest.java
@@ -11,15 +11,11 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import lcsb.mapviewer.annotation.AnnotationTestFunctions;
-import lcsb.mapviewer.annotation.cache.GeneralCacheInterface;
-import lcsb.mapviewer.annotation.cache.GeneralCacheWithExclusion;
import lcsb.mapviewer.annotation.cache.SourceNotAvailable;
import lcsb.mapviewer.annotation.cache.WebPageDownloader;
import lcsb.mapviewer.common.exception.InvalidArgumentException;
@@ -32,20 +28,6 @@ public class TaxonomyBackendTest extends AnnotationTestFunctions {
@Autowired
TaxonomyBackend taxonomyBackend;
- GeneralCacheInterface cache;
-
- @Before
- public void setUp() throws Exception {
- cache = taxonomyBackend.getCache();
- // exclude two first cached values
- taxonomyBackend.setCache(new GeneralCacheWithExclusion(cache, 2));
- }
-
- @After
- public void tearDown() throws Exception {
- taxonomyBackend.setCache(cache);
- }
-
@Test
public void testByName() throws Exception {
try {
@@ -92,13 +74,9 @@ public class TaxonomyBackendTest extends AnnotationTestFunctions {
@Test
public void testByAbreviationName() throws Exception {
try {
- taxonomyBackend.setCache(new GeneralCacheWithExclusion(cache, 1));
assertNotNull(taxonomyBackend.getByName("C. elegans"));
- taxonomyBackend.setCache(new GeneralCacheWithExclusion(cache, 1));
assertNotNull(taxonomyBackend.getByName("D. sechellia"));
- taxonomyBackend.setCache(new GeneralCacheWithExclusion(cache, 1));
assertNotNull(taxonomyBackend.getByName("P. pacificus"));
- taxonomyBackend.setCache(new GeneralCacheWithExclusion(cache, 1));
assertNotNull(taxonomyBackend.getByName("T. castaneum"));
} catch (Exception e) {
e.printStackTrace();
@@ -118,24 +96,24 @@ public class TaxonomyBackendTest extends AnnotationTestFunctions {
}
}
- @Test
- public void testGetNameWhenProblemWithDb() throws Exception {
- WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
- try {
- WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
- when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
- taxonomyBackend.setWebPageDownloader(mockDownloader);
- taxonomyBackend.setCache(null);
- taxonomyBackend.getNameForTaxonomy(new MiriamData(MiriamType.TAXONOMY, "9606"));
- fail("Exception expected");
- } catch (TaxonomySearchException e) {
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- taxonomyBackend.setWebPageDownloader(downloader);
- }
- }
+ @Test
+ public void testGetNameWhenProblemWithDb() throws Exception {
+ WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
+ try {
+ WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+ when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
+ taxonomyBackend.setWebPageDownloader(mockDownloader);
+ taxonomyBackend.setCache(null);
+ taxonomyBackend.getNameForTaxonomy(new MiriamData(MiriamType.TAXONOMY, "9606"));
+ fail("Exception expected");
+ } catch (TaxonomySearchException e) {
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ taxonomyBackend.setWebPageDownloader(downloader);
+ }
+ }
@Test
public void testGetNameForInvalidTax() throws Exception {
@@ -261,23 +239,23 @@ public class TaxonomyBackendTest extends AnnotationTestFunctions {
}
}
- @Test
- public void testRefreshCacheQueryNotAvailable() throws Exception {
- WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
- try {
- WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
- when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
- taxonomyBackend.setWebPageDownloader(mockDownloader);
- taxonomyBackend.refreshCacheQuery("http://google.pl/");
- fail("Exception expected");
- } catch (SourceNotAvailable e) {
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- taxonomyBackend.setWebPageDownloader(downloader);
- }
- }
+ @Test
+ public void testRefreshCacheQueryNotAvailable() throws Exception {
+ WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
+ try {
+ WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+ when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
+ taxonomyBackend.setWebPageDownloader(mockDownloader);
+ taxonomyBackend.refreshCacheQuery("http://google.pl/");
+ fail("Exception expected");
+ } catch (SourceNotAvailable e) {
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ taxonomyBackend.setWebPageDownloader(downloader);
+ }
+ }
@Test
public void testStatus() throws Exception {
@@ -289,52 +267,53 @@ public class TaxonomyBackendTest extends AnnotationTestFunctions {
}
}
- @Test
- public void testSimulateDownStatus() throws Exception {
- WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
- try {
- WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
- when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
- taxonomyBackend.setWebPageDownloader(mockDownloader);
- assertEquals(ExternalServiceStatusType.DOWN, taxonomyBackend.getServiceStatus().getStatus());
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- taxonomyBackend.setWebPageDownloader(downloader);
- }
- }
+ @Test
+ public void testSimulateDownStatus() throws Exception {
+ WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
+ try {
+ WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+ when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
+ taxonomyBackend.setWebPageDownloader(mockDownloader);
+ assertEquals(ExternalServiceStatusType.DOWN, taxonomyBackend.getServiceStatus().getStatus());
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ taxonomyBackend.setWebPageDownloader(downloader);
+ }
+ }
- @Test
- public void testSimulateChangedStatus() throws Exception {
- WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
- try {
- WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
- when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenReturn("");
- taxonomyBackend.setWebPageDownloader(mockDownloader);
- assertEquals(ExternalServiceStatusType.CHANGED, taxonomyBackend.getServiceStatus().getStatus());
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- taxonomyBackend.setWebPageDownloader(downloader);
- }
- }
+ @Test
+ public void testSimulateChangedStatus() throws Exception {
+ WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
+ try {
+ WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+ when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenReturn("");
+ taxonomyBackend.setWebPageDownloader(mockDownloader);
+ assertEquals(ExternalServiceStatusType.CHANGED, taxonomyBackend.getServiceStatus().getStatus());
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ taxonomyBackend.setWebPageDownloader(downloader);
+ }
+ }
- @Test
- public void testSimulateChangedStatus2() throws Exception {
- WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
- try {
- WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
- when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenReturn("<em>Taxonomy ID: </em>1234");
- taxonomyBackend.setWebPageDownloader(mockDownloader);
- assertEquals(ExternalServiceStatusType.CHANGED, taxonomyBackend.getServiceStatus().getStatus());
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- taxonomyBackend.setWebPageDownloader(downloader);
- }
- }
+ @Test
+ public void testSimulateChangedStatus2() throws Exception {
+ WebPageDownloader downloader = taxonomyBackend.getWebPageDownloader();
+ try {
+ WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+ when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString()))
+ .thenReturn("<em>Taxonomy ID: </em>1234");
+ taxonomyBackend.setWebPageDownloader(mockDownloader);
+ assertEquals(ExternalServiceStatusType.CHANGED, taxonomyBackend.getServiceStatus().getStatus());
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ taxonomyBackend.setWebPageDownloader(downloader);
+ }
+ }
}
--
GitLab