[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: update ViewTest packaging

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: update ViewTest packaging
..


Hygiene: update ViewTest packaging

Move ViewTest into org.wikipedia.test.view. This wasn't done in the
previous commit to minimize deltas.

Change-Id: I4f3603d5048555e17686b4cc2aef4e5b7068aa6b
---
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/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
M app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
R app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
6 files changed, 15 insertions(+), 25 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



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 4bcda7f..37836ce 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -11,7 +11,6 @@
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.R;
 import org.wikipedia.feed.model.Card;
-import org.wikipedia.test.ViewTest;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
 import org.wikipedia.test.view.PrimaryTestImg;
@@ -20,6 +19,7 @@
 import org.wikipedia.test.view.SecondaryTestStr;
 import org.wikipedia.test.view.TestImg;
 import org.wikipedia.test.view.TestStr;
+import org.wikipedia.test.view.ViewTest;
 import org.wikipedia.theme.Theme;
 
 import static butterknife.ButterKnife.findById;
@@ -34,10 +34,8 @@
 private CardHeaderView subject;
 
 @Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) 
int widthDp,
-  @NonNull FontScale fontScale,
-  @NonNull PrimaryTestImg image,
-  @NonNull PrimaryTestStr title,
-  @NonNull SecondaryTestStr subtitle) {
+  @NonNull FontScale fontScale, @NonNull 
PrimaryTestImg image,
+  @NonNull PrimaryTestStr title, @NonNull 
SecondaryTestStr subtitle) {
 setUp(widthDp, LayoutDirection.LOCALE, fontScale, Theme.LIGHT, image, 
title, subtitle,
 BLUE);
 snap(subject, image + "_image", title + "_title", subtitle + 
"_subtitle");
@@ -137,13 +135,13 @@
 assertText(subject, R.id.view_card_header_subtitle, text);
 }
 
-private void clickMenu() {
-runOnMainSync(new Runnable() {
-@Override public void run() {
-subject.onMenuClick(findById(subject, 
R.id.view_list_card_header_menu));
-}
-});
-}
+//private void clickMenu() {
+//runOnMainSync(new Runnable() {
+//@Override public void run() {
+//subject.onMenuClick(findById(subject, 
R.id.view_list_card_header_menu));
+//}
+//});
+//}
 
 @SuppressWarnings("checkstyle:parameternumber")
 private void setUp(int widthDp, @NonNull LayoutDirection layoutDirection,
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 5ca2ac7..0bd1b6e 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
@@ -7,7 +7,6 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.R;
-import org.wikipedia.test.ViewTest;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
 import org.wikipedia.test.view.NullValue;
@@ -16,6 +15,7 @@
 import org.wikipedia.test.view.SecondaryTestImg;
 import org.wikipedia.test.view.TestImg;
 import org.wikipedia.test.view.TestStr;
+import org.wikipedia.test.view.ViewTest;
 import org.wikipedia.theme.Theme;
 
 import static android.view.View.OnClickListener;
diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
index fea6449..f9c9bea 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
@@ -8,10 +8,10 @@
 import org.junit.experimental.theories.Theory;
 import org.wikipedia.feed.model.Card;
 import org.wikipedia.feed.view.FeedAdapter.Callback;
-import org.wikipedia.test.ViewTest;
 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: update ViewTest packaging

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/318233

Change subject: Hygiene: update ViewTest packaging
..

Hygiene: update ViewTest packaging

Move ViewTest into org.wikipedia.test.view. This wasn't done in the
previous commit to minimize deltas.

Change-Id: I4f3603d5048555e17686b4cc2aef4e5b7068aa6b
---
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/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
M app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
R app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
6 files changed, 6 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/33/318233/1

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 4bcda7f..6662ca8 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -11,7 +11,6 @@
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.R;
 import org.wikipedia.feed.model.Card;
-import org.wikipedia.test.ViewTest;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
 import org.wikipedia.test.view.PrimaryTestImg;
@@ -20,6 +19,7 @@
 import org.wikipedia.test.view.SecondaryTestStr;
 import org.wikipedia.test.view.TestImg;
 import org.wikipedia.test.view.TestStr;
+import org.wikipedia.test.view.ViewTest;
 import org.wikipedia.theme.Theme;
 
 import static butterknife.ButterKnife.findById;
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 5ca2ac7..0bd1b6e 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
@@ -7,7 +7,6 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.R;
-import org.wikipedia.test.ViewTest;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
 import org.wikipedia.test.view.NullValue;
@@ -16,6 +15,7 @@
 import org.wikipedia.test.view.SecondaryTestImg;
 import org.wikipedia.test.view.TestImg;
 import org.wikipedia.test.view.TestStr;
+import org.wikipedia.test.view.ViewTest;
 import org.wikipedia.theme.Theme;
 
 import static android.view.View.OnClickListener;
diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
index fea6449..f9c9bea 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
@@ -8,10 +8,10 @@
 import org.junit.experimental.theories.Theory;
 import org.wikipedia.feed.model.Card;
 import org.wikipedia.feed.view.FeedAdapter.Callback;
-import org.wikipedia.test.ViewTest;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
 import org.wikipedia.test.view.NullValue;
+import org.wikipedia.test.view.ViewTest;
 import org.wikipedia.theme.Theme;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
index 4447e97..005cb9c 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
@@ -11,10 +11,10 @@
 import org.junit.Test;
 import org.junit.experimental.theories.Theory;
 import org.wikipedia.feed.model.Card;
-import org.wikipedia.test.ViewTest;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
 import org.wikipedia.test.view.NullValue;
+import org.wikipedia.test.view.ViewTest;
 import org.wikipedia.theme.Theme;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java 
b/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
index f3a287a..2f676ca 100644
--- a/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
@@ -6,9 +6,9 @@
 import org.junit.Test;
 import org.junit.experimental.theories.Theory;
 import