Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319918
Change subject: Hygiene: replace requestFocus idiom with util
......................................................................
Hygiene: replace requestFocus idiom with util
Bug: T148203
Change-Id: I71a6748442ac120eaa1f1f767e3d6f66e88e9303
---
M
app/src/androidTest/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
M
app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
M app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
5 files changed, 15 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/18/319918/1
diff --git
a/app/src/androidTest/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardViewTest.java
b/app/src/androidTest/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardViewTest.java
index de3c6f6..7b78784 100644
---
a/app/src/androidTest/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardViewTest.java
+++
b/app/src/androidTest/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardViewTest.java
@@ -28,7 +28,6 @@
import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
public class BecauseYouReadCardViewTest extends ViewTest {
private static final int TODAY = 0;
@@ -71,11 +70,7 @@
@Theory public void testFocus(@NonNull Theme theme) {
setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, theme,
PrimaryTestStr.SHORT,
SecondaryTestStr.SHORT, TODAY, MAX_SUGGESTIONS);
- runOnMainSync(new Runnable() {
- @Override public void run() {
- subject.requestFocus();
- }
- });
+ requestFocus(subject);
snap(subject);
}
diff --git
a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
index 4c03afd..99b466b 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -27,7 +27,6 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
@SmallTest public class CardHeaderViewTest extends ViewTest {
@ColorRes private static final int BLUE = R.color.foundation_blue;
@@ -57,11 +56,7 @@
@Theory public void testFocus(@NonNull Theme theme) {
setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, theme,
PrimaryTestImg.NONNULL,
PrimaryTestStr.SHORT, SecondaryTestStr.SHORT, BLUE);
- runOnMainSync(new Runnable() {
- @Override public void run() {
- subject.requestFocus();
- }
- });
+ requestFocus(subject);
snap(subject);
}
diff --git
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
index 75cc747..2ea1fb0 100644
---
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
+++
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
@@ -23,7 +23,6 @@
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
@SmallTest public class CardLargeHeaderViewTest extends ViewTest {
private CardLargeHeaderView subject;
@@ -50,11 +49,7 @@
@Theory public void testFocus(@NonNull Theme theme) {
setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, theme,
PrimaryTestImg.NULL,
PrimaryTestStr.SHORT);
- runOnMainSync(new Runnable() {
- @Override public void run() {
- subject.requestFocus();
- }
- });
+ requestFocus(subject);
snap(subject);
}
diff --git
a/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
b/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
index ae20d64..08e9d54 100644
---
a/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
+++
b/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
@@ -23,7 +23,6 @@
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Mockito.mock;
import static org.wikipedia.feed.view.PageTitleListCardItemView.Callback;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
import static org.wikipedia.util.StringUtil.emptyIfNull;
public class PageTitleListCardItemViewTest extends ViewTest {
@@ -51,11 +50,7 @@
@Theory public void testFocus(@NonNull Theme theme) {
setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, theme,
PrimaryTestImg.NONNULL,
PrimaryTestStr.SHORT, SecondaryTestStr.SHORT);
- runOnMainSync(new Runnable() {
- @Override public void run() {
- subject.requestFocus();
- }
- });
+ requestFocus(subject);
snap(subject);
}
diff --git a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
index bfe0b0b..43f3910 100644
--- a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
@@ -10,7 +10,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
-import android.support.test.InstrumentationRegistry;
import android.support.v4.text.TextUtilsCompat;
import android.support.v7.view.ContextThemeWrapper;
import android.view.View;
@@ -31,9 +30,11 @@
import java.util.List;
import java.util.Locale;
+import static android.support.test.InstrumentationRegistry.getTargetContext;
import static butterknife.ButterKnife.findById;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import static org.wikipedia.test.TestUtil.runOnMainSync;
import static org.wikipedia.util.StringUtil.emptyIfNull;
@RunWith(Theories.class) public abstract class ViewTest {
@@ -73,8 +74,7 @@
this.layoutDirection = layoutDirection;
this.fontScale = fontScale;
this.theme = theme;
- ctx = new
ContextThemeWrapper(InstrumentationRegistry.getTargetContext(),
- theme.getResourceId());
+ ctx = new ContextThemeWrapper(getTargetContext(),
theme.getResourceId());
Locale.setDefault(locale);
config();
}
@@ -100,6 +100,14 @@
Screenshot.snap(subject).setName(testName(list)).record();
}
+ protected void requestFocus(@NonNull final View view) {
+ runOnMainSync(new Runnable() {
+ @Override public void run() {
+ view.requestFocus();
+ }
+ });
+ }
+
protected void assertText(@NonNull View subject, @IdRes int id, @NonNull
TestStr text) {
assertText(subject, id, text.id());
}
--
To view, visit https://gerrit.wikimedia.org/r/319918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71a6748442ac120eaa1f1f767e3d6f66e88e9303
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
