You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/07/02 18:14:03 UTC
[1/3] falcon git commit: FALCON-1289 Select instances again after
performing action on entity page. Contributed by Ruslan Ostafiychuk
Repository: falcon
Updated Branches:
refs/heads/master 5422ede87 -> 867a24a6a
FALCON-1289 Select instances again after performing action on entity page. 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/ccbebbac
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/ccbebbac
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/ccbebbac
Branch: refs/heads/master
Commit: ccbebbacd0a0957f942b69798a7f171c46a85f65
Parents: 5422ede
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Thu Jul 2 19:05:58 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Thu Jul 2 19:05:58 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/ui/search/EntityPage.java | 17 ++++----------
.../regression/searchUI/EntityPageTest.java | 24 ++++++++++++--------
3 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/ccbebbac/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 75c6ad0..9149ed4 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-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)
FALCON-1281 Fix InstancePageTest#testInstancePageStatusWaitingRunning (Namit Maheshwari via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/ccbebbac/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 6a71cab..cdd181b 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
@@ -65,9 +65,9 @@ public class EntityPage extends AbstractSearchPage {
*/
public enum InstanceAction {
Log,
- Suspend,
Resume,
Rerun,
+ Suspend,
Kill
}
@@ -400,6 +400,10 @@ public class EntityPage extends AbstractSearchPage {
softAssert.assertAll();
}
}
+ public void performActionOnSelectedInstances(InstanceAction instanceAction) {
+ driver.findElement(By.xpath(String.format("//td/div[%d]", instanceAction.ordinal() + 1))).click();
+ waitForAngularToFinish();
+ }
public InstanceSummary getInstanceSummary() {
return new InstanceSummary(this);
@@ -426,17 +430,6 @@ public class EntityPage extends AbstractSearchPage {
return instanceListBox.findElements(By.xpath(".//tbody/tr"));
}
- public void performActionOnSelectedInstances(InstanceAction instanceAction) {
- final List<WebElement> summaryTableBodyParts = getTableRows();
- final WebElement actionRibbon = summaryTableBodyParts.get(0);
- for (WebElement element : actionRibbon.findElements(By.xpath("./td/div"))) {
- if (InstanceAction.valueOf(element.getText()) == instanceAction) {
- element.click();
- return;
- }
- }
- }
-
/**
* Get instance summary starting for all the pages.
* @return instance summary
http://git-wip-us.apache.org/repos/asf/falcon/blob/ccbebbac/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 48239c2..b09c04f 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
@@ -37,6 +37,7 @@ import org.apache.falcon.regression.core.util.OozieUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.testHelper.BaseUITestClass;
import org.apache.falcon.regression.ui.search.EntityPage;
+import org.apache.falcon.regression.ui.search.EntityPage.InstanceAction;
import org.apache.falcon.regression.ui.search.LoginPage;
import org.apache.falcon.regression.ui.search.SearchPage;
import org.apache.falcon.resource.InstancesResult;
@@ -444,11 +445,10 @@ public class EntityPageTest extends BaseUITestClass {
final EntityPage.InstanceSummary displayedSummary = entityPage.getInstanceSummary();
//suspend instances through ui
- final List<EntityPage.OneInstanceSummary> runningSummary = displayedSummary.getSummary();
- for (EntityPage.OneInstanceSummary oneInstanceSummary : runningSummary) {
+ for (EntityPage.OneInstanceSummary oneInstanceSummary : displayedSummary.getSummary()) {
oneInstanceSummary.clickCheckBox();
}
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Suspend);
+ entityPage.performActionOnSelectedInstances(InstanceAction.Suspend);
final List<EntityPage.OneInstanceSummary> suspendedSummary = displayedSummary.getSummary();
Assert.assertEquals(suspendedSummary.get(0).getStatus(), "SUSPENDED",
"Expecting first instance to be suspended");
@@ -460,7 +460,10 @@ public class EntityPageTest extends BaseUITestClass {
displayedSummary.checkSummary(apiSuspendedSummary.getInstances());
//resume instances through ui
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Resume);
+ for (EntityPage.OneInstanceSummary oneInstanceSummary : suspendedSummary) {
+ oneInstanceSummary.clickCheckBox();
+ }
+ entityPage.performActionOnSelectedInstances(InstanceAction.Resume);
final List<EntityPage.OneInstanceSummary> resumedSummary = displayedSummary.getSummary();
Assert.assertEquals(resumedSummary.get(0).getStatus(), "RUNNING",
"Expecting first instance to be running");
@@ -506,7 +509,7 @@ public class EntityPageTest extends BaseUITestClass {
for (EntityPage.OneInstanceSummary oneInstanceSummary : runningSummary) {
oneInstanceSummary.clickCheckBox();
}
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Kill);
+ entityPage.performActionOnSelectedInstances(InstanceAction.Kill);
final List<EntityPage.OneInstanceSummary> killedSummary = displayedSummary.getSummary();
Assert.assertEquals(killedSummary.get(0).getStatus(), "KILLED",
"Expecting first instance to be killed");
@@ -518,7 +521,10 @@ public class EntityPageTest extends BaseUITestClass {
displayedSummary.checkSummary(apiKilledSummary.getInstances());
//rerun instances through ui
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Rerun);
+ for (EntityPage.OneInstanceSummary oneInstanceSummary : killedSummary) {
+ oneInstanceSummary.clickCheckBox();
+ }
+ entityPage.performActionOnSelectedInstances(InstanceAction.Rerun);
final List<EntityPage.OneInstanceSummary> rerunSummary = displayedSummary.getSummary();
Assert.assertEquals(rerunSummary.get(0).getStatus(), "RUNNING",
"Expecting first instance to be running");
@@ -563,20 +569,20 @@ public class EntityPageTest extends BaseUITestClass {
//kill instances through ui
final List<EntityPage.OneInstanceSummary> runningSummary = displayedSummary.getSummary();
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Log);
+ entityPage.performActionOnSelectedInstances(InstanceAction.Log);
Assert.assertFalse(getDriver().getCurrentUrl().contains("oozie"),
"No instance is selected, so, log button should be disabled. "
+ "Clicking instance log button should not take user to oozie page.");
for (EntityPage.OneInstanceSummary oneInstanceSummary : runningSummary) {
oneInstanceSummary.clickCheckBox();
}
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Log);
+ entityPage.performActionOnSelectedInstances(InstanceAction.Log);
Assert.assertFalse(getDriver().getCurrentUrl().contains("oozie"),
"Two instances are selected, so, log button should be disabled. "
+ "Clicking instance log button should not take user to oozie page.");
runningSummary.get(1).clickCheckBox();
//only first checkbox is ticked
- displayedSummary.performActionOnSelectedInstances(EntityPage.InstanceAction.Log);
+ entityPage.performActionOnSelectedInstances(InstanceAction.Log);
final String nominalTimeOfSelectedInstance = runningSummary.get(0).getNominalTime();
final InstancesResult processInstanceLogs = prism.getProcessHelper()
.getProcessInstanceLogs(process.getName(),
[2/3] falcon git commit: FALCON-1290 Push Enter in start/end filter
on entity page, start instance is included. Contributed by Ruslan Ostafiychuk
Posted by ro...@apache.org.
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 <ro...@apache.org>
Authored: Thu Jul 2 19:09:42 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
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),
[3/3] falcon git commit: FALCON-1300 Use xml instead of properties
for log4j. Contributed by Raghav Kumar Gautam
Posted by ro...@apache.org.
FALCON-1300 Use xml instead of properties for log4j. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/867a24a6
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/867a24a6
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/867a24a6
Branch: refs/heads/master
Commit: 867a24a6a8c69560a69c771678864adfaf8bf399
Parents: 3b4610a
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Thu Jul 2 19:11:56 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Thu Jul 2 19:11:56 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../merlin/src/test/resources/log4j.properties | 22 ------------
.../merlin/src/test/resources/log4j.xml | 36 ++++++++++++++++++++
3 files changed, 38 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/867a24a6/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index e5ffcfb..8c65450 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-1300 Use xml instead of properties for log4j (Raghav Kumar Gautam via Ruslan Ostafiychuk)
+
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)
http://git-wip-us.apache.org/repos/asf/falcon/blob/867a24a6/falcon-regression/merlin/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/log4j.properties b/falcon-regression/merlin/src/test/resources/log4j.properties
deleted file mode 100644
index 6e4eb1b..0000000
--- a/falcon-regression/merlin/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-#root logger
-log4j.rootLogger=INFO, stderr
-
-# configure stderr
-log4j.appender.stderr = org.apache.log4j.ConsoleAppender
-log4j.appender.stderr.Threshold = DEBUG
-log4j.appender.stderr.Target = System.err
-log4j.appender.stderr.layout = org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern = %d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n
http://git-wip-us.apache.org/repos/asf/falcon/blob/867a24a6/falcon-regression/merlin/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/log4j.xml b/falcon-regression/merlin/src/test/resources/log4j.xml
new file mode 100644
index 0000000..e5dd219
--- /dev/null
+++ b/falcon-regression/merlin/src/test/resources/log4j.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+ <appender name="stderr" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.err"/>
+ <param name="Threshold" value="DEBUG"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <priority value="info"/>
+ <appender-ref ref="stderr"/>
+ </root>
+
+</log4j:configuration>
\ No newline at end of file