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/08 21:44:23 UTC

falcon git commit: FALCON-1261 ProcessSetupTest, EntitiesPatternSearchTest stabilization conributed by Paul Isaychuk

Repository: falcon
Updated Branches:
  refs/heads/master b4ade492f -> c087f9e83


FALCON-1261 ProcessSetupTest, EntitiesPatternSearchTest stabilization conributed 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/c087f9e8
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/c087f9e8
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/c087f9e8

Branch: refs/heads/master
Commit: c087f9e839107ad2ab7b8b86878aca0b3cb0ffa8
Parents: b4ade49
Author: Raghav Kumar Gautam <ra...@apache.org>
Authored: Mon Jun 8 12:44:17 2015 -0700
Committer: Raghav Kumar Gautam <ra...@apache.org>
Committed: Mon Jun 8 12:44:17 2015 -0700

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                        |  2 ++
 .../regression/ui/search/ProcessWizardPage.java      |  1 +
 .../regression/entity/EntitiesPatternSearchTest.java | 15 +++++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/c087f9e8/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 3b1dea6..efd3caf 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -92,6 +92,8 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+   FALCON-1261 ProcessSetupTest, EntitiesPatternSearchTest stabilization (Paul Isaychuk via Raghav Kumar Gautam)
+
    FALCON-1256 ListProcessInstancesTest needs to be stabilized (Raghav Kumar Gautam)
 
    FALCON-1227 Add logMover check in FeedReplication test(Pragya M via Samarth G)

http://git-wip-us.apache.org/repos/asf/falcon/blob/c087f9e8/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
index e796ba0..2321ccf 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
@@ -822,6 +822,7 @@ public class ProcessWizardPage extends AbstractSearchPage {
 
     public void clickSave(){
         getSaveProcessButton().click();
+        waitForAngularToFinish();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/falcon/blob/c087f9e8/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
index 6e7bbc5..2fdfc6e 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
@@ -23,7 +23,10 @@ import org.apache.falcon.regression.Entities.FeedMerlin;
 import org.apache.falcon.regression.Entities.ProcessMerlin;
 import org.apache.falcon.regression.core.bundle.Bundle;
 import org.apache.falcon.regression.core.helpers.entity.AbstractEntityHelper;
-import org.apache.falcon.regression.core.util.*;
+import org.apache.falcon.regression.core.util.AssertUtil;
+import org.apache.falcon.regression.core.util.BundleUtil;
+import org.apache.falcon.regression.core.util.MatrixUtil;
+import org.apache.falcon.regression.core.util.OSUtil;
 import org.apache.falcon.regression.testHelper.BaseTestClass;
 import org.apache.falcon.resource.EntityList.EntityElement;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -42,7 +45,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * Testing the pattern serach of entities. Falcon-914
+ * Testing the pattern search of entities. Falcon-914
  */
 @Test(groups = "embedded")
 public class EntitiesPatternSearchTest extends BaseTestClass {
@@ -131,7 +134,7 @@ public class EntitiesPatternSearchTest extends BaseTestClass {
 
     @DataProvider
     public Object[][] getMismatchPattern(){
-        String[] mismatchPatternParam = new String[]{"abc", "ne d", "newss", "new*", "NewEntityDefinitions"};
+        String[] mismatchPatternParam = new String[]{"akm", "ne d", "newss", "new*", "NewEntityDefinitions"};
         AbstractEntityHelper[] helper = new AbstractEntityHelper[] {
                 prism.getProcessHelper(),
                 prism.getFeedHelper(),
@@ -174,9 +177,9 @@ public class EntitiesPatternSearchTest extends BaseTestClass {
         String patternCheck="";
         String regexString=".*";
         StringBuffer newString = new StringBuffer();
-        char[] searchPattern = pattern.toLowerCase().toCharArray();
-        for(int i=0; i <searchPattern.length; i++) {
-            newString = newString.append(regexString).append(searchPattern[i]);
+        char[] searchPatterns = pattern.toLowerCase().toCharArray();
+        for (char searchPattern : searchPatterns) {
+            newString = newString.append(regexString).append(searchPattern);
         }
         patternCheck = newString.append(regexString).toString();
         LOGGER.info("patternCheck : " + patternCheck);