Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318440
Change subject: Hygiene: add TestStr to String helper in ViewTest
......................................................................
Hygiene: add TestStr to String helper in ViewTest
Change-Id: Id55360e1911aa3d6ac412c03726ee9b397193cdf
---
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/test/view/ViewTest.java
3 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/40/318440/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 37836ce..4c03afd 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -152,7 +152,7 @@
subject = new CardHeaderView(ctx())
.setImage(image.id())
.setImageCircleColor(circleColor)
- .setTitle(str(title.id()))
- .setSubtitle(str(subtitle.id()));
+ .setTitle(str(title))
+ .setSubtitle(str(subtitle));
}
}
\ No newline at end of file
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 0bd1b6e..75cc747 100644
---
a/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
+++
b/app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
@@ -90,6 +90,6 @@
subject = new CardLargeHeaderView(ctx())
.setImage(frescoUri(image.id()))
- .setTitle(str(title.id()));
+ .setTitle(str(title));
}
}
\ No newline at end of file
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 45e6240..3373afc 100644
--- a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java
@@ -117,6 +117,10 @@
.build();
}
+ protected String str(@NonNull TestStr str, Object... formatArgs) {
+ return str(str.id(), formatArgs);
+ }
+
protected String str(@StringRes int id, Object... formatArgs) {
return id == 0 ? null : ctx().getString(id, formatArgs);
}
--
To view, visit https://gerrit.wikimedia.org/r/318440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id55360e1911aa3d6ac412c03726ee9b397193cdf
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
