[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace Visibility with @TestedOnBool
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: replace Visibility with @TestedOnBool .. Hygiene: replace Visibility with @TestedOnBool Change-Id: I7ea8b1291b134990f0879351a22523da2a90717f --- M app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java D app/src/androidTest/java/org/wikipedia/test/view/Visibility.java 2 files changed, 7 insertions(+), 19 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 a99218b..d58358d 100644 --- a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java +++ b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java @@ -3,13 +3,12 @@ import android.support.annotation.NonNull; import org.junit.Before; -import org.junit.experimental.theories.DataPoints; 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.test.view.Visibility; import org.wikipedia.theme.Theme; import static android.support.design.widget.PasswordTextInput.OnShowPasswordClickListener; @@ -22,30 +21,28 @@ public class PasswordTextInputTest extends ViewTest { private PasswordTextInput subject; -@DataPoints public static final Visibility[] VISIBILITIES = Visibility.values(); - @Before public void setUp() { setUp(WIDTH_DP_S, LayoutDirection.LOCALE, FontScale.DEFAULT, Theme.LIGHT); subject = new PasswordTextInput(ctx()); } -@Theory public void testIsPasswordVisible(@NonNull Visibility visibility) { -if (visibility.visible()) { +@Theory public void testIsPasswordVisible(@TestedOnBool boolean visible) { +if (visible) { subject.passwordVisibilityToggleRequested(); } -assertThat(subject.isPasswordVisible(), is(visibility.visible())); +assertThat(subject.isPasswordVisible(), is(visible)); } @Theory public void testSetOnShowPasswordListener(@NonNull NullValue nul, - @NonNull Visibility visibility) { + @TestedOnBool boolean visible) { OnShowPasswordClickListener listener = nul.isNull() ? null : mock(OnShowPasswordClickListener.class); -if (visibility.visible()) { +if (visible) { subject.passwordVisibilityToggleRequested(); } subject.setOnShowPasswordListener(listener); subject.passwordVisibilityToggleRequested(); if (listener != null) { -verify(listener).onShowPasswordClick(eq(!visibility.visible())); +verify(listener).onShowPasswordClick(eq(!visible)); } } } \ No newline at end of file diff --git a/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java b/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java deleted file mode 100644 index 69f0eef..000 --- a/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.wikipedia.test.view; - -public enum Visibility { -HIDDEN, VISIBLE; - -public boolean visible() { -return this == VISIBLE; -} -} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/320444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ea8b1291b134990f0879351a22523da2a90717f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski Gerrit-Reviewer: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Mholloway Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace Visibility with @TestedOnBool
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/320444 Change subject: Hygiene: replace Visibility with @TestedOnBool .. Hygiene: replace Visibility with @TestedOnBool Change-Id: I7ea8b1291b134990f0879351a22523da2a90717f --- M app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java D app/src/androidTest/java/org/wikipedia/test/view/Visibility.java 2 files changed, 7 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/44/320444/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 a99218b..d58358d 100644 --- a/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java +++ b/app/src/androidTest/java/android/support/design/widget/PasswordTextInputTest.java @@ -3,13 +3,12 @@ import android.support.annotation.NonNull; import org.junit.Before; -import org.junit.experimental.theories.DataPoints; 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.test.view.Visibility; import org.wikipedia.theme.Theme; import static android.support.design.widget.PasswordTextInput.OnShowPasswordClickListener; @@ -22,30 +21,28 @@ public class PasswordTextInputTest extends ViewTest { private PasswordTextInput subject; -@DataPoints public static final Visibility[] VISIBILITIES = Visibility.values(); - @Before public void setUp() { setUp(WIDTH_DP_S, LayoutDirection.LOCALE, FontScale.DEFAULT, Theme.LIGHT); subject = new PasswordTextInput(ctx()); } -@Theory public void testIsPasswordVisible(@NonNull Visibility visibility) { -if (visibility.visible()) { +@Theory public void testIsPasswordVisible(@TestedOnBool boolean visible) { +if (visible) { subject.passwordVisibilityToggleRequested(); } -assertThat(subject.isPasswordVisible(), is(visibility.visible())); +assertThat(subject.isPasswordVisible(), is(visible)); } @Theory public void testSetOnShowPasswordListener(@NonNull NullValue nul, - @NonNull Visibility visibility) { + @TestedOnBool boolean visible) { OnShowPasswordClickListener listener = nul.isNull() ? null : mock(OnShowPasswordClickListener.class); -if (visibility.visible()) { +if (visible) { subject.passwordVisibilityToggleRequested(); } subject.setOnShowPasswordListener(listener); subject.passwordVisibilityToggleRequested(); if (listener != null) { -verify(listener).onShowPasswordClick(eq(!visibility.visible())); +verify(listener).onShowPasswordClick(eq(!visible)); } } } \ No newline at end of file diff --git a/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java b/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java deleted file mode 100644 index 69f0eef..000 --- a/app/src/androidTest/java/org/wikipedia/test/view/Visibility.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.wikipedia.test.view; - -public enum Visibility { -HIDDEN, VISIBLE; - -public boolean visible() { -return this == VISIBLE; -} -} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/320444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ea8b1291b134990f0879351a22523da2a90717f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits