FALCON-1290 Push Enter in start/end filter on entity page, start instance is included. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/3b4610a3 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3b4610a3 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3b4610a3 Branch: refs/heads/master Commit: 3b4610a3f79da886157171ce0288c4ce7dc8d556 Parents: ccbebba Author: Ruslan Ostafiychuk <[email protected]> Authored: Thu Jul 2 19:09:42 2015 +0300 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Thu Jul 2 19:09:42 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../java/org/apache/falcon/regression/ui/search/EntityPage.java | 3 +++ .../org/apache/falcon/regression/searchUI/EntityPageTest.java | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/3b4610a3/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 9149ed4..e5ffcfb 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -355,6 +355,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1290 Push Enter in start/end filter on entity page, start instance is included (Ruslan Ostafiychuk) + FALCON-1289 Select instances again after performing action on entity page (Ruslan Ostafiychuk) FALCON-1292 Avoid usage of hard coded feed names in Bundle class (Paul Isaychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/3b4610a3/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java index cdd181b..f7499b7 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java @@ -34,6 +34,7 @@ import org.apache.falcon.regression.core.util.UIAssert; import org.apache.falcon.resource.InstancesResult; import org.apache.log4j.Logger; import org.openqa.selenium.By; +import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @@ -494,12 +495,14 @@ public class EntityPage extends AbstractSearchPage { final WebElement startTimeButton = getSummaryStartedButton(); startTimeButton.clear(); sendKeysSlowly(startTimeButton, timeStr); + startTimeButton.sendKeys(Keys.ENTER); } public void setInstanceSummaryEndTime(String timeStr) { final WebElement endTimeButton = getSummaryEndedButton(); endTimeButton.clear(); sendKeysSlowly(endTimeButton, timeStr); + endTimeButton.sendKeys(Keys.ENTER); } public void selectInstanceSummaryStatus(String labelText) { http://git-wip-us.apache.org/repos/asf/falcon/blob/3b4610a3/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntityPageTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntityPageTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntityPageTest.java index b09c04f..4c1e379 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntityPageTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntityPageTest.java @@ -323,12 +323,12 @@ public class EntityPageTest extends BaseUITestClass { process.getName(), "start=" + startTime, null); displayedSummary.check(); displayedSummary.checkSummary(apiSummary.getInstances()); - displayedSummary.setInstanceSummaryStartTime("01022010" + "0100"); + displayedSummary.setInstanceSummaryStartTime("01022010" + "0101"); final List<EntityPage.OneInstanceSummary> newSummary = entityPage.getInstanceSummary().getSummary(); Assert.assertNull(EntityPage.InstanceSummary.getOneSummary(newSummary, startTime), "Not expecting first instance to be displayed"); - displayedSummary.setInstanceSummaryStartTime("01022010" + "0105"); + displayedSummary.setInstanceSummaryStartTime("01022010" + "0106"); final List<EntityPage.OneInstanceSummary> newSummary2 = entityPage.getInstanceSummary().getSummary(); Assert.assertNull(EntityPage.InstanceSummary.getOneSummary(newSummary2, startTime),
