Issue #2338 - post: Fix android lint errors that don't change app beh…

…avior.
mozilla-mobile · May 30, 2019 · 936da59 · 936da59
1 parent fc3e0c5
commit 936da59
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/tv/firefox/ui/ClearDataTest.kt b/app/src/androidTest/java/org/mozilla/tv/firefox/ui/ClearDataTest.kt
@@ -23,12 +23,13 @@ class ClearDataTest {
 
     /* ktlint-disable no-blank-line-before-rbrace */ // This imposes unreadable grouping.
     @Test
-    @Ignore
-    // This test asserts that back/forward behavior works as intended after clearing data. For whatever reason, after
-    // clearing data our SessionLoadedIdlingResource never allows testing to proceed, causing the test to timeout. After
-    // investigation, it seems that SystemEngineSession#onPageFinished is never called after clearing data. It is
-    // unknown at this time why
-    // See #1360
+    @Ignore("""
+        This test asserts that back/forward behavior works as intended after clearing data. For whatever reason, after
+        clearing data our SessionLoadedIdlingResource never allows testing to proceed, causing the test to timeout. After
+        investigation, it seems that SystemEngineSession#onPageFinished is never called after clearing data. It is
+        unknown at this time why
+        See #1360
+    """)
     fun WHEN_data_is_cleared_THEN_back_and_forward_should_be_unavailable() {
         val endpoints = MockWebServerHelper
                 .initMockWebServerAndReturnEndpoints("This is Mozilla", "This is Google", "This is YouTube")

diff --git a/app/src/androidTest/java/org/mozilla/tv/firefox/ui/PinnedTileTests.kt b/app/src/androidTest/java/org/mozilla/tv/firefox/ui/PinnedTileTests.kt
@@ -19,9 +19,7 @@ class PinnedTileTests {
 
     /* ktlint-disable no-blank-line-before-rbrace */ // This imposes unreadable grouping.
     @Test
-    @Ignore
-    // This has an off-by-one tile, and also the new tile can't be off the screen. Ignoring so we can
-    // get this into CI.
+    @Ignore("This has an off-by-one tile, and also the new tile can't be off the screen. Ignoring so we can get this into CI")
     fun pinnedTileTests() {
         val endpoint = MockWebServerHelper
             .initMockWebServerAndReturnEndpoints("This is an example").first()

diff --git a/app/src/androidTest/java/org/mozilla/tv/firefox/ui/screenshots/PocketOnboardTest.java b/app/src/androidTest/java/org/mozilla/tv/firefox/ui/screenshots/PocketOnboardTest.java
@@ -33,8 +33,7 @@
 import static org.mozilla.tv.firefox.onboarding.OnboardingActivity.ONBOARD_SHOWN_PREF;
 import static org.mozilla.tv.firefox.pocket.PocketOnboardingActivity.POCKET_ONBOARDING_SHOWN_PREF;
 
-// Since pocket is currently EN-US only, this should be ignored
-@Ignore
+@Ignore("Since Pocket is currently en-US only, this should be ignored")
 public class PocketOnboardTest extends ScreenshotTest {
 
     private Intent intent;

diff --git a/app/src/main/res/drawable/nav_urlbar_background.xml b/app/src/main/res/drawable/nav_urlbar_background.xml
@@ -6,7 +6,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true">
         <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:shape="rectangle">
             <corners android:radius="@dimen/urlbar_corner_radius"/>
             <solid android:color="@color/photonGrey80" />
@@ -16,12 +15,11 @@
     </item>
     <item>
         <shape
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:shape="rectangle">
             <corners android:radius="@dimen/urlbar_corner_radius"/>
             <solid android:color="@color/photonGrey80" />
             <stroke android:color="@color/urlbar_border_default"
                 android:width="0.5dp" />
         </shape>
     </item>
-</selector>
+</selector>
diff --git a/app/src/test/java/org/mozilla/tv/firefox/ext/StringKtTest.kt b/app/src/test/java/org/mozilla/tv/firefox/ext/StringKtTest.kt
@@ -90,7 +90,7 @@ class StringKtTest {
         }
     }
 
-    @Ignore // this fails. We should fix it by moving to the Uri class.
+    @Ignore("this fails. We should fix it by moving to the Uri class.")
     @Test
     fun `WHEN non youtube TV uris containing youtube tv uri str are entered THEN it is not a youtube TV uri`() {
         arrayOf(