From 4437ddd5362453b3894cbd592ca6b5b00737b0a8 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Fri, 3 Apr 2020 15:20:11 -0700 Subject: [PATCH] No issue: Move Do and OpenClass to utils pkg. They were both in their packages by themselves, which feels unnecessary. Unfortunately, a utils pkg is discouraged by kotlin but we don't have a better place for them right now. Maybe an annotations/ pkg for the latter? --- app/build.gradle | 2 +- app/src/main/java/org/mozilla/fenix/components/Analytics.kt | 2 +- .../java/org/mozilla/fenix/components/BackgroundServices.kt | 2 +- app/src/main/java/org/mozilla/fenix/components/Components.kt | 2 +- app/src/main/java/org/mozilla/fenix/components/Core.kt | 2 +- .../main/java/org/mozilla/fenix/components/FenixSnackbar.kt | 2 +- .../org/mozilla/fenix/components/FindInPageIntegration.kt | 2 +- .../java/org/mozilla/fenix/components/IntentProcessors.kt | 2 +- .../java/org/mozilla/fenix/components/PermissionStorage.kt | 2 +- app/src/main/java/org/mozilla/fenix/components/Search.kt | 2 +- app/src/main/java/org/mozilla/fenix/components/Services.kt | 2 +- .../java/org/mozilla/fenix/components/TabCollectionStorage.kt | 2 +- .../main/java/org/mozilla/fenix/components/TopSiteStorage.kt | 2 +- app/src/main/java/org/mozilla/fenix/components/UseCases.kt | 2 +- .../fenix/components/toolbar/BrowserToolbarController.kt | 2 +- .../fenix/library/bookmarks/BookmarkFragmentInteractor.kt | 2 +- .../library/history/viewholders/HistoryListItemViewHolder.kt | 2 +- .../java/org/mozilla/fenix/settings/about/AboutFragment.kt | 2 +- .../fenix/share/viewholders/AccountDeviceViewHolder.kt | 2 +- app/src/main/java/org/mozilla/fenix/{lib => utils}/Do.kt | 2 +- .../main/java/org/mozilla/fenix/{test => utils}/OpenClass.kt | 4 +++- 21 files changed, 23 insertions(+), 21 deletions(-) rename app/src/main/java/org/mozilla/fenix/{lib => utils}/Do.kt (93%) rename app/src/main/java/org/mozilla/fenix/{test => utils}/OpenClass.kt (90%) diff --git a/app/build.gradle b/app/build.gradle index 7453610b7..fb28f8d91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -272,7 +272,7 @@ android.applicationVariants.all { variant -> if (hasTest) { apply plugin: 'kotlin-allopen' allOpen { - annotation("org.mozilla.fenix.test.OpenClass") + annotation("org.mozilla.fenix.utils.OpenClass") } } diff --git a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt index a77544f4d..84f7053ea 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt @@ -21,7 +21,7 @@ import org.mozilla.fenix.components.metrics.GleanMetricsService import org.mozilla.fenix.components.metrics.LeanplumMetricsService import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable import org.mozilla.geckoview.BuildConfig.MOZ_APP_BUILDID import org.mozilla.geckoview.BuildConfig.MOZ_APP_VENDOR import org.mozilla.geckoview.BuildConfig.MOZ_APP_VERSION diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt index 9b5c515f2..7a46695ea 100644 --- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt +++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt @@ -35,7 +35,7 @@ import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable import org.mozilla.fenix.utils.RunWhenReadyQueue /** diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt index 17f5db6a0..79855e3b0 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Components.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt @@ -19,7 +19,7 @@ import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.support.migration.state.MigrationStore import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable import org.mozilla.fenix.utils.ClipboardHandler import org.mozilla.fenix.wifi.WifiConnectionMonitor import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 9b1b23037..c5f47b3cb 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -45,7 +45,7 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.settings import org.mozilla.fenix.media.MediaService -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable import java.util.concurrent.TimeUnit /** diff --git a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt index 7f5a44d9f..c42d542f3 100644 --- a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt +++ b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt @@ -21,7 +21,7 @@ import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.R import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable @Mockable class FenixSnackbar private constructor( diff --git a/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt index 774c8b7f3..1f03bb8d4 100644 --- a/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt @@ -13,7 +13,7 @@ import mozilla.components.concept.engine.EngineView import mozilla.components.feature.findinpage.FindInPageFeature import mozilla.components.feature.findinpage.view.FindInPageView import mozilla.components.support.base.feature.LifecycleAwareFeature -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable @Mockable class FindInPageIntegration( diff --git a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt index 2d884bb91..c3c7e363a 100644 --- a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt +++ b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt @@ -20,7 +20,7 @@ import mozilla.components.support.migration.state.MigrationStore import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.customtabs.FennecWebAppIntentProcessor import org.mozilla.fenix.home.intent.FennecBookmarkShortcutsIntentProcessor -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable /** * Component group for miscellaneous components. diff --git a/app/src/main/java/org/mozilla/fenix/components/PermissionStorage.kt b/app/src/main/java/org/mozilla/fenix/components/PermissionStorage.kt index 2ddf271c2..ae1d1ff19 100644 --- a/app/src/main/java/org/mozilla/fenix/components/PermissionStorage.kt +++ b/app/src/main/java/org/mozilla/fenix/components/PermissionStorage.kt @@ -10,7 +10,7 @@ import mozilla.components.feature.sitepermissions.SitePermissions import mozilla.components.feature.sitepermissions.SitePermissions.Status import mozilla.components.feature.sitepermissions.SitePermissionsStorage import org.mozilla.fenix.ext.components -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable @Mockable class PermissionStorage(private val context: Context) { diff --git a/app/src/main/java/org/mozilla/fenix/components/Search.kt b/app/src/main/java/org/mozilla/fenix/components/Search.kt index 9f974bb46..2a06c2bbf 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Search.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Search.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.launch import mozilla.components.browser.search.SearchEngineManager import org.mozilla.fenix.components.searchengine.FenixSearchEngineProvider import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable /** * Component group for all search engine integration related functionality. diff --git a/app/src/main/java/org/mozilla/fenix/components/Services.kt b/app/src/main/java/org/mozilla/fenix/components/Services.kt index 24f1af5c5..075bb2c61 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Services.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Services.kt @@ -21,7 +21,7 @@ import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.settings.SupportUtils -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable /** * Component group which encapsulates foreground-friendly services. diff --git a/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt b/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt index 1fce71efb..e0a6ddce7 100644 --- a/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt +++ b/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt @@ -17,7 +17,7 @@ import mozilla.components.support.base.observer.ObserverRegistry import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable @Mockable class TabCollectionStorage( diff --git a/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt b/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt index 7dfa56a83..f6d5ac3d1 100644 --- a/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt +++ b/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt @@ -17,7 +17,7 @@ import org.mozilla.fenix.R import org.mozilla.fenix.ext.settings import org.mozilla.fenix.settings.SupportUtils import org.mozilla.fenix.settings.advanced.getSelectedLocale -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable @Mockable class TopSiteStorage(private val context: Context) { diff --git a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt index dd64a1a95..5021b256e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt +++ b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt @@ -18,7 +18,7 @@ import mozilla.components.feature.search.SearchUseCases import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.session.SettingsUseCases import mozilla.components.feature.tabs.TabsUseCases -import org.mozilla.fenix.test.Mockable +import org.mozilla.fenix.utils.Mockable /** * Component group for all use cases. Use cases are provided by feature diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt index b9e34cf4d..f372e65fd 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt @@ -40,7 +40,7 @@ import org.mozilla.fenix.ext.getRootView import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.settings import org.mozilla.fenix.home.SharedViewModel -import org.mozilla.fenix.lib.Do +import org.mozilla.fenix.utils.Do import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit /** diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt index 0257b88ba..f6676f23c 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt @@ -9,7 +9,7 @@ import mozilla.components.concept.storage.BookmarkNodeType import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController -import org.mozilla.fenix.lib.Do +import org.mozilla.fenix.utils.Do /** * Interactor for the Bookmarks screen. diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt index e5fce0639..685081167 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt @@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.library_site_item.view.* import org.mozilla.fenix.R import org.mozilla.fenix.ext.hideAndDisable import org.mozilla.fenix.ext.showAndEnable -import org.mozilla.fenix.lib.Do +import org.mozilla.fenix.utils.Do import org.mozilla.fenix.library.SelectionHolder import org.mozilla.fenix.library.history.HistoryFragmentState import org.mozilla.fenix.library.history.HistoryInteractor diff --git a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt index e96d6be35..ddb334abb 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt @@ -22,7 +22,7 @@ import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.lib.Do +import org.mozilla.fenix.utils.Do import org.mozilla.fenix.settings.SupportUtils import org.mozilla.fenix.settings.about.AboutItemType.LICENSING_INFO import org.mozilla.fenix.settings.about.AboutItemType.PRIVACY_NOTICE diff --git a/app/src/main/java/org/mozilla/fenix/share/viewholders/AccountDeviceViewHolder.kt b/app/src/main/java/org/mozilla/fenix/share/viewholders/AccountDeviceViewHolder.kt index 49c3f4dbb..394ae35c9 100644 --- a/app/src/main/java/org/mozilla/fenix/share/viewholders/AccountDeviceViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/share/viewholders/AccountDeviceViewHolder.kt @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.account_share_list_item.view.* import mozilla.components.concept.sync.DeviceType import org.mozilla.fenix.R -import org.mozilla.fenix.lib.Do +import org.mozilla.fenix.utils.Do import org.mozilla.fenix.share.ShareToAccountDevicesInteractor import org.mozilla.fenix.share.listadapters.SyncShareOption diff --git a/app/src/main/java/org/mozilla/fenix/lib/Do.kt b/app/src/main/java/org/mozilla/fenix/utils/Do.kt similarity index 93% rename from app/src/main/java/org/mozilla/fenix/lib/Do.kt rename to app/src/main/java/org/mozilla/fenix/utils/Do.kt index 396ecd236..802c92302 100644 --- a/app/src/main/java/org/mozilla/fenix/lib/Do.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Do.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.lib +package org.mozilla.fenix.utils object Do { diff --git a/app/src/main/java/org/mozilla/fenix/test/OpenClass.kt b/app/src/main/java/org/mozilla/fenix/utils/OpenClass.kt similarity index 90% rename from app/src/main/java/org/mozilla/fenix/test/OpenClass.kt rename to app/src/main/java/org/mozilla/fenix/utils/OpenClass.kt index e9218be7e..bcb6f59c6 100644 --- a/app/src/main/java/org/mozilla/fenix/test/OpenClass.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/OpenClass.kt @@ -2,7 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.test +package org.mozilla.fenix.utils + +// Annotations for testing. /** * Annotate a class with [OpenClass] to open a class for mocking purposes while keeping it final in release builds