Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project

[jalview.git] / test / jalview / util / imagemaker / BitmapImageSizeTest.java

diff --git a/test/jalview/util/imagemaker/BitmapImageSizeTest.java b/test/jalview/util/imagemaker/BitmapImageSizeTest.java
index 49e1084..016c91f 100644 (file)
--- a/test/jalview/util/imagemaker/BitmapImageSizeTest.java
+++ b/test/jalview/util/imagemaker/BitmapImageSizeTest.java
@@ -6,38 +6,41 @@ import org.testng.annotations.Test;
 
 import jalview.bin.Cache;
 
-public class BitmapImageSizeTest {
-  @Test(groups = {"Functional"})
-  public void testCacheSettingsRecovery() {
+public class BitmapImageSizeTest
+{
+  @Test(groups = { "Functional" })
+  public void testCacheSettingsRecovery()
+  {
     Cache.setPropsAreReadOnly(true);
     Cache.loadProperties("test/jalview/bin/testProps.jvprops");
-    
+
     Cache.removeProperty(BitmapImageSizing.BITMAP_HEIGHT);
     Cache.removeProperty(BitmapImageSizing.BITMAP_SCALE);
     Cache.removeProperty(BitmapImageSizing.BITMAP_WIDTH);
-    
+
     BitmapImageSizing def = BitmapImageSizing.defaultBitmapImageSizing();
     BitmapImageSizing zero = BitmapImageSizing.nullBitmapImageSizing();
 
-    assertEquals(def.height, zero.height);
-    assertEquals(def.width, zero.width);
-    assertEquals(def.scale, zero.scale);
-    
-    Cache.setProperty(BitmapImageSizing.BITMAP_HEIGHT,"120");
-    Cache.setProperty(BitmapImageSizing.BITMAP_SCALE,"240");
-    Cache.setProperty(BitmapImageSizing.BITMAP_WIDTH,"360");
-    
-    def = BitmapImageSizing.defaultBitmapImageSizing();
-    
-    assertEquals(def.height, 120);
-    assertEquals(def.width, 360);
-    assertEquals(def.scale, 24f);
-    
+    assertEquals(def.height(), zero.height());
+    assertEquals(def.width(), zero.width());
+    assertEquals(def.scale(), zero.scale());
+
+    Cache.setProperty(BitmapImageSizing.BITMAP_HEIGHT, "120");
+    Cache.setProperty(BitmapImageSizing.BITMAP_SCALE, "24");
+    Cache.setProperty(BitmapImageSizing.BITMAP_WIDTH, "360");
+
+    // default now updates dynamically
+    // def = BitmapImageSizing.defaultBitmapImageSizing();
+
+    assertEquals(def.height(), 120);
+    assertEquals(def.width(), 360);
+    assertEquals(def.scale(), 24f);
+
     Cache.removeProperty(BitmapImageSizing.BITMAP_WIDTH);
-    
-    def = BitmapImageSizing.defaultBitmapImageSizing();
-    assertEquals(def.height, 120);
-    assertEquals(def.width, zero.width);
-    assertEquals(def.scale, 24f);    
+
+    // def = BitmapImageSizing.defaultBitmapImageSizing();
+    assertEquals(def.height(), 120);
+    assertEquals(def.width(), zero.width());
+    assertEquals(def.scale(), 24f);
   }
 }