[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add DefaultFeedCardViewTest

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

Change subject: Add DefaultFeedCardViewTest
..


Add DefaultFeedCardViewTest

Bug: T144399
Change-Id: I664d051183df7ba7cd8a343c6ca4e50969e28e6b
---
A app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/test/ViewTest.java
M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
3 files changed, 49 insertions(+), 5 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
new file mode 100644
index 000..b2f9d08
--- /dev/null
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
@@ -0,0 +1,44 @@
+package org.wikipedia.feed.view;
+
+import android.content.Context;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.theories.Theory;
+import org.junit.experimental.theories.suppliers.TestedOn;
+import org.wikipedia.feed.model.Card;
+import org.wikipedia.feed.view.FeedAdapter.Callback;
+import org.wikipedia.test.ViewTest;
+import org.wikipedia.theme.Theme;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+import static org.wikipedia.test.ViewTest.LayoutDirection.LOCALE;
+
+public class DefaultFeedCardViewTest extends ViewTest {
+private DefaultFeedCardView subject;
+
+@Before public void setUp() {
+setUp(WIDTH_DP_S, LOCALE, FONT_SCALES[0], Theme.LIGHT);
+subject = new Subject(ctx());
+}
+
+@Test public void testSetGetCard() {
+Card card = mock(Card.class);
+subject.setCard(card);
+assertThat(subject.getCard(), is(card));
+}
+
+@Theory public void testSetGetCallback(@TestedOn(ints = {0, 1}) int 
nonnull) {
+Callback callback = nonnull == 0 ? null : mock(Callback.class);
+subject.setCallback(callback);
+assertThat(subject.getCallback(), is(callback));
+}
+
+private static class Subject extends DefaultFeedCardView {
+Subject(Context context) {
+super(context);
+}
+}
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/wikipedia/test/ViewTest.java 
b/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
index 56afd3eb..4bfe21e 100644
--- a/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
@@ -44,7 +44,7 @@
 protected static final int WIDTH_DP_S = 240;
 protected static final int WIDTH_DP_XS = 120;
 
-protected enum LayoutDirection { LOCALE, RTL }
+public enum LayoutDirection { LOCALE, RTL }
 
 private int widthDp;
 private Locale locale;
diff --git a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java 
b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
index 0e2434b..b81c019 100644
--- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
@@ -19,14 +19,14 @@
 this.card = card;
 }
 
-@Override public void setCallback(@Nullable FeedAdapter.Callback callback) 
{
-this.callback = callback;
-}
-
 @Nullable protected T getCard() {
 return card;
 }
 
+@Override public void setCallback(@Nullable FeedAdapter.Callback callback) 
{
+this.callback = callback;
+}
+
 @Nullable protected FeedAdapter.Callback getCallback() {
 return callback;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/317717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I664d051183df7ba7cd8a343c6ca4e50969e28e6b
Gerrit-PatchSet: 4
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]: Add DefaultFeedCardViewTest

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

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

Change subject: Add DefaultFeedCardViewTest
..

Add DefaultFeedCardViewTest

Bug: T144399
Change-Id: I664d051183df7ba7cd8a343c6ca4e50969e28e6b
---
A app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/test/ViewTest.java
M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
3 files changed, 49 insertions(+), 5 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
new file mode 100644
index 000..b2f9d08
--- /dev/null
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
@@ -0,0 +1,44 @@
+package org.wikipedia.feed.view;
+
+import android.content.Context;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.theories.Theory;
+import org.junit.experimental.theories.suppliers.TestedOn;
+import org.wikipedia.feed.model.Card;
+import org.wikipedia.feed.view.FeedAdapter.Callback;
+import org.wikipedia.test.ViewTest;
+import org.wikipedia.theme.Theme;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+import static org.wikipedia.test.ViewTest.LayoutDirection.LOCALE;
+
+public class DefaultFeedCardViewTest extends ViewTest {
+private DefaultFeedCardView subject;
+
+@Before public void setUp() {
+setUp(WIDTH_DP_S, LOCALE, FONT_SCALES[0], Theme.LIGHT);
+subject = new Subject(ctx());
+}
+
+@Test public void testSetGetCard() {
+Card card = mock(Card.class);
+subject.setCard(card);
+assertThat(subject.getCard(), is(card));
+}
+
+@Theory public void testSetGetCallback(@TestedOn(ints = {0, 1}) int 
nonnull) {
+Callback callback = nonnull == 0 ? null : mock(Callback.class);
+subject.setCallback(callback);
+assertThat(subject.getCallback(), is(callback));
+}
+
+private static class Subject extends DefaultFeedCardView {
+Subject(Context context) {
+super(context);
+}
+}
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/wikipedia/test/ViewTest.java 
b/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
index 56afd3eb..4bfe21e 100644
--- a/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
@@ -44,7 +44,7 @@
 protected static final int WIDTH_DP_S = 240;
 protected static final int WIDTH_DP_XS = 120;
 
-protected enum LayoutDirection { LOCALE, RTL }
+public enum LayoutDirection { LOCALE, RTL }
 
 private int widthDp;
 private Locale locale;
diff --git a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java 
b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
index 0e2434b..b81c019 100644
--- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
@@ -19,14 +19,14 @@
 this.card = card;
 }
 
-@Override public void setCallback(@Nullable FeedAdapter.Callback callback) 
{
-this.callback = callback;
-}
-
 @Nullable protected T getCard() {
 return card;
 }
 
+@Override public void setCallback(@Nullable FeedAdapter.Callback callback) 
{
+this.callback = callback;
+}
+
 @Nullable protected FeedAdapter.Callback getCallback() {
 return callback;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/317717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I664d051183df7ba7cd8a343c6ca4e50969e28e6b
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