Fix tests

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index d470854..6e4e7ee 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -61,6 +61,7 @@ import android.os.UserManager;
 import android.provider.Settings;
 
 import androidx.annotation.DimenRes;
+import androidx.annotation.VisibleForTesting;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.appcompat.view.ContextThemeWrapper;
 import android.util.DisplayMetrics;
@@ -715,7 +716,7 @@ public class U {
         SharedPreferences pref = getSharedPreferences(context);
         DisplayInfo display = getDisplayInfo(context);
         float density = display.currentDensity / 160.0f;
-        float baseTaskbarSize = getBaseTaskbarSize(context, null) / density;
+        float baseTaskbarSize = getBaseTaskbarSize(context) / density;
         int numOfColumns = 0;
 
         float maxScreenSize = TaskbarPosition.isVertical(context)
@@ -1140,8 +1141,9 @@ public class U {
         }
     }
 
-    private static float getBaseTaskbarSize(Context context, Map<Integer, Boolean> sysTrayIconStates) {
-        return getBaseTaskbarSizeStart(context) + getBaseTaskbarSizeEnd(context, sysTrayIconStates);
+    @VisibleForTesting
+    public static float getBaseTaskbarSize(Context context) {
+        return getBaseTaskbarSizeStart(context) + getBaseTaskbarSizeEnd(context, null);
     }
 
     public static float getBaseTaskbarSizeStart(Context context) {

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.java b/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.java
index 621d8a4..72ee017 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.java
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.java
@@ -58,7 +58,6 @@ import org.robolectric.shadows.ShadowUsageStatsManager.EventBuilder;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import static android.app.usage.UsageEvents.Event.MOVE_TO_BACKGROUND;
@@ -407,7 +406,7 @@ public class TaskbarControllerTest {
                         0,
                         display.height
                                 - U.getStatusBarHeight(context)
-                                - U.getBaseTaskbarSize(context, new HashMap<>())
+                                - Math.round(U.getBaseTaskbarSize(context))
                 );
 
         uiController.calculateScrollViewParams(context, prefs, params, true, 1);
@@ -426,7 +425,7 @@ public class TaskbarControllerTest {
         params.height = defaultSize;
 
         isVerticalAnswer.answer = false;
-        maxScreenSize = Math.max(0, display.width - U.getBaseTaskbarSize(context, new HashMap<>()));
+        maxScreenSize = Math.max(0, display.width - Math.round(U.getBaseTaskbarSize(context)));
 
         uiController.calculateScrollViewParams(context, prefs, params, true, 1);
         assertEquals(maxScreenSize + dividerSize, params.width);

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/UTest.java b/app/src/test/java/com/farmerbb/taskbar/util/UTest.java
index 72a03b2..de093b8 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/UTest.java
+++ b/app/src/test/java/com/farmerbb/taskbar/util/UTest.java
@@ -516,7 +516,7 @@ public class UTest {
         float initialSize = context.getResources().getDimension(R.dimen.tb_base_size_start_plus_divider);
         initialSize += context.getResources().getDimension(R.dimen.tb_base_size_collapse_button);
         initialSize += context.getResources().getDimension(R.dimen.tb_dashboard_button_size);
-        assertEquals(Math.round(initialSize), U.getBaseTaskbarSize(context, null));
+        assertEquals(initialSize, U.getBaseTaskbarSize(context), 0);
     }
 
     @Test
@@ -527,12 +527,12 @@ public class UTest {
         isSystemTrayEnabledAnswer.answer = false;
         float initialSize = context.getResources().getDimension(R.dimen.tb_base_size_start_plus_divider);
         initialSize += context.getResources().getDimension(R.dimen.tb_base_size_collapse_button);
-        assertEquals(Math.round(initialSize), U.getBaseTaskbarSize(context, null));
+        assertEquals(initialSize, U.getBaseTaskbarSize(context), 0);
         SharedPreferences prefs = U.getSharedPreferences(context);
         prefs.edit().putBoolean(PREF_DASHBOARD, true).apply();
         float dashboardButtonSize =
                 context.getResources().getDimension(R.dimen.tb_dashboard_button_size);
-        assertEquals(Math.round(initialSize + dashboardButtonSize), U.getBaseTaskbarSize(context, null));
+        assertEquals(initialSize + dashboardButtonSize, U.getBaseTaskbarSize(context), 0);
         prefs.edit().remove(PREF_DASHBOARD).apply();
         float navbarButtonsMargin =
                 context.getResources().getDimension(R.dimen.tb_navbar_buttons_margin);
@@ -540,25 +540,28 @@ public class UTest {
                 context.getResources().getDimension(R.dimen.tb_icon_size);
         prefs.edit().putBoolean(PREF_BUTTON_BACK, true).apply();
         assertEquals(
-                Math.round(initialSize + navbarButtonsMargin + iconSize),
-                U.getBaseTaskbarSize(context, null)
+                initialSize + navbarButtonsMargin + iconSize,
+                U.getBaseTaskbarSize(context),
+                0
         );
         prefs.edit().remove(PREF_BUTTON_BACK).apply();
         prefs.edit().putBoolean(PREF_BUTTON_HOME, true).apply();
         assertEquals(
-                Math.round(initialSize + navbarButtonsMargin + iconSize),
-                U.getBaseTaskbarSize(context, null)
+                initialSize + navbarButtonsMargin + iconSize,
+                U.getBaseTaskbarSize(context),
+                0
         );
         prefs.edit().remove(PREF_BUTTON_HOME).apply();
         prefs.edit().putBoolean(PREF_BUTTON_RECENTS, true).apply();
         assertEquals(
-                Math.round(initialSize + navbarButtonsMargin + iconSize),
-                U.getBaseTaskbarSize(context, null)
+                initialSize + navbarButtonsMargin + iconSize,
+                U.getBaseTaskbarSize(context),
+                0
         );
         prefs.edit().remove(PREF_BUTTON_RECENTS).apply();
         isSystemTrayEnabledAnswer.answer = true;
         float systemTraySize = context.getResources().getDimension(R.dimen.tb_systray_size);
-        assertEquals(Math.round(initialSize + systemTraySize), U.getBaseTaskbarSize(context, null));
+        assertEquals(initialSize + systemTraySize, U.getBaseTaskbarSize(context), 0);
     }
 
     @Test