You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ra...@apache.org on 2015/06/02 01:06:25 UTC
falcon git commit: FALCON-1243 Feed test update as per new UI changes
contributed by Namit Maheshwari
Repository: falcon
Updated Branches:
refs/heads/master 4e81193f4 -> cc3b343bd
FALCON-1243 Feed test update as per new UI changes contributed by Namit Maheshwari
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/cc3b343b
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/cc3b343b
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/cc3b343b
Branch: refs/heads/master
Commit: cc3b343bdb9c9f9c05c16d2f8c71543ae66bee1c
Parents: 4e81193
Author: Raghav Kumar Gautam <ra...@apache.org>
Authored: Mon Jun 1 16:05:02 2015 -0700
Committer: Raghav Kumar Gautam <ra...@apache.org>
Committed: Mon Jun 1 16:05:02 2015 -0700
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/Entities/FeedMerlin.java | 8 ++++----
.../falcon/regression/searchUI/FeedSetupTest.java | 18 ++++++++++--------
3 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/cc3b343b/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index c581415..ecff1c6 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -87,6 +87,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-1243 Feed test update as per new UI changes (Namit Maheshwari)
+
FALCON-1241 Fix SearchApiTest according to changes in API, tag ClusterSetupTest,
PrismProcessScheduleTest#testScheduleDeletedProcessOnBothColos (Paul Isaychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/cc3b343b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java
index cf25802..787ddc1 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java
@@ -447,16 +447,16 @@ public class FeedMerlin extends Feed {
softAssert.assertEquals(newFeed.getAvailabilityFlag(),
getAvailabilityFlag(),
"Feed Availability Flag is different");
- softAssert.assertEquals(newFeed.getProperties().getProperties().get(5).getName(),
+ softAssert.assertEquals(newFeed.getProperties().getProperties().get(0).getName(),
getProperties().getProperties().get(0).getName(),
"Feed Property1 Name is different");
- softAssert.assertEquals(newFeed.getProperties().getProperties().get(5).getValue(),
+ softAssert.assertEquals(newFeed.getProperties().getProperties().get(0).getValue(),
getProperties().getProperties().get(0).getValue(),
"Feed Property1 Value is different");
- softAssert.assertEquals(newFeed.getProperties().getProperties().get(6).getName(),
+ softAssert.assertEquals(newFeed.getProperties().getProperties().get(1).getName(),
getProperties().getProperties().get(1).getName(),
"Feed Property2 Name is different");
- softAssert.assertEquals(newFeed.getProperties().getProperties().get(6).getValue(),
+ softAssert.assertEquals(newFeed.getProperties().getProperties().get(1).getValue(),
getProperties().getProperties().get(1).getValue(),
"Feed Property2 Value is different");
http://git-wip-us.apache.org/repos/asf/falcon/blob/cc3b343b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/FeedSetupTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/FeedSetupTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/FeedSetupTest.java
index c09cfad..d8aed28 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/FeedSetupTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/FeedSetupTest.java
@@ -556,7 +556,9 @@ public class FeedSetupTest extends BaseUITestClass{
Assert.assertEquals(jobPriorities, dropdownValues, "Job Priority Unit Values Are Not Equal");
dropdownValues = feedWizardPage.getTimeoutUnitValues();
- Assert.assertEquals(timeUnits, dropdownValues, "Timeout Unit Values Are Not Equal");
+ ArrayList<String> timeUnitsWithSelect = new ArrayList<String>(timeUnits);
+ timeUnitsWithSelect.add(0, "-Select timeout-");
+ Assert.assertEquals(timeUnitsWithSelect, dropdownValues, "Timeout Unit Values Are Not Equal");
}
@@ -592,16 +594,16 @@ public class FeedSetupTest extends BaseUITestClass{
FeedMerlin feedFromXML = feedWizardPage.getFeedMerlinFromFeedXml();
// Assert Property values in the XML Preview
- Assert.assertEquals(feedFromXML.getProperties().getProperties().get(5).getName(),
+ Assert.assertEquals(feedFromXML.getProperties().getProperties().get(0).getName(),
feed.getProperties().getProperties().get(0).getName(),
"Unexpected Property1 Name on the XML preview");
- Assert.assertEquals(feedFromXML.getProperties().getProperties().get(5).getValue(),
+ Assert.assertEquals(feedFromXML.getProperties().getProperties().get(0).getValue(),
feed.getProperties().getProperties().get(0).getValue(),
"Unexpected Property1 Value on the XML preview");
- Assert.assertEquals(feedFromXML.getProperties().getProperties().get(6).getName(),
+ Assert.assertEquals(feedFromXML.getProperties().getProperties().get(1).getName(),
feed.getProperties().getProperties().get(1).getName(),
"Unexpected Property2 Name on the XML preview");
- Assert.assertEquals(feedFromXML.getProperties().getProperties().get(6).getValue(),
+ Assert.assertEquals(feedFromXML.getProperties().getProperties().get(1).getValue(),
feed.getProperties().getProperties().get(1).getValue(),
"Unexpected Property2 Value on the XML preview");
@@ -618,14 +620,14 @@ public class FeedSetupTest extends BaseUITestClass{
feedFromXML = feedWizardPage.getFeedMerlinFromFeedXml();
// Assert Property value in the XML Preview
- Assert.assertEquals(feedFromXML.getProperties().getProperties().get(5).getName(),
+ Assert.assertEquals(feedFromXML.getProperties().getProperties().get(0).getName(),
feed.getProperties().getProperties().get(0).getName(),
"Unexpected Property1 Name on the XML preview");
- Assert.assertEquals(feedFromXML.getProperties().getProperties().get(5).getValue(),
+ Assert.assertEquals(feedFromXML.getProperties().getProperties().get(0).getValue(),
feed.getProperties().getProperties().get(0).getValue(),
"Unexpected Property1 Value on the XML preview");
try{
- feedFromXML.getProperties().getProperties().get(6);
+ feedFromXML.getProperties().getProperties().get(1);
Assert.fail("Second Property found in the XML Preview");
} catch (Exception ex){
LOGGER.info("Second Property not found in the XML Preview");