Skip to content
This repository was archived by the owner on Apr 17, 2021. It is now read-only.

Commit 936da59

Browse files
committed
Issue #2338 - post: Fix android lint errors that don't change app behavior.
1 parent fc3e0c5 commit 936da59

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

app/src/androidTest/java/org/mozilla/tv/firefox/ui/ClearDataTest.kt

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ class ClearDataTest {
2323

2424
/* ktlint-disable no-blank-line-before-rbrace */ // This imposes unreadable grouping.
2525
@Test
26-
@Ignore
27-
// This test asserts that back/forward behavior works as intended after clearing data. For whatever reason, after
28-
// clearing data our SessionLoadedIdlingResource never allows testing to proceed, causing the test to timeout. After
29-
// investigation, it seems that SystemEngineSession#onPageFinished is never called after clearing data. It is
30-
// unknown at this time why
31-
// See #1360
26+
@Ignore("""
27+
This test asserts that back/forward behavior works as intended after clearing data. For whatever reason, after
28+
clearing data our SessionLoadedIdlingResource never allows testing to proceed, causing the test to timeout. After
29+
investigation, it seems that SystemEngineSession#onPageFinished is never called after clearing data. It is
30+
unknown at this time why
31+
See #1360
32+
""")
3233
fun WHEN_data_is_cleared_THEN_back_and_forward_should_be_unavailable() {
3334
val endpoints = MockWebServerHelper
3435
.initMockWebServerAndReturnEndpoints("This is Mozilla", "This is Google", "This is YouTube")

app/src/androidTest/java/org/mozilla/tv/firefox/ui/PinnedTileTests.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ class PinnedTileTests {
1919

2020
/* ktlint-disable no-blank-line-before-rbrace */ // This imposes unreadable grouping.
2121
@Test
22-
@Ignore
23-
// This has an off-by-one tile, and also the new tile can't be off the screen. Ignoring so we can
24-
// get this into CI.
22+
@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")
2523
fun pinnedTileTests() {
2624
val endpoint = MockWebServerHelper
2725
.initMockWebServerAndReturnEndpoints("This is an example").first()

app/src/androidTest/java/org/mozilla/tv/firefox/ui/screenshots/PocketOnboardTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
import static org.mozilla.tv.firefox.onboarding.OnboardingActivity.ONBOARD_SHOWN_PREF;
3434
import static org.mozilla.tv.firefox.pocket.PocketOnboardingActivity.POCKET_ONBOARDING_SHOWN_PREF;
3535

36-
// Since pocket is currently EN-US only, this should be ignored
37-
@Ignore
36+
@Ignore("Since Pocket is currently en-US only, this should be ignored")
3837
public class PocketOnboardTest extends ScreenshotTest {
3938

4039
private Intent intent;

app/src/main/res/drawable/nav_urlbar_background.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<selector xmlns:android="http://schemas.android.com/apk/res/android">
77
<item android:state_focused="true">
88
<shape
9-
xmlns:android="http://schemas.android.com/apk/res/android"
109
android:shape="rectangle">
1110
<corners android:radius="@dimen/urlbar_corner_radius"/>
1211
<solid android:color="@color/photonGrey80" />
@@ -16,12 +15,11 @@
1615
</item>
1716
<item>
1817
<shape
19-
xmlns:android="http://schemas.android.com/apk/res/android"
2018
android:shape="rectangle">
2119
<corners android:radius="@dimen/urlbar_corner_radius"/>
2220
<solid android:color="@color/photonGrey80" />
2321
<stroke android:color="@color/urlbar_border_default"
2422
android:width="0.5dp" />
2523
</shape>
2624
</item>
27-
</selector>
25+
</selector>

app/src/test/java/org/mozilla/tv/firefox/ext/StringKtTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class StringKtTest {
9090
}
9191
}
9292

93-
@Ignore // this fails. We should fix it by moving to the Uri class.
93+
@Ignore("this fails. We should fix it by moving to the Uri class.")
9494
@Test
9595
fun `WHEN non youtube TV uris containing youtube tv uri str are entered THEN it is not a youtube TV uri`() {
9696
arrayOf(

0 commit comments

Comments
 (0)