[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace NullValue with @TestedOnBool

2016-11-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: replace NullValue with @TestedOnBool
..


Hygiene: replace NullValue with @TestedOnBool

Change-Id: I5737dd765f8d0ba3726006f7a26079cef34a0e64
---
M 
app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.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/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
M 
app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
D app/src/androidTest/java/org/wikipedia/test/view/NullValue.java
M app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
8 files changed, 29 insertions(+), 48 deletions(-)

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



diff --git 
a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
 
b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
index d58358d..e6b8fa9 100644
--- 
a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
+++ 
b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
@@ -1,13 +1,10 @@
 package android.support.design.widget;
 
-import android.support.annotation.NonNull;
-
 import org.junit.Before;
 import org.junit.experimental.theories.Theory;
 import org.wikipedia.test.theories.TestedOnBool;
 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;
 
@@ -33,9 +30,9 @@
 assertThat(subject.isPasswordVisible(), is(visible));
 }
 
-@Theory public void testSetOnShowPasswordListener(@NonNull NullValue nul,
+@Theory public void testSetOnShowPasswordListener(@TestedOnBool boolean 
nul,
   @TestedOnBool boolean 
visible) {
-OnShowPasswordClickListener listener = nul.isNull() ? null : 
mock(OnShowPasswordClickListener.class);
+OnShowPasswordClickListener listener = nul ? null : 
mock(OnShowPasswordClickListener.class);
 if (visible) {
 subject.passwordVisibilityToggleRequested();
 }
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 99b466b..60990d4 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -76,16 +76,16 @@
 }
 
 // todo: how can we test popupmenu which requires an activity?
-//@Theory public void testSetCallback(@NonNull NullValue nullCallback,
-//@NonNull NullValue nullCard) {
+//@Theory public void testSetCallback(@TestedOnBool boolean nullCallback,
+//@TestedOnBool boolean nullCard) {
 //setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, 
Theme.LIGHT,
 //PrimaryTestImg.NONNULL, PrimaryTestStr.SHORT, 
SecondaryTestStr.SHORT, BLUE);
 //
-//Card card = nullCard.isNull() ? null : mock(Card.class);
-//if (card  != null) {
+//Card card = nullCard ? null : mock(Card.class);
+//if (card != null) {
 //subject.setCard(card);
 //}
-//Callback callback = nullCallback.isNull() ? null : 
mock(Callback.class);
+//Callback callback = nullCallback ? null : mock(Callback.class);
 //subject.setCallback(callback);
 //clickMenu();
 //if (callback != null) {
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 2ea1fb0..c7173c8 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
@@ -7,9 +7,9 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.R;
+import org.wikipedia.test.theories.TestedOnBool;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
-import org.wikipedia.test.view.NullValue;
 import org.wikipedia.test.view.PrimaryTestImg;
 import org.wikipedia.test.view.PrimaryTestStr;
 import org.wikipedia.test.view.SecondaryTestImg;
@@ -66,11 +66,11 @@
 assertText(subject, R.id.view_card_header_large_title, text);
 }
 
-@Theory public void testOnClickListener(@NonNull NullValue nul) {
+@Theory p

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace NullValue with @TestedOnBool

2016-11-08 Thread Niedzielski (Code Review) 
Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: replace NullValue with @TestedOnBool
..

Hygiene: replace NullValue with @TestedOnBool

Change-Id: I5737dd765f8d0ba3726006f7a26079cef34a0e64
---
M 
app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.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/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
M 
app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
D app/src/androidTest/java/org/wikipedia/test/view/NullValue.java
M app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
8 files changed, 29 insertions(+), 48 deletions(-)


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

diff --git 
a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
 
b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
index d58358d..e6b8fa9 100644
--- 
a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
+++ 
b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java
@@ -1,13 +1,10 @@
 package android.support.design.widget;
 
-import android.support.annotation.NonNull;
-
 import org.junit.Before;
 import org.junit.experimental.theories.Theory;
 import org.wikipedia.test.theories.TestedOnBool;
 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;
 
@@ -33,9 +30,9 @@
 assertThat(subject.isPasswordVisible(), is(visible));
 }
 
-@Theory public void testSetOnShowPasswordListener(@NonNull NullValue nul,
+@Theory public void testSetOnShowPasswordListener(@TestedOnBool boolean 
nul,
   @TestedOnBool boolean 
visible) {
-OnShowPasswordClickListener listener = nul.isNull() ? null : 
mock(OnShowPasswordClickListener.class);
+OnShowPasswordClickListener listener = nul ? null : 
mock(OnShowPasswordClickListener.class);
 if (visible) {
 subject.passwordVisibilityToggleRequested();
 }
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 99b466b..60990d4 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -76,16 +76,16 @@
 }
 
 // todo: how can we test popupmenu which requires an activity?
-//@Theory public void testSetCallback(@NonNull NullValue nullCallback,
-//@NonNull NullValue nullCard) {
+//@Theory public void testSetCallback(@TestedOnBool boolean nullCallback,
+//@TestedOnBool boolean nullCard) {
 //setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, 
Theme.LIGHT,
 //PrimaryTestImg.NONNULL, PrimaryTestStr.SHORT, 
SecondaryTestStr.SHORT, BLUE);
 //
-//Card card = nullCard.isNull() ? null : mock(Card.class);
-//if (card  != null) {
+//Card card = nullCard ? null : mock(Card.class);
+//if (card != null) {
 //subject.setCard(card);
 //}
-//Callback callback = nullCallback.isNull() ? null : 
mock(Callback.class);
+//Callback callback = nullCallback ? null : mock(Callback.class);
 //subject.setCallback(callback);
 //clickMenu();
 //if (callback != null) {
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 2ea1fb0..c7173c8 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
@@ -7,9 +7,9 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.experimental.theories.suppliers.TestedOn;
 import org.wikipedia.R;
+import org.wikipedia.test.theories.TestedOnBool;
 import org.wikipedia.test.view.FontScale;
 import org.wikipedia.test.view.LayoutDirection;
-import org.wikipedia.test.view.NullValue;
 import org.wikipedia.test.view.PrimaryTestImg;
 import org.wikipedia.test.view.PrimaryTestStr;
 import org.wikipedia.test.view.SecondaryTestImg;
@@ -66,11 +66,11 @@
 assertText(subject, R.id.view_card_header_large_title, text);
 }
 
-@Theory public void testOnC