diff --git a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java index 410c1b3705f8..5533af12c428 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java @@ -38,7 +38,7 @@ *

* wordpress://jetpack-connection?reason={error} *

- * Redirects users to the stats activity if the jetpack connection was succesful + * Redirects users to the stats activity if the jetpack connection was successful */ public class JetpackConnectionResultActivity extends BaseAppCompatActivity { private static final String ALREADY_CONNECTED = "already-connected"; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java index 4274c65f98dc..02c6aa885b11 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java @@ -164,7 +164,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { private void removeSightAndSounds() { // on API26 we removed the Sight & Sounds category altogether, as it can always be - // overriden by the user in the Device settings, and the settings here + // overridden by the user in the Device settings, and the settings here // wouldn't either reflect nor have any effect anyway. PreferenceScreen preferenceScreen = (PreferenceScreen) findPreference(getActivity().getString(R.string.wp_pref_notifications_root)); diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt index 53bcf36944f3..745f2a51d76a 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt @@ -218,7 +218,7 @@ class PagesViewModel private var _site: SiteModel? = null val site: SiteModel - get() = checkNotNull(_site) { "Trying to access unitialized site" } + get() = checkNotNull(_site) { "Trying to access uninitialized site" } private var _arePageActionsEnabled = true val arePageActionsEnabled: Boolean diff --git a/WordPress/src/test/java/org/wordpress/android/resolver/ResolverUtilityTest.kt b/WordPress/src/test/java/org/wordpress/android/resolver/ResolverUtilityTest.kt index 3f0b9977ae72..375ce5269445 100644 --- a/WordPress/src/test/java/org/wordpress/android/resolver/ResolverUtilityTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/resolver/ResolverUtilityTest.kt @@ -33,7 +33,7 @@ class ResolverUtilityTest : BaseUnitTest() { } @Test - fun `Transaction is completed succesfully when no errors`() { + fun `Transaction is completed successfully when no errors`() { resolverUtility.copySitesWithIndexes(sites = listOf(SiteModel(), SiteModel())) verify(sqliteDatabase, times(1)).beginTransaction() verify(sqliteDatabase, times(1)).setTransactionSuccessful() diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt index e930a94829fc..7d187c428814 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt @@ -88,7 +88,7 @@ class DeepLinkUriUtilsTest { } @Test - fun `returns null when site doesnt exist`() { + fun `returns null when site doesn't exist`() { whenever(siteStore.getSitesByNameOrUrlMatching(host)).thenReturn(listOf()) val hostToSite = deepLinkUriUtils.hostToSite(host) diff --git a/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt index 0d8e8518e662..fc3450a3d262 100644 --- a/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt @@ -49,7 +49,7 @@ class SiteUtilsTest { } @Test - fun `checkMinimalJetpackVersion doesnt fail when Jetpack version is false`() { + fun `checkMinimalJetpackVersion doesn't fail when Jetpack version is false`() { val site = SiteModel() site.jetpackVersion = "false" diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java index e61e9e8ec9d4..657b6b5b1e04 100644 --- a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java +++ b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java @@ -788,7 +788,7 @@ private void setEditorProgressBarVisibility(boolean shown) { } public void resetUploadingMediaToFailed(Set failedMediaIds) { - // get all media failed for this post, and represent it on tje UI + // get all media failed for this post, and represent it on the UI if (failedMediaIds != null && !failedMediaIds.isEmpty()) { for (Integer mediaId : failedMediaIds) { // and keep track of failed ids around diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt index 27b4066965a4..78a981329a81 100644 --- a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt +++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt @@ -597,7 +597,7 @@ class SiteRestClientTest { } @Test - fun `given not authenticated, when all domains are requested, then retun auth required error`() = test { + fun `given not authenticated, when all domains are requested, then return auth required error`() = test { val tokenErrorMessage = "An active access token must be used to query information about the current user." val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED, tokenErrorMessage)) initAllDomainsResponse(error = error) diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt index b88352aec680..6b3039ec485f 100644 --- a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt +++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt @@ -131,7 +131,7 @@ class ReferrersStoreTest { } @Test - fun `report referrer as spam doesnt mark spam when cache fails`() = test { + fun `report referrer as spam doesn't mark spam when cache fails`() = test { val date = Date() val restResponse = ReportReferrerAsSpamPayload(ReportReferrerAsSpamResponse(true)) whenever(restClient.reportReferrerAsSpam(site, domain)).thenReturn(restResponse) diff --git a/libs/mocks/README.md b/libs/mocks/README.md index da7aa705e55f..4ab5cf7fc2de 100644 --- a/libs/mocks/README.md +++ b/libs/mocks/README.md @@ -8,7 +8,7 @@ The JSON files used by WireMock to handle requests and are located in `src/main/ you're first going to want to set up [Charles Proxy](https://www.charlesproxy.com/) (or similar) to work with your Android emulator. If you've never done this I found [this article](https://medium.com/@daptronic/the-android-emulator-and-charles-proxy-a-love-story-595c23484e02) to be a -good place to start. Once you've done that you'll want to walk through the specfic flow you're testing and store the JSON contents +good place to start. Once you've done that you'll want to walk through the specific flow you're testing and store the JSON contents of the necessary responses in the `jsonBody` field of the `response` field in the mock file. Here's an example of what this might look like,