falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject git commit: FALCON-852 Merlin function testProcessOrderBy() needs to use string ordering instead of enum ordering. Contributed by Raghav Kumar Gautam
Date Mon, 03 Nov 2014 13:45:39 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master b202406f5 -> a37899c54


FALCON-852 Merlin function testProcessOrderBy() needs to use string ordering instead of enum
ordering. Contributed by Raghav Kumar Gautam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/a37899c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/a37899c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/a37899c5

Branch: refs/heads/master
Commit: a37899c548a000ecff428ee785e65e8db974f6a8
Parents: b202406
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Mon Nov 3 15:44:29 2014 +0200
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Mon Nov 3 15:44:29 2014 +0200

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                     | 3 +++
 .../apache/falcon/regression/lineage/ListFeedInstancesTest.java   | 2 +-
 .../falcon/regression/lineage/ListProcessInstancesTest.java       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a37899c5/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 39fcb9b..512067a 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -129,6 +129,9 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-852 Merlin function testProcessOrderBy() needs to use string ordering instead of
enum
+   ordering (Raghav Kumar Gautam via Ruslan Ostafiychuk)
+
    FALCON-848 ListEntitiesTest tagged and checkstyle bugs fixed (Ruslan Ostafiychuk)
 
    FALCON-832 more edge labels and node type for lineage (Raghav Kumar Gautam via Ruslan

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a37899c5/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
index 47b3cb7..76735b9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
@@ -198,7 +198,7 @@ public class ListFeedInstancesTest extends BaseTestClass {
         InstancesResult.WorkflowStatus previousStatus = InstancesResult.WorkflowStatus.WAITING;
         for (InstancesResult.Instance instance : instances) {
             InstancesResult.WorkflowStatus current = instance.getStatus();
-            softAssert.assertTrue(current.compareTo(previousStatus) <= 0,
+            softAssert.assertTrue(current.toString().compareTo(previousStatus.toString())
<= 0,
                 "Wrong order. Compared " + current + " and " + previousStatus + " statuses.");
             previousStatus = current;
         }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a37899c5/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
index 3f5ce28..145b9de 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
@@ -130,7 +130,7 @@ public class ListProcessInstancesTest extends BaseTestClass {
         InstancesResult.WorkflowStatus previousStatus = InstancesResult.WorkflowStatus.WAITING;
         for (InstancesResult.Instance instance : instances) {
             InstancesResult.WorkflowStatus current = instance.getStatus();
-            softAssert.assertTrue(current.compareTo(previousStatus) <= 0,
+            softAssert.assertTrue(current.toString().compareTo(previousStatus.toString())
<= 0,
                 "Wrong order. Compared " + current + " and " + previousStatus + " statuses.");
             previousStatus = current;
         }


Mime
View raw message