[MediaWiki-commits] [Gerrit] Fix PreviewTaskTests - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Fix PreviewTaskTests .. Fix PreviewTaskTests The service's HTML output has changed. Make the test a little less exact and a little less fragile by just checking that the response contains the input. Change-Id: I6bc82f9fdcd7bd2b6362575ae159fe8ef819836c --- M app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java b/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java index 8ae89a2..8032a20 100644 --- a/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java +++ b/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java @@ -12,7 +12,7 @@ import static android.support.test.InstrumentationRegistry.getTargetContext; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; +import static org.hamcrest.Matchers.containsString; @RunWith(AndroidJUnit4.class) public class PreviewTaskTests { @@ -21,10 +21,9 @@ final PageTitle title = new PageTitle(null, "Test_page_for_app_testing/Section1", new Site("test.wikipedia.org")); long randomTime = System.currentTimeMillis(); final String wikiText = "== Section 2 ==\n\nEditing section INSERT RANDOM & HERE test at " + randomTime; -final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n\n\n"; String result = Subject.execute(wikiText, title); -assertThat(result, is(expected)); +assertThat(result, containsString(String.valueOf(randomTime))); } private static class Subject extends EditPreviewTask { -- To view, visit https://gerrit.wikimedia.org/r/266287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6bc82f9fdcd7bd2b6362575ae159fe8ef819836c 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] Fix PreviewTaskTests - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/266287 Change subject: Fix PreviewTaskTests .. Fix PreviewTaskTests The service's HTML output has changed. Make the test a little less exact and a little less fragile by just checking that the response contains the input. Change-Id: I6bc82f9fdcd7bd2b6362575ae159fe8ef819836c --- M app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/87/266287/1 diff --git a/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java b/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java index 8ae89a2..8032a20 100644 --- a/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java +++ b/app/src/androidTest/java/org/wikipedia/test/PreviewTaskTests.java @@ -12,7 +12,7 @@ import static android.support.test.InstrumentationRegistry.getTargetContext; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; +import static org.hamcrest.Matchers.containsString; @RunWith(AndroidJUnit4.class) public class PreviewTaskTests { @@ -21,10 +21,9 @@ final PageTitle title = new PageTitle(null, "Test_page_for_app_testing/Section1", new Site("test.wikipedia.org")); long randomTime = System.currentTimeMillis(); final String wikiText = "== Section 2 ==\n\nEditing section INSERT RANDOM & HERE test at " + randomTime; -final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n\n\n"; String result = Subject.execute(wikiText, title); -assertThat(result, is(expected)); +assertThat(result, containsString(String.valueOf(randomTime))); } private static class Subject extends EditPreviewTask { -- To view, visit https://gerrit.wikimedia.org/r/266287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6bc82f9fdcd7bd2b6362575ae159fe8ef819836c 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
[MediaWiki-commits] [Gerrit] Fix PreviewTaskTests. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Fix PreviewTaskTests. .. Fix PreviewTaskTests. MediaWiki seems to be returning a slightly different edit link anchor now. Change-Id: I3b9e17798b2dd7d531388a411ef2c89307705836 --- M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java index 4699fee..bb6c6c1 100644 --- a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java +++ b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java @@ -22,7 +22,7 @@ final PageTitle title = new PageTitle(null, "Test_page_for_app_testing/Section1", new Site("test.wikipedia.org")); long randomTime = System.currentTimeMillis(); final String wikitext = "== Section 2 ==\n\nEditing section INSERT RANDOM & HERE test at " + randomTime; -final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; +final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; final CountDownLatch completionLatch = new CountDownLatch(1); runTestOnUiThread(new Runnable() { @Override -- To view, visit https://gerrit.wikimedia.org/r/161945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b9e17798b2dd7d531388a411ef2c89307705836 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant Gerrit-Reviewer: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PreviewTaskTests. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/161945 Change subject: Fix PreviewTaskTests. .. Fix PreviewTaskTests. MediaWiki seems to be returning a slightly different edit link anchor now. Change-Id: I3b9e17798b2dd7d531388a411ef2c89307705836 --- M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/45/161945/1 diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java index 4699fee..bb6c6c1 100644 --- a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java +++ b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java @@ -22,7 +22,7 @@ final PageTitle title = new PageTitle(null, "Test_page_for_app_testing/Section1", new Site("test.wikipedia.org")); long randomTime = System.currentTimeMillis(); final String wikitext = "== Section 2 ==\n\nEditing section INSERT RANDOM & HERE test at " + randomTime; -final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; +final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; final CountDownLatch completionLatch = new CountDownLatch(1); runTestOnUiThread(new Runnable() { @Override -- To view, visit https://gerrit.wikimedia.org/r/161945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b9e17798b2dd7d531388a411ef2c89307705836 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PreviewTaskTests - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Fix PreviewTaskTests .. Fix PreviewTaskTests The server response now includes more HTML classes: icon icon-32px icon-edit enabled Change-Id: I5a1cc787309a2bec4fbed663625b745f4ff9c89f --- M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java index ba87a37..27e0782 100644 --- a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java +++ b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java @@ -20,8 +20,7 @@ final PageTitle title = new PageTitle(null, "Test_page_for_app_testing/Section1", new Site("test.wikipedia.org")); long randomTime = System.currentTimeMillis(); final String wikitext = "== Section 2 ==\n\nEditing section INSERT RANDOM & HERE test at " + randomTime; -final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; -final WikipediaApp app = (WikipediaApp)getInstrumentation().getTargetContext().getApplicationContext(); +final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; final CountDownLatch completionLatch = new CountDownLatch(1); runTestOnUiThread(new Runnable() { @Override -- To view, visit https://gerrit.wikimedia.org/r/133642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a1cc787309a2bec4fbed663625b745f4ff9c89f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PreviewTaskTests - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/133642 Change subject: Fix PreviewTaskTests .. Fix PreviewTaskTests The server response now includes more HTML classes: icon icon-32px icon-edit enabled Change-Id: I5a1cc787309a2bec4fbed663625b745f4ff9c89f --- M wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/42/133642/1 diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java index ba87a37..27e0782 100644 --- a/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java +++ b/wikipedia-it/src/main/java/org/wikipedia/test/PreviewTaskTests.java @@ -20,8 +20,7 @@ final PageTitle title = new PageTitle(null, "Test_page_for_app_testing/Section1", new Site("test.wikipedia.org")); long randomTime = System.currentTimeMillis(); final String wikitext = "== Section 2 ==\n\nEditing section INSERT RANDOM & HERE test at " + randomTime; -final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; -final WikipediaApp app = (WikipediaApp)getInstrumentation().getTargetContext().getApplicationContext(); +final String expected = "Section 2Edit\nEditing section INSERT RANDOM & HERE test at " + randomTime + "\n\n\n\n"; final CountDownLatch completionLatch = new CountDownLatch(1); runTestOnUiThread(new Runnable() { @Override -- To view, visit https://gerrit.wikimedia.org/r/133642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a1cc787309a2bec4fbed663625b745f4ff9c89f Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits