Merge branch 'releases/Release_2_11_3_Branch'

[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..0624cba 100644 (file)
--- a/test/jalview/util/imagemaker/BitmapImageSizeTest.java
+++ b/test/jalview/util/imagemaker/BitmapImageSizeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.util.imagemaker;
 
 import static org.testng.Assert.assertEquals;
@@ -6,38 +26,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);
   }
 }