Add Spotless to format kotlin code

Use it to find the kotlin test code's format problem, and fix it.

Signed-off-by: utzcoz <utzcoz@outlook.com>

diff --git a/app/build.gradle b/app/build.gradle
index 95eec49..4c7d78f 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,6 @@
+plugins {
+    id "com.diffplug.spotless" version "5.10.2"
+}
 apply from: '../dependencies.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -8,6 +11,13 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 
+spotless {
+    kotlin {
+        target '**/*.kt'
+        ktlint()userData(['max_line_length': '100'])
+    }
+}
+
 android {
     compileSdkVersion COMPILE_SDK_VERSION
     buildToolsVersion BUILD_TOOLS_VERSION

diff --git a/app/src/test/java/com/farmerbb/taskbar/Constants.kt b/app/src/test/java/com/farmerbb/taskbar/Constants.kt
index eb3e13e..17c8322 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/Constants.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/Constants.kt
@@ -10,4 +10,4 @@ object Constants {
     const val DEFAULT_TEST_USER_ID = 0
     const val DEFAULT_TEST_USER_PROFILE_ID = 200000
     const val DEFAULT_TEST_CELL_ID = 1000
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/LauncherAppsHelper.kt b/app/src/test/java/com/farmerbb/taskbar/LauncherAppsHelper.kt
index 4254945..6a951e7 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/LauncherAppsHelper.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/LauncherAppsHelper.kt
@@ -9,9 +9,11 @@ import org.robolectric.util.ReflectionHelpers.ClassParameter
 
 object LauncherAppsHelper {
     @JvmStatic
-    fun generateTestLauncherActivityInfo(context: Context,
-                                         activityInfo: ActivityInfo,
-                                         userHandleId: Int): LauncherActivityInfo {
+    fun generateTestLauncherActivityInfo(
+        context: Context,
+        activityInfo: ActivityInfo,
+        userHandleId: Int
+    ): LauncherActivityInfo {
         return ReflectionHelpers.callConstructor(
                 LauncherActivityInfo::class.java,
                 ClassParameter.from(Context::class.java, context),
@@ -22,4 +24,4 @@ object LauncherAppsHelper {
                 )
         )
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/helper/DashboardHelperTest.kt b/app/src/test/java/com/farmerbb/taskbar/helper/DashboardHelperTest.kt
index 462c65e..4541326 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/helper/DashboardHelperTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/helper/DashboardHelperTest.kt
@@ -24,4 +24,4 @@ class DashboardHelperTest {
         Assert.assertTrue(helper.isDashboardOpen)
         helper.isDashboardOpen = false
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/helper/FreeformHackHelperTest.kt b/app/src/test/java/com/farmerbb/taskbar/helper/FreeformHackHelperTest.kt
index 9c3bc6b..7f83ba9 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/helper/FreeformHackHelperTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/helper/FreeformHackHelperTest.kt
@@ -40,4 +40,4 @@ class FreeformHackHelperTest {
         Assert.assertTrue(freeformHackHelper.isTouchAbsorberActive)
         freeformHackHelper.isTouchAbsorberActive = false
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/helper/LauncherHelperTest.kt b/app/src/test/java/com/farmerbb/taskbar/helper/LauncherHelperTest.kt
index 8980103..8c4daf1 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/helper/LauncherHelperTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/helper/LauncherHelperTest.kt
@@ -70,4 +70,4 @@ class LauncherHelperTest {
         Assert.assertTrue(launcherHelper.isOnSecondaryHomeScreen(context))
         launcherHelper.setOnSecondaryHomeScreen(false, 1)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/helper/MenuHelperTest.kt b/app/src/test/java/com/farmerbb/taskbar/helper/MenuHelperTest.kt
index ccdf819..cf8715e 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/helper/MenuHelperTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/helper/MenuHelperTest.kt
@@ -32,4 +32,4 @@ class MenuHelperTest {
         Assert.assertTrue(menuHelper.isContextMenuOpen)
         menuHelper.isContextMenuOpen = false
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/mockito/BooleanAnswer.kt b/app/src/test/java/com/farmerbb/taskbar/mockito/BooleanAnswer.kt
index a067738..c0f347a 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/mockito/BooleanAnswer.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/mockito/BooleanAnswer.kt
@@ -8,4 +8,4 @@ class BooleanAnswer : Answer<Boolean> {
     override fun answer(invocation: InvocationOnMock): Boolean {
         return answer
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/mockito/IntAnswer.kt b/app/src/test/java/com/farmerbb/taskbar/mockito/IntAnswer.kt
index 680fb63..421d2ef 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/mockito/IntAnswer.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/mockito/IntAnswer.kt
@@ -8,4 +8,4 @@ class IntAnswer : Answer<Int> {
     override fun answer(invocation: InvocationOnMock): Int {
         return answer
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/mockito/StringAnswer.kt b/app/src/test/java/com/farmerbb/taskbar/mockito/StringAnswer.kt
index d4587d3..a38e245 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/mockito/StringAnswer.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/mockito/StringAnswer.kt
@@ -10,4 +10,4 @@ class StringAnswer(answerValue: String) : Answer<String> {
     override fun answer(invocation: InvocationOnMock): String {
         return answer
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/receiver/BootReceiverTest.kt b/app/src/test/java/com/farmerbb/taskbar/receiver/BootReceiverTest.kt
index d181aeb..7aca9e7 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/receiver/BootReceiverTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/receiver/BootReceiverTest.kt
@@ -8,7 +8,11 @@ import com.farmerbb.taskbar.mockito.BooleanAnswer
 import com.farmerbb.taskbar.service.NotificationService
 import com.farmerbb.taskbar.util.Constants
 import com.farmerbb.taskbar.util.U
-import org.junit.*
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PowerMockIgnore
@@ -96,4 +100,4 @@ class BootReceiverTest {
         bootReceiver.onReceive(context, intent)
         Assert.assertFalse(prefs.getBoolean(Constants.PREF_TASKBAR_ACTIVE, false))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/receiver/PackageUpgradeReceiverTest.kt b/app/src/test/java/com/farmerbb/taskbar/receiver/PackageUpgradeReceiverTest.kt
index fbeb7d1..bc34d2b 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/receiver/PackageUpgradeReceiverTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/receiver/PackageUpgradeReceiverTest.kt
@@ -60,7 +60,8 @@ class PackageUpgradeReceiverTest {
         Assert.assertTrue(startedIntent.getBooleanExtra(Constants.EXTRA_START_FREEFORM_HACK, false))
         Assert.assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK.toLong(), startedIntent.flags.toLong())
         Assert.assertNotNull(startedIntent.component)
-        Assert.assertEquals(DummyActivity::class.java.canonicalName, startedIntent.component!!.className)
+        Assert.assertEquals(DummyActivity::class.java.canonicalName,
+                startedIntent.component!!.className)
         Shadows.shadowOf(application).clearNextStartedActivities()
         answer.answer = false
         packageUpgradeReceiver.onReceive(context, intent)
@@ -118,4 +119,4 @@ class PackageUpgradeReceiverTest {
         packageUpgradeReceiver.onReceive(context, intent)
         Assert.assertNull(Shadows.shadowOf(application).peekNextStartedService())
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/receiver/QuitReceiverTest.kt b/app/src/test/java/com/farmerbb/taskbar/receiver/QuitReceiverTest.kt
index 7cb40d8..fbb865d 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/receiver/QuitReceiverTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/receiver/QuitReceiverTest.kt
@@ -50,4 +50,4 @@ class QuitReceiverTest {
         quitReceiver.onReceive(context, intent)
         Assert.assertFalse(prefs.getBoolean(Constants.PREF_TASKBAR_ACTIVE, true))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/receiver/ShowHideTaskbarReceiverTest.kt b/app/src/test/java/com/farmerbb/taskbar/receiver/ShowHideTaskbarReceiverTest.kt
index bb8c9e9..35b51a9 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/receiver/ShowHideTaskbarReceiverTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/receiver/ShowHideTaskbarReceiverTest.kt
@@ -68,7 +68,8 @@ class ShowHideTaskbarReceiverTest {
         var startedServiceIntent = Shadows.shadowOf(application).peekNextStartedService()
         Assert.assertNotNull(startedServiceIntent)
         Assert.assertEquals(notificationIntent.component, startedServiceIntent.component)
-        Assert.assertTrue(startedServiceIntent.getBooleanExtra(Constants.EXTRA_START_SERVICES, false))
+        Assert.assertTrue(startedServiceIntent.getBooleanExtra(
+                Constants.EXTRA_START_SERVICES, false))
         Shadows.shadowOf(application).clearStartedServices()
         prefs.edit().putBoolean(Constants.PREF_IS_HIDDEN, false).apply()
         showHideTaskbarReceiver.onReceive(context, intent)
@@ -78,4 +79,4 @@ class ShowHideTaskbarReceiverTest {
         Assert.assertNull(startedServiceIntent.extras)
         Assert.assertTrue(prefs.getBoolean(Constants.PREF_IS_HIDDEN, false))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/service/FavoriteAppTileServiceTest.kt b/app/src/test/java/com/farmerbb/taskbar/service/FavoriteAppTileServiceTest.kt
index 0451c3b..a7ccefd 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/service/FavoriteAppTileServiceTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/service/FavoriteAppTileServiceTest.kt
@@ -165,4 +165,4 @@ class FavoriteAppTileServiceTest {
         Assert.assertEquals(Tile.STATE_ACTIVE.toLong(), tile.state.toLong())
         Assert.assertEquals(testLabel, tile.label)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/service/NotificationCountServiceTest.kt b/app/src/test/java/com/farmerbb/taskbar/service/NotificationCountServiceTest.kt
index 165a073..6e2f95d 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/service/NotificationCountServiceTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/service/NotificationCountServiceTest.kt
@@ -29,7 +29,8 @@ class NotificationCountServiceTest {
         service = Robolectric.setupService(NotificationCountService::class.java)
         LocalBroadcastManager
                 .getInstance(context)
-                .registerReceiver(receiver, IntentFilter(Constants.ACTION_NOTIFICATION_COUNT_CHANGED))
+                .registerReceiver(receiver,
+                        IntentFilter(Constants.ACTION_NOTIFICATION_COUNT_CHANGED))
         receiver.reset()
     }
 
@@ -92,4 +93,4 @@ class NotificationCountServiceTest {
             count = -1
         }
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/service/PowerMenuServiceTest.kt b/app/src/test/java/com/farmerbb/taskbar/service/PowerMenuServiceTest.kt
index 698d690..4907145 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/service/PowerMenuServiceTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/service/PowerMenuServiceTest.kt
@@ -24,4 +24,4 @@ class PowerMenuServiceTest {
         val shadowService = Shadows.shadowOf(service)
         Assert.assertTrue(shadowService.globalActionsPerformed.contains(testAction))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/service/QuickSettingsTileServiceTest.kt b/app/src/test/java/com/farmerbb/taskbar/service/QuickSettingsTileServiceTest.kt
index 43a8417..728e754 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/service/QuickSettingsTileServiceTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/service/QuickSettingsTileServiceTest.kt
@@ -37,7 +37,8 @@ class QuickSettingsTileServiceTest {
 
     @Test
     fun testUpdateStateForIcon() {
-        prefs.edit().putString(Constants.PREF_START_BUTTON_IMAGE, Constants.PREF_START_BUTTON_IMAGE_APP_LOGO).apply()
+        prefs.edit().putString(Constants.PREF_START_BUTTON_IMAGE,
+                Constants.PREF_START_BUTTON_IMAGE_APP_LOGO).apply()
         tileService.updateState()
         var icon = tileService.qsTile.icon
         Assert.assertEquals(R.drawable.tb_system.toLong(), Shadows.shadowOf(icon).resId.toLong())
@@ -72,4 +73,4 @@ class QuickSettingsTileServiceTest {
         tileService.updateState()
         Assert.assertEquals(Tile.STATE_UNAVAILABLE.toLong(), tileService.qsTile.state.toLong())
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/service/UIHostServiceNewControllerTest.kt b/app/src/test/java/com/farmerbb/taskbar/service/UIHostServiceNewControllerTest.kt
index c6b67e3..d88cef5 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/service/UIHostServiceNewControllerTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/service/UIHostServiceNewControllerTest.kt
@@ -28,4 +28,4 @@ class UIHostServiceNewControllerTest {
         val taskbarService = Robolectric.setupService(TaskbarService::class.java)
         Assert.assertTrue(taskbarService.newController() is TaskbarController)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/shadow/TaskbarShadowScrollView.kt b/app/src/test/java/com/farmerbb/taskbar/shadow/TaskbarShadowScrollView.kt
index 71c609b..ea09850 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/shadow/TaskbarShadowScrollView.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/shadow/TaskbarShadowScrollView.kt
@@ -11,4 +11,4 @@ class TaskbarShadowScrollView : ShadowScrollView() {
     public override fun scrollTo(x: Int, y: Int) {
         super.scrollTo(x, y)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/DashboardControllerTest.kt b/app/src/test/java/com/farmerbb/taskbar/ui/DashboardControllerTest.kt
index 941e5c2..a9b8c0c 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/DashboardControllerTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/DashboardControllerTest.kt
@@ -18,10 +18,27 @@ import com.farmerbb.taskbar.Constants.UNSUPPORTED
 import com.farmerbb.taskbar.R
 import com.farmerbb.taskbar.helper.LauncherHelper
 import com.farmerbb.taskbar.mockito.BooleanAnswer
-import com.farmerbb.taskbar.util.Constants.*
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_VERTICAL_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_VERTICAL_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_VERTICAL_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_VERTICAL_RIGHT
+import com.farmerbb.taskbar.util.Constants.PREF_DASHBOARD_TUTORIAL_SHOWN
+import com.farmerbb.taskbar.util.Constants.PREF_DASHBOARD_WIDGET_PLACEHOLDER_SUFFIX
+import com.farmerbb.taskbar.util.Constants.PREF_DASHBOARD_WIDGET_PREFIX
+import com.farmerbb.taskbar.util.Constants.PREF_DASHBOARD_WIDGET_PROVIDER_SUFFIX
+import com.farmerbb.taskbar.util.Constants.PREF_DEFAULT_NULL
+import com.farmerbb.taskbar.util.Constants.PREF_DONT_STOP_DASHBOARD
 import com.farmerbb.taskbar.util.TaskbarPosition
 import com.farmerbb.taskbar.util.U
-import org.junit.*
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PowerMockIgnore
@@ -33,8 +50,10 @@ import org.robolectric.shadows.AppWidgetProviderInfoBuilder
 import org.robolectric.shadows.ShadowToast
 
 @RunWith(RobolectricTestRunner::class)
-@PowerMockIgnore("org.mockito.*", "org.robolectric.*", "android.*", "androidx.*", "com.farmerbb.taskbar.shadow.*")
-@PrepareForTest(value = [U::class, TaskbarPosition::class, DashboardController::class, LauncherHelper::class])
+@PowerMockIgnore("org.mockito.*", "org.robolectric.*", "android.*", "androidx.*",
+        "com.farmerbb.taskbar.shadow.*")
+@PrepareForTest(value = [U::class, TaskbarPosition::class, DashboardController::class,
+    LauncherHelper::class])
 class DashboardControllerTest {
     @get:Rule
     val rule = PowerMockRule()
@@ -138,9 +157,9 @@ class DashboardControllerTest {
     @Test
     fun testGenerateProviderPrefKey() {
         Assert.assertEquals(
-                PREF_DASHBOARD_WIDGET_PREFIX
-                        + DEFAULT_TEST_CELL_ID
-                        + PREF_DASHBOARD_WIDGET_PROVIDER_SUFFIX,
+                PREF_DASHBOARD_WIDGET_PREFIX +
+                        DEFAULT_TEST_CELL_ID +
+                        PREF_DASHBOARD_WIDGET_PROVIDER_SUFFIX,
                 uiController.generateProviderPrefKey(DEFAULT_TEST_CELL_ID)
         )
     }
@@ -148,9 +167,9 @@ class DashboardControllerTest {
     @Test
     fun testGenerateProviderPlaceholderPrefKey() {
         Assert.assertEquals(
-                PREF_DASHBOARD_WIDGET_PREFIX
-                        + DEFAULT_TEST_CELL_ID
-                        + PREF_DASHBOARD_WIDGET_PLACEHOLDER_SUFFIX,
+                PREF_DASHBOARD_WIDGET_PREFIX +
+                        DEFAULT_TEST_CELL_ID +
+                        PREF_DASHBOARD_WIDGET_PLACEHOLDER_SUFFIX,
                 uiController.generateProviderPlaceholderPrefKey(DEFAULT_TEST_CELL_ID)
         )
     }
@@ -192,4 +211,4 @@ class DashboardControllerTest {
         Assert.assertEquals(right.toLong(), view.paddingRight.toLong())
         Assert.assertEquals(bottom.toLong(), view.paddingBottom.toLong())
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/MockUIHost.kt b/app/src/test/java/com/farmerbb/taskbar/ui/MockUIHost.kt
index e40eb2a..0577987 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/MockUIHost.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/MockUIHost.kt
@@ -7,4 +7,4 @@ class MockUIHost : UIHost {
     override fun removeView(view: View) {}
     override fun terminate() {}
     override fun updateViewLayout(view: View, params: ViewParams) {}
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/StartMenuControllerTest.kt b/app/src/test/java/com/farmerbb/taskbar/ui/StartMenuControllerTest.kt
index b851b39..aef814d 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/StartMenuControllerTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/StartMenuControllerTest.kt
@@ -16,16 +16,27 @@ import com.farmerbb.taskbar.Constants
 import com.farmerbb.taskbar.LauncherAppsHelper.generateTestLauncherActivityInfo
 import com.farmerbb.taskbar.R
 import com.farmerbb.taskbar.util.AppEntry
-import com.farmerbb.taskbar.util.Constants.*
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_VERTICAL_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_VERTICAL_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_VERTICAL_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_VERTICAL_RIGHT
+import com.farmerbb.taskbar.util.Constants.PREF_SHOW_SEARCH_BAR
 import com.farmerbb.taskbar.util.TaskbarPosition
 import com.farmerbb.taskbar.util.U
-import org.junit.*
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.core.classloader.annotations.PowerMockIgnore
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.rule.PowerMockRule
 import org.robolectric.RobolectricTestRunner
-import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
 @PowerMockIgnore("org.mockito.*", "org.robolectric.*", "android.*", "androidx.*")
@@ -161,7 +172,8 @@ class StartMenuControllerTest {
         val queryList: MutableList<LauncherActivityInfo> = ArrayList()
         val userManager = context.getSystemService(Context.USER_SERVICE) as UserManager
         val packageManager = context.packageManager
-        var appEntries = uiController.generateAppEntries(context, userManager, packageManager, queryList)
+        var appEntries = uiController.generateAppEntries(context, userManager,
+                packageManager, queryList)
         Assert.assertEquals(0, appEntries.size.toLong())
         val activityInfo = ActivityInfo()
         activityInfo.packageName = Constants.TEST_PACKAGE
@@ -173,11 +185,13 @@ class StartMenuControllerTest {
                 context, activityInfo, Constants.DEFAULT_TEST_USER_ID
         )
         queryList.add(launcherActivityInfo)
-        appEntries = uiController.generateAppEntries(context, userManager, packageManager, queryList)
+        appEntries = uiController.generateAppEntries(context, userManager,
+                packageManager, queryList)
         Assert.assertEquals(1, appEntries.size.toLong())
         verifyAppEntryContent(activityInfo, appEntries[0])
         queryList.add(launcherActivityInfo)
-        appEntries = uiController.generateAppEntries(context, userManager, packageManager, queryList)
+        appEntries = uiController.generateAppEntries(context, userManager,
+                packageManager, queryList)
         Assert.assertEquals(2, appEntries.size.toLong())
         verifyAppEntryContent(activityInfo, appEntries[0])
         verifyAppEntryContent(activityInfo, appEntries[1])
@@ -194,4 +208,4 @@ class StartMenuControllerTest {
     companion object {
         private const val NON_URL_QUERY = "test-query"
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.kt b/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.kt
index a441a2a..73b2813 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/TaskbarControllerTest.kt
@@ -25,15 +25,44 @@ import androidx.test.core.app.ApplicationProvider
 import com.farmerbb.taskbar.Constants
 import com.farmerbb.taskbar.LauncherAppsHelper.generateTestLauncherActivityInfo
 import com.farmerbb.taskbar.R
-import com.farmerbb.taskbar.activity.*
+import com.farmerbb.taskbar.activity.HomeActivity
+import com.farmerbb.taskbar.activity.HomeActivityDelegate
+import com.farmerbb.taskbar.activity.InvisibleActivityFreeform
+import com.farmerbb.taskbar.activity.MainActivity
+import com.farmerbb.taskbar.activity.SecondaryHomeActivity
 import com.farmerbb.taskbar.mockito.BooleanAnswer
 import com.farmerbb.taskbar.mockito.StringAnswer
 import com.farmerbb.taskbar.shadow.TaskbarShadowScrollView
 import com.farmerbb.taskbar.util.AppEntry
-import com.farmerbb.taskbar.util.Constants.*
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_VERTICAL_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_BOTTOM_VERTICAL_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_RIGHT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_VERTICAL_LEFT
+import com.farmerbb.taskbar.util.Constants.POSITION_TOP_VERTICAL_RIGHT
+import com.farmerbb.taskbar.util.Constants.PREF_BUTTON_BACK
+import com.farmerbb.taskbar.util.Constants.PREF_BUTTON_HOME
+import com.farmerbb.taskbar.util.Constants.PREF_BUTTON_RECENTS
+import com.farmerbb.taskbar.util.Constants.PREF_DASHBOARD
+import com.farmerbb.taskbar.util.Constants.PREF_HIDE_FOREGROUND
+import com.farmerbb.taskbar.util.Constants.PREF_RECENTS_AMOUNT
+import com.farmerbb.taskbar.util.Constants.PREF_RECENTS_AMOUNT_APP_START
+import com.farmerbb.taskbar.util.Constants.PREF_RECENTS_AMOUNT_RUNNING_APPS_ONLY
+import com.farmerbb.taskbar.util.Constants.PREF_RECENTS_AMOUNT_SHOW_ALL
+import com.farmerbb.taskbar.util.Constants.PREF_START_BUTTON_IMAGE
+import com.farmerbb.taskbar.util.Constants.PREF_START_BUTTON_IMAGE_APP_LOGO
+import com.farmerbb.taskbar.util.Constants.PREF_START_BUTTON_IMAGE_CUSTOM
+import com.farmerbb.taskbar.util.Constants.PREF_START_BUTTON_IMAGE_DEFAULT
+import com.farmerbb.taskbar.util.Constants.PREF_TIME_OF_SERVICE_START
 import com.farmerbb.taskbar.util.TaskbarPosition
 import com.farmerbb.taskbar.util.U
-import org.junit.*
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PowerMockIgnore
@@ -44,7 +73,6 @@ import org.robolectric.Shadows
 import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowUsageStatsManager
 import org.robolectric.util.ReflectionHelpers
-import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
 @PowerMockIgnore("org.mockito.*", "org.robolectric.*", "android.*", "androidx.*")
@@ -189,11 +217,13 @@ class TaskbarControllerTest {
         val layout = LayoutInflater.from(context).inflate(layoutId, null) as LinearLayout
         val dashboardButton = layout.findViewById<FrameLayout>(R.id.dashboard_button)
         prefs.edit().putBoolean(PREF_DASHBOARD, false).apply()
-        var dashboardEnabled = uiController.drawDashboardButton(context, layout, dashboardButton, accentColor)
+        var dashboardEnabled = uiController.drawDashboardButton(context, layout,
+                dashboardButton, accentColor)
         Assert.assertFalse(dashboardEnabled)
         Assert.assertEquals(View.GONE.toLong(), dashboardButton.visibility.toLong())
         prefs.edit().putBoolean(PREF_DASHBOARD, true).apply()
-        dashboardEnabled = uiController.drawDashboardButton(context, layout, dashboardButton, accentColor)
+        dashboardEnabled = uiController.drawDashboardButton(context, layout, dashboardButton,
+                accentColor)
         Assert.assertTrue(dashboardEnabled)
         Assert.assertTrue(dashboardButton.hasOnClickListeners())
         Assert.assertEquals(View.VISIBLE.toLong(), dashboardButton.visibility.toLong())
@@ -223,15 +253,18 @@ class TaskbarControllerTest {
         Assert.assertFalse(uiController.drawNavbarButtons(context, layout, prefs, Color.RED))
         prefs.edit().putBoolean(PREF_BUTTON_BACK, true).apply()
         Assert.assertTrue(uiController.drawNavbarButtons(context, layout, prefs, Color.RED))
-        Assert.assertEquals(View.VISIBLE.toLong(), layout.findViewById<View>(R.id.button_back).visibility.toLong())
+        Assert.assertEquals(View.VISIBLE.toLong(), layout.findViewById<View>(R.id.button_back)
+                .visibility.toLong())
         prefs.edit().remove(PREF_BUTTON_BACK).apply()
         prefs.edit().putBoolean(PREF_BUTTON_HOME, true).apply()
         Assert.assertTrue(uiController.drawNavbarButtons(context, layout, prefs, Color.RED))
-        Assert.assertEquals(View.VISIBLE.toLong(), layout.findViewById<View>(R.id.button_home).visibility.toLong())
+        Assert.assertEquals(View.VISIBLE.toLong(), layout.findViewById<View>(R.id.button_home)
+                .visibility.toLong())
         prefs.edit().remove(PREF_BUTTON_HOME).apply()
         prefs.edit().putBoolean(PREF_BUTTON_RECENTS, true).apply()
         Assert.assertTrue(uiController.drawNavbarButtons(context, layout, prefs, Color.RED))
-        Assert.assertEquals(View.VISIBLE.toLong(), layout.findViewById<View>(R.id.button_recents).visibility.toLong())
+        Assert.assertEquals(View.VISIBLE.toLong(), layout.findViewById<View>(R.id.button_recents)
+                .visibility.toLong())
         prefs.edit().remove(PREF_BUTTON_RECENTS).apply()
     }
 
@@ -241,7 +274,8 @@ class TaskbarControllerTest {
         prefs.edit().remove(PREF_RECENTS_AMOUNT).apply()
         var searchInterval = uiController.getSearchInterval(prefs)
         val lastDayTime = System.currentTimeMillis() - AlarmManager.INTERVAL_DAY
-        Assert.assertEquals(lastDayTime.toFloat(), searchInterval.toFloat(), permitTimeDeltaMillis.toFloat())
+        Assert.assertEquals(lastDayTime.toFloat(), searchInterval.toFloat(),
+                permitTimeDeltaMillis.toFloat())
         prefs.edit().putString(PREF_RECENTS_AMOUNT, PREF_RECENTS_AMOUNT_APP_START).apply()
         var deviceStartTime = System.currentTimeMillis() - SystemClock.elapsedRealtime()
         // The service start time is larger than device start time
@@ -254,7 +288,8 @@ class TaskbarControllerTest {
         prefs.edit().putLong(PREF_TIME_OF_SERVICE_START, deviceStartTime - 100).apply()
         searchInterval = uiController.getSearchInterval(prefs)
         deviceStartTime = System.currentTimeMillis() - SystemClock.elapsedRealtime()
-        Assert.assertEquals(deviceStartTime.toFloat(), searchInterval.toFloat(), permitTimeDeltaMillis.toFloat())
+        Assert.assertEquals(deviceStartTime.toFloat(), searchInterval.toFloat(),
+                permitTimeDeltaMillis.toFloat())
         prefs.edit().remove(PREF_TIME_OF_SERVICE_START).apply()
         prefs.edit().putString(PREF_RECENTS_AMOUNT, PREF_RECENTS_AMOUNT_SHOW_ALL).apply()
         searchInterval = uiController.getSearchInterval(prefs)
@@ -313,9 +348,9 @@ class TaskbarControllerTest {
         isVerticalAnswer.answer = true
         var maxScreenSize = Math.max(
                 0,
-                display.height
-                        - U.getStatusBarHeight(context)
-                        - Math.round(U.getBaseTaskbarSize(context))
+                display.height -
+                        U.getStatusBarHeight(context) -
+                        Math.round(U.getBaseTaskbarSize(context))
         )
         uiController.calculateScrollViewParams(context, prefs, params, true, 1)
         Assert.assertEquals(defaultSize.toLong(), params.width.toLong())
@@ -376,7 +411,8 @@ class TaskbarControllerTest {
         ReflectionHelpers.setField(taskbar, "mBottom", taskbarHeight)
         val isVerticalAnswer = BooleanAnswer()
         PowerMockito.spy(TaskbarPosition::class.java)
-        PowerMockito.`when`(TaskbarPosition.isVertical(taskbarPosition)).thenAnswer(isVerticalAnswer)
+        PowerMockito.`when`(TaskbarPosition.isVertical(taskbarPosition))
+                .thenAnswer(isVerticalAnswer)
         isVerticalAnswer.answer = false
         uiController.scrollTaskbar(scrollView, taskbar, taskbarPosition, "false", true)
         Assert.assertEquals(0, scrollView.scrollX.toLong())
@@ -398,7 +434,8 @@ class TaskbarControllerTest {
         prefs.edit().putBoolean(PREF_HIDE_FOREGROUND, true).apply()
         val searchInterval = 0L
         val applicationIdsToRemove: MutableList<String> = ArrayList()
-        val usageStatsManager = context.getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+        val usageStatsManager = context.getSystemService(Context.USAGE_STATS_SERVICE)
+                as UsageStatsManager
         val entryTestPackage1 = Constants.TEST_PACKAGE + "-1"
         var event = ShadowUsageStatsManager.EventBuilder
                 .buildEvent()
@@ -421,23 +458,31 @@ class TaskbarControllerTest {
         event = buildTaskbarForegroundAppEvent(MainActivity::class.java.canonicalName, 300L)
         Shadows.shadowOf(usageStatsManager).addEvent(event)
         uiController.filterForegroundApp(context, prefs, searchInterval, applicationIdsToRemove)
-        Assert.assertEquals(MainActivity::class.java.canonicalName, applicationIdsToRemove.removeAt(0))
+        Assert.assertEquals(MainActivity::class.java.canonicalName,
+                applicationIdsToRemove.removeAt(0))
         event = buildTaskbarForegroundAppEvent(HomeActivity::class.java.canonicalName, 400L)
         Shadows.shadowOf(usageStatsManager).addEvent(event)
         uiController.filterForegroundApp(context, prefs, searchInterval, applicationIdsToRemove)
-        Assert.assertEquals(HomeActivity::class.java.canonicalName, applicationIdsToRemove.removeAt(0))
-        event = buildTaskbarForegroundAppEvent(HomeActivityDelegate::class.java.canonicalName, 500L)
+        Assert.assertEquals(HomeActivity::class.java.canonicalName,
+                applicationIdsToRemove.removeAt(0))
+        event = buildTaskbarForegroundAppEvent(
+                HomeActivityDelegate::class.java.canonicalName, 500L)
         Shadows.shadowOf(usageStatsManager).addEvent(event)
         uiController.filterForegroundApp(context, prefs, searchInterval, applicationIdsToRemove)
-        Assert.assertEquals(HomeActivityDelegate::class.java.canonicalName, applicationIdsToRemove.removeAt(0))
-        event = buildTaskbarForegroundAppEvent(SecondaryHomeActivity::class.java.canonicalName, 600L)
+        Assert.assertEquals(HomeActivityDelegate::class.java.canonicalName,
+                applicationIdsToRemove.removeAt(0))
+        event = buildTaskbarForegroundAppEvent(
+                SecondaryHomeActivity::class.java.canonicalName, 600L)
         Shadows.shadowOf(usageStatsManager).addEvent(event)
         uiController.filterForegroundApp(context, prefs, searchInterval, applicationIdsToRemove)
-        Assert.assertEquals(SecondaryHomeActivity::class.java.canonicalName, applicationIdsToRemove.removeAt(0))
-        event = buildTaskbarForegroundAppEvent(InvisibleActivityFreeform::class.java.canonicalName, 700L)
+        Assert.assertEquals(SecondaryHomeActivity::class.java.canonicalName,
+                applicationIdsToRemove.removeAt(0))
+        event = buildTaskbarForegroundAppEvent(
+                InvisibleActivityFreeform::class.java.canonicalName, 700L)
         Shadows.shadowOf(usageStatsManager).addEvent(event)
         uiController.filterForegroundApp(context, prefs, searchInterval, applicationIdsToRemove)
-        Assert.assertEquals(InvisibleActivityFreeform::class.java.canonicalName, applicationIdsToRemove.removeAt(0))
+        Assert.assertEquals(InvisibleActivityFreeform::class.java.canonicalName,
+                applicationIdsToRemove.removeAt(0))
         event = buildTaskbarForegroundAppEvent(Constants.UNSUPPORTED, 800L)
         Shadows.shadowOf(usageStatsManager).addEvent(event)
         uiController.filterForegroundApp(context, prefs, searchInterval, applicationIdsToRemove)
@@ -642,7 +687,8 @@ class TaskbarControllerTest {
                 populatedEntry.componentName
         )
         Assert.assertEquals(info.nonLocalizedLabel.toString(), populatedEntry.label)
-        Assert.assertEquals(Constants.DEFAULT_TEST_USER_ID.toLong(), populatedEntry.getUserId(context))
+        Assert.assertEquals(Constants.DEFAULT_TEST_USER_ID.toLong(),
+                populatedEntry.getUserId(context))
         Assert.assertEquals(appEntry.lastTimeUsed, populatedEntry.lastTimeUsed)
     }
 
@@ -658,7 +704,8 @@ class TaskbarControllerTest {
         return appEntry
     }
 
-    private fun buildTaskbarForegroundAppEvent(className: String, timestamp: Long): UsageEvents.Event {
+    private fun buildTaskbarForegroundAppEvent(className: String, timestamp: Long):
+            UsageEvents.Event {
         return ShadowUsageStatsManager.EventBuilder
                 .buildEvent()
                 .setPackage(className)
@@ -678,13 +725,15 @@ class TaskbarControllerTest {
         val layoutId = uiController.getTaskbarLayoutId(POSITION_BOTTOM_LEFT)
         val layout = LayoutInflater.from(context).inflate(layoutId, null) as LinearLayout
         val dashboardButton = layout.findViewById<FrameLayout>(R.id.dashboard_button)
-        val dashboardEnabled = uiController.drawDashboardButton(context, layout, dashboardButton, Color.RED)
+        val dashboardEnabled = uiController.drawDashboardButton(context, layout,
+                dashboardButton, Color.RED)
         Assert.assertEquals(expectedDashboardEnabled, dashboardEnabled)
     }
 
     private fun checkDrawSysTrayTimeVisibility(position: String, timeId: Int) {
         val sysTrayLayout = initializeSysTrayLayout(position)
-        Assert.assertEquals(View.VISIBLE.toLong(), sysTrayLayout.findViewById<View>(timeId).visibility.toLong())
+        Assert.assertEquals(View.VISIBLE.toLong(), sysTrayLayout.findViewById<View>(timeId)
+                .visibility.toLong())
     }
 
     private fun checkDrawSysTrayGravity(position: String, gravity: Int) {
@@ -710,4 +759,4 @@ class TaskbarControllerTest {
         Assert.assertEquals(padding.toLong(), startButton.paddingRight.toLong())
         Assert.assertEquals(padding.toLong(), startButton.paddingBottom.toLong())
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/TestUIController.kt b/app/src/test/java/com/farmerbb/taskbar/ui/TestUIController.kt
index d3b411b..98d83fd 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/TestUIController.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/TestUIController.kt
@@ -17,4 +17,4 @@ class TestUIController(context: Context?) : UIController(context) {
     public override fun onDestroyHost(host: UIHost) {
         onDestroyHost = host
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/TestUIHostService.kt b/app/src/test/java/com/farmerbb/taskbar/ui/TestUIHostService.kt
index 1696505..9d9d616 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/TestUIHostService.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/TestUIHostService.kt
@@ -8,4 +8,4 @@ class TestUIHostService : UIHostService() {
     override fun newController(): UIController {
         return controller
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/UIControllerTest.kt b/app/src/test/java/com/farmerbb/taskbar/ui/UIControllerTest.kt
index c4036c8..b4b17b4 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/UIControllerTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/UIControllerTest.kt
@@ -6,7 +6,11 @@ import com.farmerbb.taskbar.helper.LauncherHelper
 import com.farmerbb.taskbar.mockito.BooleanAnswer
 import com.farmerbb.taskbar.util.Constants
 import com.farmerbb.taskbar.util.U
-import org.junit.*
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PowerMockIgnore
@@ -95,4 +99,4 @@ class UIControllerTest {
             hasRun = true
         }
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/UIHostServiceTest.kt b/app/src/test/java/com/farmerbb/taskbar/ui/UIHostServiceTest.kt
index e88816d..973414e 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/UIHostServiceTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/UIHostServiceTest.kt
@@ -57,4 +57,4 @@ class UIHostServiceTest {
         hostService.terminate()
         Assert.assertTrue(shadowService.isStoppedBySelf)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/ui/ViewParamsTest.kt b/app/src/test/java/com/farmerbb/taskbar/ui/ViewParamsTest.kt
index 74ca6a7..9d0dd1b 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/ui/ViewParamsTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/ui/ViewParamsTest.kt
@@ -25,7 +25,8 @@ class ViewParamsTest {
         Assert.assertEquals(flags.toLong(), generatedParams.flags.toLong())
         Assert.assertEquals(bottomMargin.toLong(), generatedParams.y.toLong())
         Assert.assertEquals(PixelFormat.TRANSLUCENT.toLong(), generatedParams.format.toLong())
-        Assert.assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY.toLong(), generatedParams.type.toLong())
+        Assert.assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY.toLong(),
+                generatedParams.type.toLong())
         params.gravity = -1
         generatedParams = params.toWindowManagerParams()
         Assert.assertEquals(0, generatedParams.gravity.toLong())
@@ -33,4 +34,4 @@ class ViewParamsTest {
         generatedParams = params.toWindowManagerParams()
         Assert.assertEquals(0, generatedParams.y.toLong())
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/AppEntryTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/AppEntryTest.kt
index 64e451b..1437bb2 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/AppEntryTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/AppEntryTest.kt
@@ -80,4 +80,4 @@ class AppEntryTest {
         Assert.assertEquals(100, appEntry.totalTimeInForeground)
         appEntry.totalTimeInForeground = 0
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/BlacklistTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/BlacklistTest.kt
index aec4ee3..0bb0f9f 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/BlacklistTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/BlacklistTest.kt
@@ -61,7 +61,8 @@ class BlacklistTest {
     @Test
     fun testSerializable() {
         blacklist.addBlockedApp(context, entry)
-        val newBlacklist = SerializationUtils.deserialize<Blacklist>(SerializationUtils.serialize(blacklist))
+        val newBlacklist = SerializationUtils.deserialize<Blacklist>(
+                SerializationUtils.serialize(blacklist))
         Assert.assertTrue(newBlacklist.isBlocked(context.packageName))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/DesktopIconInfoTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/DesktopIconInfoTest.kt
index 144be19..8e12459 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/DesktopIconInfoTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/DesktopIconInfoTest.kt
@@ -46,7 +46,8 @@ class DesktopIconInfoTest {
 
     @Test
     fun testSerializable() {
-        val newDesktopIconInfo = SerializationUtils.deserialize<DesktopIconInfo>(SerializationUtils.serialize(desktopIconInfo))
+        val newDesktopIconInfo = SerializationUtils.deserialize<DesktopIconInfo>(
+                SerializationUtils.serialize(desktopIconInfo))
         testNewDesktopIconInfo(newDesktopIconInfo)
     }
 
@@ -69,4 +70,4 @@ class DesktopIconInfoTest {
         Assert.assertNotNull(ReflectionHelpers.getField(desktopIconInfo.entry, "icon"))
         Assert.assertNull(ReflectionHelpers.getField(newDesktopIconInfo.entry, "icon"))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/FABWrapperTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/FABWrapperTest.kt
index 0894c64..c5580a9 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/FABWrapperTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/FABWrapperTest.kt
@@ -56,4 +56,4 @@ class FABWrapperTest {
         wrapper.hide()
         Assert.assertEquals(View.GONE.toLong(), wrapper.view.visibility.toLong())
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/IconPackManagerTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/IconPackManagerTest.kt
index 1d379ab..1560b15 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/IconPackManagerTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/IconPackManagerTest.kt
@@ -5,14 +5,13 @@ import android.content.Context
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import androidx.test.core.app.ApplicationProvider
+import java.util.function.Consumer
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows
-import java.util.*
-import java.util.function.Consumer
 
 @RunWith(RobolectricTestRunner::class)
 class IconPackManagerTest {
@@ -50,7 +49,8 @@ class IconPackManagerTest {
         }
         Assert.assertEquals(testIconPackSize.toLong(), iconPacks.size.toLong())
         val fetchedIconPackPackages: MutableSet<String> = HashSet()
-        iconPacks.forEach(Consumer { iconPack: IconPack -> fetchedIconPackPackages.add(iconPack.packageName) })
+        iconPacks.forEach(Consumer { iconPack: IconPack ->
+            fetchedIconPackPackages.add(iconPack.packageName) })
         Assert.assertEquals(testIconPackSize.toLong(), fetchedIconPackPackages.size.toLong())
         val expectedIconPackPackages: MutableSet<String> = HashSet()
         for (i in 1..testIconPackSize) {
@@ -73,4 +73,4 @@ class IconPackManagerTest {
         Assert.assertEquals(context.packageName, newIconPack.packageName)
         Assert.assertNotSame(iconPack, newIconPack)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/PinnedBlockedAppsTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/PinnedBlockedAppsTest.kt
index 6dd00e9..abcf552 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/PinnedBlockedAppsTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/PinnedBlockedAppsTest.kt
@@ -106,4 +106,4 @@ class PinnedBlockedAppsTest {
         Assert.assertTrue(newPinnedBlockedApps.isPinned(packageName))
         Assert.assertTrue(newPinnedBlockedApps.isBlocked(packageName))
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/RunnableHooker.kt b/app/src/test/java/com/farmerbb/taskbar/util/RunnableHooker.kt
index b62010e..149c3c6 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/RunnableHooker.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/RunnableHooker.kt
@@ -35,4 +35,4 @@ class RunnableHooker : Runnable {
     fun hasRun(): Boolean {
         return hasRun
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizeEntryTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizeEntryTest.kt
index 137bbdf..fb7767f 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizeEntryTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizeEntryTest.kt
@@ -22,7 +22,8 @@ class SavedWindowSizeEntryTest {
 
     @Test
     fun testSerializable() {
-        val newEntry = SerializationUtils.deserialize<SavedWindowSizesEntry>(SerializationUtils.serialize(entry))
+        val newEntry = SerializationUtils.deserialize<SavedWindowSizesEntry>(
+                SerializationUtils.serialize(entry))
         Assert.assertEquals(entry.componentName, newEntry.componentName)
         Assert.assertEquals(entry.windowSize, newEntry.windowSize)
     }
@@ -31,4 +32,4 @@ class SavedWindowSizeEntryTest {
         private const val COMPONENT_NAME = "test-component-name"
         private const val WINDOW_SIZE = "test-window-size"
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizesTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizesTest.kt
index 0880f26..ce222fd 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizesTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/SavedWindowSizesTest.kt
@@ -77,4 +77,4 @@ class SavedWindowSizesTest {
     companion object {
         private const val CUSTOM_WINDOW_SIZE = "custom-window-size"
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/TaskbarPositionTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/TaskbarPositionTest.kt
index 123db3c..91e30cb 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/TaskbarPositionTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/TaskbarPositionTest.kt
@@ -4,14 +4,13 @@ import android.content.Context
 import android.view.Surface
 import android.view.WindowManager
 import androidx.test.core.app.ApplicationProvider
+import java.util.function.Predicate
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows
-import java.util.*
-import java.util.function.Predicate
 
 @RunWith(RobolectricTestRunner::class)
 class TaskbarPositionTest {
@@ -38,28 +37,44 @@ class TaskbarPositionTest {
     @Test
     fun testIsVerticalWithContext() {
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_LEFT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, false
+                Constants.POSITION_BOTTOM_LEFT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_RIGHT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, false
+                Constants.POSITION_BOTTOM_RIGHT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_VERTICAL_LEFT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, true
+                Constants.POSITION_BOTTOM_VERTICAL_LEFT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_VERTICAL_RIGHT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, true
+                Constants.POSITION_BOTTOM_VERTICAL_RIGHT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_LEFT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, false
+                Constants.POSITION_TOP_LEFT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_RIGHT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, false
+                Constants.POSITION_TOP_RIGHT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_VERTICAL_LEFT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, true
+                Constants.POSITION_TOP_VERTICAL_LEFT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_VERTICAL_RIGHT, Predicate { context: Context? -> TaskbarPosition.isVertical(context) }, true
+                Constants.POSITION_TOP_VERTICAL_RIGHT,
+                { context: Context? -> TaskbarPosition.isVertical(context) },
+                true
         )
     }
 
@@ -78,28 +93,44 @@ class TaskbarPositionTest {
     @Test
     fun testIsLeftWithContext() {
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_LEFT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, true
+                Constants.POSITION_BOTTOM_LEFT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_RIGHT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, false
+                Constants.POSITION_BOTTOM_RIGHT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_VERTICAL_LEFT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, true
+                Constants.POSITION_BOTTOM_VERTICAL_LEFT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_BOTTOM_VERTICAL_RIGHT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, false
+                Constants.POSITION_BOTTOM_VERTICAL_RIGHT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_LEFT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, true
+                Constants.POSITION_TOP_LEFT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_RIGHT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, false
+                Constants.POSITION_TOP_RIGHT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                false
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_VERTICAL_LEFT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, true
+                Constants.POSITION_TOP_VERTICAL_LEFT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                true
         )
         checkTaskbarPositionGroup(
-                Constants.POSITION_TOP_VERTICAL_RIGHT, Predicate { context: Context? -> TaskbarPosition.isLeft(context) }, false
+                Constants.POSITION_TOP_VERTICAL_RIGHT,
+                { context: Context? -> TaskbarPosition.isLeft(context) },
+                false
         )
     }
 
@@ -119,42 +150,42 @@ class TaskbarPositionTest {
     fun testIsRightWithContext() {
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isRight(context) },
+                { context: Context? -> TaskbarPosition.isRight(context) },
                 true
         )
     }
@@ -175,42 +206,42 @@ class TaskbarPositionTest {
     fun testIsBottomWithContext() {
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isBottom(context) },
+                { context: Context? -> TaskbarPosition.isBottom(context) },
                 false
         )
     }
@@ -231,42 +262,42 @@ class TaskbarPositionTest {
     fun testIsVerticalLeftWithContext() {
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
+                { context: Context? -> TaskbarPosition.isVerticalLeft(context) },
                 false
         )
     }
@@ -287,42 +318,42 @@ class TaskbarPositionTest {
     fun testIsVerticalRightWithContext() {
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_BOTTOM_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 true
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_LEFT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 false
         )
         checkTaskbarPositionGroup(
                 Constants.POSITION_TOP_VERTICAL_RIGHT,
-                Predicate { context: Context? -> TaskbarPosition.isVerticalRight(context) },
+                { context: Context? -> TaskbarPosition.isVerticalRight(context) },
                 true
         )
     }
@@ -469,8 +500,10 @@ class TaskbarPositionTest {
         )
     }
 
-    private fun checkTaskbarPositionWithDifferentRotation(originPosition: String,
-                                                          changedPositions: List<String>) {
+    private fun checkTaskbarPositionWithDifferentRotation(
+        originPosition: String,
+        changedPositions: List<String>
+    ) {
         Assert.assertEquals(4, changedPositions.size.toLong())
         val oldPosition = U.getSharedPreferences(context)
                 .getString(Constants.PREF_POSITION, Constants.POSITION_BOTTOM_LEFT)
@@ -485,26 +518,34 @@ class TaskbarPositionTest {
         Assert.assertEquals(changedPositions[2], TaskbarPosition.getTaskbarPosition(context))
         initializeRotation(Surface.ROTATION_270)
         Assert.assertEquals(changedPositions[3], TaskbarPosition.getTaskbarPosition(context))
-        U.getSharedPreferences(context).edit().putBoolean(Constants.PREF_ANCHOR, oldAnchor).apply()
-        U.getSharedPreferences(context).edit().putString(Constants.PREF_POSITION, oldPosition).apply()
+        U.getSharedPreferences(context).edit()
+                .putBoolean(Constants.PREF_ANCHOR, oldAnchor).apply()
+        U.getSharedPreferences(context).edit()
+                .putString(Constants.PREF_POSITION, oldPosition).apply()
     }
 
-    private fun checkTaskbarPositionGroup(originPosition: String,
-                                          predicate: Predicate<Context?>,
-                                          expectedResult: Boolean) {
+    private fun checkTaskbarPositionGroup(
+        originPosition: String,
+        predicate: Predicate<Context?>,
+        expectedResult: Boolean
+    ) {
         val oldPosition = U.getSharedPreferences(context)
                 .getString(Constants.PREF_POSITION, Constants.POSITION_BOTTOM_LEFT)
         val oldAnchor = U.getSharedPreferences(context)
                 .getBoolean(Constants.PREF_ANCHOR, false)
         initializeTaskbarPosition(originPosition)
         Assert.assertEquals(expectedResult, predicate.test(context))
-        U.getSharedPreferences(context).edit().putBoolean(Constants.PREF_ANCHOR, oldAnchor).apply()
-        U.getSharedPreferences(context).edit().putString(Constants.PREF_POSITION, oldPosition).apply()
+        U.getSharedPreferences(context).edit()
+                .putBoolean(Constants.PREF_ANCHOR, oldAnchor).apply()
+        U.getSharedPreferences(context).edit()
+                .putString(Constants.PREF_POSITION, oldPosition).apply()
     }
 
     private fun initializeTaskbarPosition(position: String) {
-        U.getSharedPreferences(context).edit().putBoolean(Constants.PREF_ANCHOR, true).apply()
-        U.getSharedPreferences(context).edit().putString(Constants.PREF_POSITION, position).apply()
+        U.getSharedPreferences(context).edit()
+                .putBoolean(Constants.PREF_ANCHOR, true).apply()
+        U.getSharedPreferences(context).edit()
+                .putString(Constants.PREF_POSITION, position).apply()
     }
 
     private fun initializeRotation(rotation: Int) {
@@ -513,4 +554,4 @@ class TaskbarPositionTest {
         val shadowDisplay = Shadows.shadowOf(display)
         shadowDisplay.setRotation(rotation)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/ToastFrameworkImplTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/ToastFrameworkImplTest.kt
index dc336c6..e9c8259 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/ToastFrameworkImplTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/ToastFrameworkImplTest.kt
@@ -32,7 +32,8 @@ class ToastFrameworkImplTest {
         Assert.assertEquals(message, ShadowToast.getTextOfLatestToast())
         val toast = ShadowToast.getLatestToast()
         Assert.assertEquals(length.toLong(), toast.duration.toLong())
-        Assert.assertEquals((Gravity.BOTTOM or Gravity.CENTER_VERTICAL).toLong(), toast.gravity.toLong())
+        Assert.assertEquals((Gravity.BOTTOM or Gravity.CENTER_VERTICAL).toLong(),
+                toast.gravity.toLong())
         Assert.assertEquals(0, toast.xOffset.toLong())
         Assert.assertEquals(
                 context.resources.getDimensionPixelSize(R.dimen.tb_toast_y_offset).toLong(),
@@ -48,4 +49,4 @@ class ToastFrameworkImplTest {
         impl.cancel()
         Assert.assertTrue(toast.isCancelled)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/TopAppsTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/TopAppsTest.kt
index bce98c5..8811b5a 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/TopAppsTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/TopAppsTest.kt
@@ -48,4 +48,4 @@ class TopAppsTest {
         val entry = BlacklistEntry(packageName, packageName)
         topApps.addTopApp(context, entry)
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/util/UTest.kt b/app/src/test/java/com/farmerbb/taskbar/util/UTest.kt
index 13a72fd..076a736 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/util/UTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/util/UTest.kt
@@ -5,7 +5,11 @@ import android.accessibilityservice.AccessibilityService
 import android.app.ActivityOptions
 import android.app.AlertDialog
 import android.app.Application
-import android.content.*
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.provider.Settings
@@ -59,8 +63,11 @@ class UTest {
     @Throws(Exception::class)
     fun testShowPermissionDialogWithAndroidTVSettings() {
         testShowPermissionDialog(
-                true, context.resources.getString(R.string.tb_permission_dialog_message, U.getAppName(context))
-                + context.resources.getString(R.string.tb_permission_dialog_instructions_tv, U.getAppName(context)),
+                true,
+                context.resources.getString(
+                        R.string.tb_permission_dialog_message, U.getAppName(context)) +
+                context.resources.getString(
+                        R.string.tb_permission_dialog_instructions_tv, U.getAppName(context)),
                 R.string.tb_action_open_settings
         )
     }
@@ -69,20 +76,26 @@ class UTest {
     @Throws(Exception::class)
     fun testShowPermissionDialogNormal() {
         testShowPermissionDialog(
-                false, context.resources.getString(R.string.tb_permission_dialog_message, U.getAppName(context))
-                + context.resources.getString(R.string.tb_permission_dialog_instructions_phone),
+                false,
+                context.resources.getString(
+                        R.string.tb_permission_dialog_message, U.getAppName(context)) +
+                context.resources.getString(
+                        R.string.tb_permission_dialog_instructions_phone),
                 R.string.tb_action_grant_permission
         )
     }
 
     @Throws(Exception::class)
-    private fun testShowPermissionDialog(hasAndroidTVSettings: Boolean,
-                                         message: String,
-                                         buttonTextResId: Int) {
+    private fun testShowPermissionDialog(
+        hasAndroidTVSettings: Boolean,
+        message: String,
+        buttonTextResId: Int
+    ) {
         val onError = RunnableHooker()
         val onFinish = RunnableHooker()
         PowerMockito.spy(U::class.java)
-        PowerMockito.`when`<Any>(U::class.java, "hasAndroidTVSettings", context).thenReturn(hasAndroidTVSettings)
+        PowerMockito.`when`<Any>(U::class.java, "hasAndroidTVSettings", context)
+                .thenReturn(hasAndroidTVSettings)
         val dialog = U.showPermissionDialog(context, Callbacks(onError, onFinish))
         val shadowDialog = Shadows.shadowOf(dialog)
         val resources = context.resources
@@ -146,9 +159,11 @@ class UTest {
         testSendAccessibilityAction(false, false, false)
     }
 
-    private fun testSendAccessibilityAction(serviceEnabled: Boolean,
-                                            hasPermission: Boolean,
-                                            hasRun: Boolean) {
+    private fun testSendAccessibilityAction(
+        serviceEnabled: Boolean,
+        hasPermission: Boolean,
+        hasRun: Boolean
+    ) {
         PowerMockito.spy(U::class.java)
         PowerMockito.`when`(U.isAccessibilityServiceEnabled(context)).thenReturn(serviceEnabled)
         PowerMockito.`when`(U.hasWriteSecureSettingsPermission(context)).thenReturn(hasPermission)
@@ -307,7 +322,8 @@ class UTest {
         val hasFreeformSupportAnswer = BooleanAnswer()
         val isOverridingFreeformHackAnswer = BooleanAnswer()
         PowerMockito.`when`(U.hasFreeformSupport(context)).thenAnswer(hasFreeformSupportAnswer)
-        PowerMockito.`when`(U.isOverridingFreeformHack(context, true)).thenAnswer(isOverridingFreeformHackAnswer)
+        PowerMockito.`when`(U.isOverridingFreeformHack(context, true))
+                .thenAnswer(isOverridingFreeformHackAnswer)
         // Case 1, all return true
         hasFreeformSupportAnswer.answer = true
         isOverridingFreeformHackAnswer.answer = true
@@ -352,8 +368,8 @@ class UTest {
         prefs.edit().remove(Constants.PREF_BACKGROUND_TINT).apply()
         Assert.assertEquals(
                 context.resources.getInteger(R.integer.tb_translucent_gray).toLong(),
-                U.getBackgroundTint(context)
-                        .toLong())
+                U.getBackgroundTint(context).toLong()
+        )
     }
 
     @Test
@@ -362,8 +378,8 @@ class UTest {
         prefs.edit().remove(Constants.PREF_ACCENT_COLOR).apply()
         Assert.assertEquals(
                 context.resources.getInteger(R.integer.tb_translucent_white).toLong(),
-                U.getAccentColor(context)
-                        .toLong())
+                U.getAccentColor(context).toLong()
+        )
         prefs.edit().putInt(Constants.PREF_ACCENT_COLOR, Color.GREEN).apply()
         Assert.assertEquals(Color.GREEN.toLong(), U.getAccentColor(context).toLong())
     }
@@ -405,13 +421,16 @@ class UTest {
         testGetActivityOptions(-1, 2, -1)
     }
 
-    private fun testGetActivityOptions(defaultStackId: Int,
-                                       freeformStackId: Int,
-                                       stackIdWithoutBrokenApi: Int) {
+    private fun testGetActivityOptions(
+        defaultStackId: Int,
+        freeformStackId: Int,
+        stackIdWithoutBrokenApi: Int
+    ) {
         PowerMockito.spy(U::class.java)
         val hasBrokenSetLaunchBoundsApiAnswer = BooleanAnswer()
         val isChromeOsAnswer = BooleanAnswer()
-        PowerMockito.`when`(U.hasBrokenSetLaunchBoundsApi()).thenAnswer(hasBrokenSetLaunchBoundsApiAnswer)
+        PowerMockito.`when`(U.hasBrokenSetLaunchBoundsApi())
+                .thenAnswer(hasBrokenSetLaunchBoundsApiAnswer)
         PowerMockito.`when`(U.isChromeOs(context)).thenAnswer(isChromeOsAnswer)
         val originFreeformHackActive = FreeformHackHelper.getInstance().isFreeformHackActive
         checkActivityOptionsStackIdForNonContextMenu(
@@ -445,16 +464,20 @@ class UTest {
         checkActivityOptionsStackIdForContextMenu(context, -1)
     }
 
-    private fun checkActivityOptionsStackIdForContextMenu(context: Context?,
-                                                          stackId: Int) {
+    private fun checkActivityOptionsStackIdForContextMenu(
+        context: Context?,
+        stackId: Int
+    ) {
         val options = U.getActivityOptions(context, ApplicationType.CONTEXT_MENU, null)
         Assert.assertEquals(stackId.toLong(), getActivityOptionsStackId(options).toLong())
     }
 
-    private fun checkActivityOptionsStackIdForNonContextMenu(context: Context?,
-                                                             applicationType: ApplicationType?,
-                                                             isFreeformHackActive: Boolean,
-                                                             stackId: Int) {
+    private fun checkActivityOptionsStackIdForNonContextMenu(
+        context: Context?,
+        applicationType: ApplicationType?,
+        isFreeformHackActive: Boolean,
+        stackId: Int
+    ) {
         FreeformHackHelper.getInstance().isFreeformHackActive = isFreeformHackActive
         val options = U.getActivityOptions(context, applicationType, null)
         Assert.assertEquals(stackId.toLong(), getActivityOptionsStackId(options).toLong())
@@ -507,7 +530,8 @@ class UTest {
         val prefs = U.getSharedPreferences(context)
         prefs.edit().putBoolean(Constants.PREF_DASHBOARD, true).apply()
         val dashboardButtonSize = context.resources.getDimension(R.dimen.tb_dashboard_button_size)
-        Assert.assertEquals(initialSize + dashboardButtonSize, U.getBaseTaskbarSize(context), 0f)
+        Assert.assertEquals(initialSize + dashboardButtonSize,
+                U.getBaseTaskbarSize(context), 0f)
         prefs.edit().remove(Constants.PREF_DASHBOARD).apply()
         val navbarButtonsMargin = context.resources.getDimension(R.dimen.tb_navbar_buttons_margin)
         val iconSize = context.resources.getDimension(R.dimen.tb_icon_size)
@@ -528,13 +552,15 @@ class UTest {
         prefs.edit().remove(Constants.PREF_BUTTON_RECENTS).apply()
         isSystemTrayEnabledAnswer.answer = true
         val systemTraySize = context.resources.getDimension(R.dimen.tb_systray_size)
-        Assert.assertEquals(initialSize + systemTraySize, U.getBaseTaskbarSize(context), 0f)
+        Assert.assertEquals(initialSize + systemTraySize,
+                U.getBaseTaskbarSize(context), 0f)
     }
 
     @Test
     fun testInitPrefsForBlissOS() {
         PowerMockito.spy(U::class.java)
-        PowerMockito.`when`(U.isBlissOs(ArgumentMatchers.any(Context::class.java))).thenReturn(true)
+        PowerMockito.`when`(U.isBlissOs(ArgumentMatchers.any(Context::class.java)))
+                .thenReturn(true)
         Assert.assertTrue(U.isBlissOs(context))
         val prefs = U.getSharedPreferences(context)
         Assert.assertFalse(prefs.getBoolean(Constants.PREF_BLISS_OS_PREFS, false))
@@ -543,9 +569,12 @@ class UTest {
                 Constants.PREF_RECENTS_AMOUNT_RUNNING_APPS_ONLY,
                 prefs.getString(Constants.PREF_RECENTS_AMOUNT, "")
         )
-        Assert.assertEquals("0", prefs.getString(Constants.PREF_REFRESH_FREQUENCY, ""))
-        Assert.assertEquals("2147483647", prefs.getString(Constants.PREF_MAX_NUM_OF_RECENTS, ""))
-        Assert.assertEquals("true", prefs.getString(Constants.PREF_SORT_ORDER, ""))
+        Assert.assertEquals("0",
+                prefs.getString(Constants.PREF_REFRESH_FREQUENCY, ""))
+        Assert.assertEquals("2147483647",
+                prefs.getString(Constants.PREF_MAX_NUM_OF_RECENTS, ""))
+        Assert.assertEquals("true",
+                prefs.getString(Constants.PREF_SORT_ORDER, ""))
         Assert.assertEquals(
                 Constants.PREF_START_BUTTON_IMAGE_APP_LOGO,
                 prefs.getString(Constants.PREF_START_BUTTON_IMAGE, "")
@@ -597,25 +626,29 @@ class UTest {
                 .putBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false)
                 .apply()
         U.initPrefs(context)
-        Assert.assertFalse(prefs.getBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
+        Assert.assertFalse(prefs.getBoolean(
+                Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
         prefs.edit()
                 .putBoolean(Constants.PREF_FREEFORM_HACK, true)
                 .putBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false)
                 .apply()
         U.initPrefs(context)
-        Assert.assertTrue(prefs.getBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
+        Assert.assertTrue(prefs.getBoolean(
+                Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
         prefs.edit()
                 .putBoolean(Constants.PREF_FREEFORM_HACK, false)
                 .putBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, true)
                 .apply()
         U.initPrefs(context)
-        Assert.assertTrue(prefs.getBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
+        Assert.assertTrue(prefs.getBoolean(
+                Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
         prefs.edit()
                 .putBoolean(Constants.PREF_FREEFORM_HACK, true)
                 .putBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, true)
                 .apply()
         U.initPrefs(context)
-        Assert.assertTrue(prefs.getBoolean(Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
+        Assert.assertTrue(prefs.getBoolean(
+                Constants.PREF_SHOW_FREEFORM_DISABLED_MESSAGE, false))
     }
 
     @Test
@@ -708,7 +741,8 @@ class UTest {
         val isSamsungDeviceAnswer = BooleanAnswer()
         val isNvidiaDevice = BooleanAnswer()
         PowerMockito.`when`(U.isSamsungDevice()).thenAnswer(isSamsungDeviceAnswer)
-        PowerMockito.`when`<Any>(U::class.java, "isNvidiaDevice").thenAnswer(isNvidiaDevice)
+        PowerMockito.`when`<Any>(U::class.java, "isNvidiaDevice")
+                .thenAnswer(isNvidiaDevice)
         isSamsungDeviceAnswer.answer = false
         isNvidiaDevice.answer = false
         Assert.assertTrue(U.hasBrokenSetLaunchBoundsApi())
@@ -793,24 +827,31 @@ class UTest {
     @Test
     @Config(sdk = [26])
     fun testGetOverlayTypeForOAndAboveVersion() {
-        Assert.assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY.toLong(), U.getOverlayType().toLong())
+        Assert.assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY.toLong(),
+                U.getOverlayType().toLong())
     }
 
     @Test
     @Config(sdk = [25])
     fun testGetOverlayTypeForOBelowVersion() {
-        Assert.assertEquals(WindowManager.LayoutParams.TYPE_PHONE.toLong(), U.getOverlayType().toLong())
+        Assert.assertEquals(
+                WindowManager.LayoutParams.TYPE_PHONE.toLong(),
+                U.getOverlayType().toLong()
+        )
     }
 
     @Test
     fun testGetDefaultStartButtonImage() {
         val prefs = U.getSharedPreferences(context)
         prefs.edit().putBoolean(Constants.PREF_APP_DRAWER_ICON, true).apply()
-        Assert.assertEquals(Constants.PREF_START_BUTTON_IMAGE_APP_LOGO, U.getDefaultStartButtonImage(context))
+        Assert.assertEquals(Constants.PREF_START_BUTTON_IMAGE_APP_LOGO,
+                U.getDefaultStartButtonImage(context))
         prefs.edit().putBoolean(Constants.PREF_APP_DRAWER_ICON, false).apply()
-        Assert.assertEquals(Constants.PREF_START_BUTTON_IMAGE_DEFAULT, U.getDefaultStartButtonImage(context))
+        Assert.assertEquals(Constants.PREF_START_BUTTON_IMAGE_DEFAULT,
+                U.getDefaultStartButtonImage(context))
         prefs.edit().remove(Constants.PREF_APP_DRAWER_ICON).apply()
-        Assert.assertEquals(Constants.PREF_START_BUTTON_IMAGE_DEFAULT, U.getDefaultStartButtonImage(context))
+        Assert.assertEquals(Constants.PREF_START_BUTTON_IMAGE_DEFAULT,
+                U.getDefaultStartButtonImage(context))
     }
 
     @Test
@@ -873,8 +914,8 @@ class UTest {
         Assert.assertTrue(U.applyDisplayCutoutModeTo(layoutParams))
         Assert.assertEquals(
                 WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES.toLong(),
-                layoutParams.layoutInDisplayCutoutMode
-                        .toLong())
+                layoutParams.layoutInDisplayCutoutMode.toLong()
+        )
     }
 
     @Test
@@ -890,9 +931,12 @@ class UTest {
         val isDesktopModeSupportedAnswer = BooleanAnswer()
         val getExternalDisplayIdAnswer = IntAnswer()
         val hasFreeformSupportAnswer = BooleanAnswer()
-        PowerMockito.`when`(U.isDesktopModeSupported(context)).thenAnswer(isDesktopModeSupportedAnswer)
-        PowerMockito.`when`(U.getExternalDisplayID(context)).thenAnswer(getExternalDisplayIdAnswer)
-        PowerMockito.`when`(U.hasFreeformSupport(context)).thenAnswer(hasFreeformSupportAnswer)
+        PowerMockito.`when`(U.isDesktopModeSupported(context))
+                .thenAnswer(isDesktopModeSupportedAnswer)
+        PowerMockito.`when`(U.getExternalDisplayID(context))
+                .thenAnswer(getExternalDisplayIdAnswer)
+        PowerMockito.`when`(U.hasFreeformSupport(context))
+                .thenAnswer(hasFreeformSupportAnswer)
         isDesktopModeSupportedAnswer.answer = false
         Assert.assertFalse(U.isDesktopModeActive(context))
         isDesktopModeSupportedAnswer.answer = true
@@ -944,4 +988,4 @@ class UTest {
             const val ACTION = "test-broadcast-receiver-action"
         }
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/widget/DashboardCellTest.kt b/app/src/test/java/com/farmerbb/taskbar/widget/DashboardCellTest.kt
index e9b2381..dee5249 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/widget/DashboardCellTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/widget/DashboardCellTest.kt
@@ -59,4 +59,4 @@ class DashboardCellTest {
             longPressedCell = cell
         }
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/test/java/com/farmerbb/taskbar/widget/StartMenuLayoutTest.kt b/app/src/test/java/com/farmerbb/taskbar/widget/StartMenuLayoutTest.kt
index 931ea95..28cf9e2 100644 (file)
--- a/app/src/test/java/com/farmerbb/taskbar/widget/StartMenuLayoutTest.kt
+++ b/app/src/test/java/com/farmerbb/taskbar/widget/StartMenuLayoutTest.kt
@@ -49,4 +49,4 @@ class StartMenuLayoutTest {
             onReceived = true
         }
     }
-}
\ No newline at end of file
+}