X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fbin%2FCacheTest.java;h=9edfd3b63ba716e95f97430947f5fa139200ae5a;hb=31aca2e9990ff33e088faa41419bb60014a6fbcf;hp=803139f53051cdb9821a5638b281449d074c4037;hpb=604cbee405a837565ba1a74aa9bddd62aed685ab;p=jalview.git diff --git a/test/jalview/bin/CacheTest.java b/test/jalview/bin/CacheTest.java index 803139f..9edfd3b 100644 --- a/test/jalview/bin/CacheTest.java +++ b/test/jalview/bin/CacheTest.java @@ -20,7 +20,10 @@ */ package jalview.bin; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertTrue; import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; import java.text.SimpleDateFormat; import java.util.Date; @@ -30,8 +33,18 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import jalview.gui.JvOptionPane; + public class CacheTest { + + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + private Locale locale; @BeforeClass(alwaysRun = true) @@ -60,9 +73,28 @@ public class CacheTest assertEquals(formattedDate, formattedDate2); // currently using Locale.UK to format dates: - assertEquals( - formattedDate2, - SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, - SimpleDateFormat.MEDIUM, Locale.UK).format(now)); + assertEquals(formattedDate2, + SimpleDateFormat + .getDateTimeInstance(SimpleDateFormat.MEDIUM, + SimpleDateFormat.MEDIUM, Locale.UK) + .format(now)); + } + + @Test(groups = "Functional") + public void testVersionChecker() + { + Cache.loadProperties("test/jalview/bin/testProps.jvprops"); + try + { + // 10s sleep to allow VersionChecker thread to run + Thread.sleep(10000); + } catch (Exception e) + { + e.printStackTrace(); + } + String latestVersion = Cache.getProperty("LATEST_VERSION"); + assertNotNull(latestVersion); + assertNotEquals(latestVersion, "test"); + assertTrue(latestVersion.startsWith("2.")); } }