From 30c274cb06b97cb720ae3736a1cf9ee6167124b7 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 15 Nov 2017 13:51:35 +0100
Subject: [PATCH] fixes on unit tests

---
 .../cache/ApplicationLevelCache.java          |  2 +-
 .../services/ChemicalParserTest.java          |  1 +
 .../services/MiriamConnectorTest.java         | 65 ++++++-------------
 3 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/ApplicationLevelCache.java b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/ApplicationLevelCache.java
index a5522b3f92..9bd95528fa 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/ApplicationLevelCache.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/ApplicationLevelCache.java
@@ -86,7 +86,7 @@ public final class ApplicationLevelCache extends XmlParser implements QueryCache
 
   @Override
   public synchronized void setCachedQuery(String query, CacheType type, Object object) {
-    setCachedQuery(query, type, object, type.getValidity());
+    setCachedQuery(query, type, object, 0);
   }
   
   @Override
diff --git a/annotation/src/test/java/lcsb/mapviewer/annotation/services/ChemicalParserTest.java b/annotation/src/test/java/lcsb/mapviewer/annotation/services/ChemicalParserTest.java
index 2d3691370e..99899cb5e7 100644
--- a/annotation/src/test/java/lcsb/mapviewer/annotation/services/ChemicalParserTest.java
+++ b/annotation/src/test/java/lcsb/mapviewer/annotation/services/ChemicalParserTest.java
@@ -574,6 +574,7 @@ public class ChemicalParserTest extends AnnotationTestFunctions {
   public void testGetEmptySuggestedQueryList() throws Exception {
     try {
       Project project = new Project();
+      project.setId(-1);
 
       List<String> result = chemicalParser.getSuggestedQueryList(project, parkinsonDiseaseId);
 
diff --git a/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java b/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java
index a8b145d6cf..85d4105e01 100644
--- a/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java
+++ b/annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java
@@ -219,16 +219,16 @@ public class MiriamConnectorTest extends AnnotationTestFunctions {
     }
   }
 
-	@Test
-	public void testGetUrl2WithInvalidApiResponse() throws Exception {
-		WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
-		GeneralCacheInterface cache = miriamConnector.getCache();
-		try {
-			// exclude first cached value
-			miriamConnector.setCache(new GeneralCacheWithExclusion(cache, 1));
-			WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
-			when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
-			miriamConnector.setWebPageDownloader(mockDownloader);
+  @Test
+  public void testGetUrl2WithInvalidApiResponse() throws Exception {
+    WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
+    GeneralCacheInterface cache = miriamConnector.getCache();
+    try {
+      // exclude first cached value
+      miriamConnector.setCache(new GeneralCacheWithExclusion(cache, 1));
+      WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+      when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
+      miriamConnector.setWebPageDownloader(mockDownloader);
 
       miriamConnector.getUrlString2(TaxonomyBackend.HUMAN_TAXONOMY);
 
@@ -243,49 +243,24 @@ public class MiriamConnectorTest extends AnnotationTestFunctions {
     }
   }
 
-	@Test
-	public void testGetUrl2WithInvalidApiResponse2() throws Exception {
-		WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
-		GeneralCacheInterface cache = miriamConnector.getCache();
-		try {
-			// exclude first cached value
-			miriamConnector.setCache(new GeneralCacheWithExclusion(cache, 1));
-			WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
-			when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenReturn("");
-			miriamConnector.setWebPageDownloader(mockDownloader);
-
-      miriamConnector.getUrlString2(TaxonomyBackend.HUMAN_TAXONOMY);
-
-    } catch (AnnotationException e) {
-      assertTrue(e.getMessage().contains("Problem with parsing miriam REST API response"));
+  @Test
+  public void testRefreshCacheQueryNotAvailable() throws Exception {
+    WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
+    try {
+      WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
+      when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
+      miriamConnector.setWebPageDownloader(mockDownloader);
+      miriamConnector.refreshCacheQuery("http://google.pl/");
+      fail("Exception expected");
+    } catch (SourceNotAvailable e) {
     } catch (Exception e) {
       e.printStackTrace();
       throw e;
     } finally {
       miriamConnector.setWebPageDownloader(downloader);
-      miriamConnector.setCache(cache);
     }
   }
 
-
-	@Test
-	public void testRefreshCacheQueryNotAvailable() throws Exception {
-		WebPageDownloader downloader = miriamConnector.getWebPageDownloader();
-		try {
-			WebPageDownloader mockDownloader = Mockito.mock(WebPageDownloader.class);
-			when(mockDownloader.getFromNetwork(anyString(), anyString(), anyString())).thenThrow(new IOException());
-			miriamConnector.setWebPageDownloader(mockDownloader);
-			miriamConnector.refreshCacheQuery("http://google.pl/");
-			fail("Exception expected");
-		} catch (SourceNotAvailable e) {
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		} finally {
-			miriamConnector.setWebPageDownloader(downloader);
-		}
-	}
-
   @Test
   public void testRefreshInvalidCacheQuery() throws Exception {
     try {
-- 
GitLab