Repository: falcon Updated Branches: refs/heads/master 987364849 -> e422fceb8
FALCON-1007 Improve test output and variable names. Contributed by Paul Isaychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/e422fceb Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/e422fceb Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/e422fceb Branch: refs/heads/master Commit: e422fceb8215fb7e0552bf5cbcea62542abab1a3 Parents: 9873648 Author: Ruslan Ostafiychuk <[email protected]> Authored: Wed Feb 4 17:43:42 2015 +0200 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Wed Feb 4 17:43:42 2015 +0200 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 1 + .../regression/lineage/EntitySummaryTest.java | 43 ++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/e422fceb/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index b79ee14..687793e 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -39,6 +39,7 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-1007 Improve test output and variable names (Paul Isaychuk via Ruslan Ostafiychuk) FALCON-1009 InstanceUtil cleanup (Raghav Kumar Gautam) http://git-wip-us.apache.org/repos/asf/falcon/blob/e422fceb/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java index 591810d..58ef941 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java @@ -255,11 +255,10 @@ public class EntitySummaryTest extends BaseTestClass { LOGGER.info("Working with " + entityType + " : " + entityName); //get recent instances info by -getStatus API r = helper.getProcessInstanceStatus(entityName, null); - InstancesResult.Instance[] instancesR = r.getInstances(); - LOGGER.info("Instances from InstancesResult: " + Arrays.toString(instancesR)); + InstancesResult.Instance[] instancesFromStatus = r.getInstances(); + LOGGER.info("Instances from -getStatus API: " + Arrays.toString(instancesFromStatus)); //get recent instances info by -summary API - EntitySummaryResult.EntitySummary[] summaries = - helper.getEntitySummary(clusterName, null) + EntitySummaryResult.EntitySummary[] summaries = helper.getEntitySummary(clusterName, null) .getEntitySummaryResult().getEntitySummaries(); EntitySummaryResult.EntitySummary summaryItem = null; //get instances for specific process @@ -270,13 +269,15 @@ public class EntitySummaryTest extends BaseTestClass { } } Assert.assertNotNull(summaryItem, "Appropriate summary not found for : " + entityName); - EntitySummaryResult.Instance[] instancesS = summaryItem.getInstances(); - LOGGER.info("Instances from SummaryResult: " + Arrays.toString(instancesS)); - softAssert.assertEquals(instancesS.length, 7, "7 instances should be present in " + EntitySummaryResult.Instance[] instancesFromSummary = summaryItem.getInstances(); + LOGGER.info("Instances from SummaryResult: " + Arrays.toString(instancesFromSummary)); + softAssert.assertEquals(instancesFromSummary.length, 7, "7 instances should be present in " + "summary."); - for (EntitySummaryResult.Instance instance : instancesS) { - softAssert.assertTrue(containsInstances(instancesR, instance), "Instance " - + instance.toString() + " is absent in list : " + Arrays.toString(instancesR)); + for (EntitySummaryResult.Instance instanceFromSummary : instancesFromSummary) { + softAssert.assertTrue(containsSummaryInstance(instancesFromStatus, instanceFromSummary), + String.format("Instance {%s;%s;%s} is absent in list (or differs by its properties)\n%s", + instanceFromSummary.getInstance(), instanceFromSummary.getStatus(), + instanceFromSummary.getCluster(), Arrays.toString(instancesFromStatus))); } } } @@ -285,15 +286,25 @@ public class EntitySummaryTest extends BaseTestClass { * Checks if array of instances of InstancesResult contains particular instance * from SummaryResult by common properties. */ - private boolean containsInstances(InstancesResult.Instance[] instancesR, - EntitySummaryResult.Instance instanceS) { - for (InstancesResult.Instance instanceR : instancesR) { - if (instanceR.getInstance().equals(instanceS.getInstance()) - && instanceR.getStatus().toString().equals(instanceS.getStatus().toString()) - && instanceR.getCluster().equals(instanceS.getCluster())) { + private boolean containsSummaryInstance(InstancesResult.Instance[] instancesFromStatus, + EntitySummaryResult.Instance instanceFromSummary) { + for (InstancesResult.Instance instanceFromStatus : instancesFromStatus) { + if (instanceFromStatus.getInstance().equals(instanceFromSummary.getInstance())) { + String status1 = instanceFromStatus.getStatus().toString(); + String status2 = instanceFromSummary.getStatus().toString(); + if (!status1.equals(status2)) { + LOGGER.info(String.format("Statuses comparison failed : %s and %s", status1, status2)); + return false; + } + if (!instanceFromStatus.getCluster().equals(instanceFromSummary.getCluster())) { + LOGGER.info(String.format("Clusters comparison failed : %s and %s", + instanceFromStatus.getCluster(), instanceFromSummary.getCluster())); + return false; + } return true; } } + LOGGER.info("Instance " + instanceFromSummary.getInstance() + " not found in list."); return false; }
