Repository: falcon Updated Branches: refs/heads/master 9872ce8e7 -> f008f867f
FALCON-1502 Checkstyle failures in Falcon Regression. Contributed by Pragya Mittal. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f008f867 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f008f867 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f008f867 Branch: refs/heads/master Commit: f008f867f6c511cbe5676b5b5d205015cdd4f080 Parents: 9872ce8 Author: Ajay Yadava <[email protected]> Authored: Thu Oct 1 18:17:01 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Thu Oct 1 18:17:01 2015 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../falcon/regression/CombinedActionsTest.java | 8 ++++++- .../regression/ELExpCurrentAndLastWeekTest.java | 16 +++++++++++--- .../falcon/regression/FeedLateRerunTest.java | 17 +++++++++++---- .../apache/falcon/regression/FeedSLATest.java | 5 ++++- .../falcon/regression/ProcessLateRerunTest.java | 21 +++++++++++++----- .../regression/ProcessLibPathLoadTest.java | 23 +++++++++++++++----- .../falcon/regression/ProcessSLATest.java | 5 ++++- .../regression/TouchAPIPrismAndServerTest.java | 8 ++++++- .../falcon/regression/prism/FeedDelayTest.java | 15 +++++++++++-- .../regression/searchUI/ProcessSetupTest.java | 5 ++++- 11 files changed, 101 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 92f722a..d88b07f 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -102,6 +102,8 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-1502 Checkstyle failures in Falcon Regression(Pragya Mittal via Ajay Yadava) + FALCON-1384 AbstractEntityHelper.java cleanup (Paul Isaychuk) FALCON-1306 Custom window dimensions for UI tests (Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java index 4d432fd..7dd3d96 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java @@ -25,7 +25,13 @@ import org.apache.falcon.entity.v0.feed.LocationType; import org.apache.falcon.regression.Entities.FeedMerlin; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.HCatUtil; +import org.apache.falcon.regression.core.util.AssertUtil; +import org.apache.falcon.regression.core.util.TimeUtil; +import org.apache.falcon.regression.core.util.HadoopUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; import org.apache.hive.hcatalog.api.HCatClient; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java index bdfdbd5..3eb7bed 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java @@ -18,11 +18,16 @@ package org.apache.falcon.regression; -import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.entity.v0.Frequency.TimeUnit; +import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.OozieUtil; +import org.apache.falcon.regression.core.util.AssertUtil; +import org.apache.falcon.regression.core.util.TimeUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.apache.oozie.client.CoordinatorAction; @@ -30,7 +35,12 @@ import org.apache.oozie.client.Job; import org.apache.oozie.client.OozieClient; import org.apache.oozie.client.OozieClientException; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.testng.annotations.DataProvider; + import java.util.ArrayList; import java.util.Collections; import java.util.List; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java index 59a9921..5bb5e6e 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java @@ -18,19 +18,28 @@ package org.apache.falcon.regression; -import org.apache.falcon.regression.Entities.FeedMerlin; -import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.entity.v0.feed.ActionType; import org.apache.falcon.entity.v0.feed.ClusterType; +import org.apache.falcon.regression.Entities.FeedMerlin; +import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.OozieUtil; +import org.apache.falcon.regression.core.util.AssertUtil; +import org.apache.falcon.regression.core.util.TimeUtil; +import org.apache.falcon.regression.core.util.HadoopUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; +import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.log4j.Logger; -import org.apache.oozie.client.*; +import org.apache.oozie.client.CoordinatorAction; +import org.apache.oozie.client.OozieClient; +import org.apache.oozie.client.OozieClientException; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java index 89d6d87..28ddbd7 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java @@ -24,7 +24,10 @@ import org.apache.falcon.regression.Entities.FeedMerlin; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; import org.apache.falcon.regression.core.response.ServiceResponse; -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.TimeUtil; +import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java index 554588d..6a12fc8 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java @@ -18,17 +18,28 @@ package org.apache.falcon.regression; +import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.entity.v0.Frequency; -import org.apache.falcon.entity.v0.process.*; +import org.apache.falcon.entity.v0.process.Input; +import org.apache.falcon.entity.v0.process.LateInput; +import org.apache.falcon.entity.v0.process.LateProcess; +import org.apache.falcon.entity.v0.process.PolicyType; import org.apache.falcon.regression.Entities.ProcessMerlin; import org.apache.falcon.regression.core.bundle.Bundle; -import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.regression.core.helpers.ColoHelper; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.OozieUtil; +import org.apache.falcon.regression.core.util.AssertUtil; +import org.apache.falcon.regression.core.util.TimeUtil; +import org.apache.falcon.regression.core.util.HadoopUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; -import org.apache.oozie.client.*; +import org.apache.oozie.client.CoordinatorAction; +import org.apache.oozie.client.Job; +import org.apache.oozie.client.OozieClient; import org.testng.Assert; import org.testng.TestNGException; import org.testng.annotations.AfterMethod; @@ -36,7 +47,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.*; +import java.util.List; /** * Process late data test. http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java index bd9d43a..8422796 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java @@ -20,20 +20,33 @@ package org.apache.falcon.regression; import org.apache.commons.io.FileUtils; import org.apache.falcon.entity.v0.EntityType; -import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.entity.v0.Frequency.TimeUnit; +import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants; import org.apache.falcon.regression.core.helpers.ColoHelper; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.OozieUtil; +import org.apache.falcon.regression.core.util.HadoopUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; +import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; import org.apache.oozie.client.Job.Status; import org.apache.oozie.client.OozieClient; import org.testng.Assert; -import org.testng.annotations.*; - -import java.io.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.FileOutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.util.List; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java index c73140d..f4c9b30 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java @@ -23,7 +23,10 @@ import org.apache.falcon.regression.Entities.ProcessMerlin; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; import org.apache.falcon.regression.core.response.ServiceResponse; -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.OSUtil; +import org.apache.falcon.regression.core.util.TimeUtil; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.testng.Assert; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java index d27ff65..1bffe9a 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java @@ -23,7 +23,13 @@ import org.apache.falcon.entity.v0.Frequency; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; import org.apache.falcon.regression.core.response.ServiceResponse; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.OozieUtil; +import org.apache.falcon.regression.core.util.AssertUtil; +import org.apache.falcon.regression.core.util.TimeUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; +import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.log4j.Logger; import org.apache.oozie.client.Job; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java index 689b9e3..aaa6ebe 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayTest.java @@ -25,7 +25,14 @@ import org.apache.falcon.entity.v0.feed.ClusterType; import org.apache.falcon.regression.Entities.FeedMerlin; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.helpers.ColoHelper; -import org.apache.falcon.regression.core.util.*; +import org.apache.falcon.regression.core.util.OozieUtil; +import org.apache.falcon.regression.core.util.AssertUtil; +import org.apache.falcon.regression.core.util.TimeUtil; +import org.apache.falcon.regression.core.util.HadoopUtil; +import org.apache.falcon.regression.core.util.BundleUtil; +import org.apache.falcon.regression.core.util.InstanceUtil; +import org.apache.falcon.regression.core.util.OSUtil; +import org.apache.falcon.regression.core.util.Util; import org.apache.falcon.regression.testHelper.BaseTestClass; import org.apache.hadoop.fs.FileSystem; import org.apache.log4j.Logger; @@ -33,7 +40,11 @@ import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.OozieClient; import org.apache.oozie.client.OozieClientException; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.testng.annotations.DataProvider; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/falcon/blob/f008f867/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ProcessSetupTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ProcessSetupTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ProcessSetupTest.java index bda658c..728646f 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ProcessSetupTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ProcessSetupTest.java @@ -19,7 +19,10 @@ package org.apache.falcon.regression.searchUI; import org.apache.falcon.entity.v0.Frequency; -import org.apache.falcon.entity.v0.process.*; +import org.apache.falcon.entity.v0.process.Cluster; +import org.apache.falcon.entity.v0.process.EngineType; +import org.apache.falcon.entity.v0.process.ExecutionType; +import org.apache.falcon.entity.v0.process.Input; import org.apache.falcon.regression.Entities.ClusterMerlin; import org.apache.falcon.regression.Entities.ProcessMerlin; import org.apache.falcon.regression.core.bundle.Bundle;
