Repository: falcon Updated Branches: refs/heads/master a819b5b56 -> 3c2d79497
FALCON-2314 Bump TestNG version to 6.13.1 to avoid BeanShell dependency Build and tests are good locally. Author: Denes Bodo <[email protected]> Reviewers: @pallavi-rao Closes #390 from dionusos/FALCON-2314 and squashes the following commits: 84075a502 [Denes Bodo] Correct member name 5d68a99a0 [Denes Bodo] FALCON-2314 Bump TestNG version to 6.13.1 to avoid BeanShell dependency Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/3c2d7949 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3c2d7949 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3c2d7949 Branch: refs/heads/master Commit: 3c2d79497832ce7c28dd672e4f9b161a527b50f2 Parents: a819b5b Author: Denes Bodo <[email protected]> Authored: Wed Feb 21 14:21:48 2018 +0530 Committer: Pallavi Nagesha Rao <[email protected]> Committed: Wed Feb 21 14:21:48 2018 +0530 ---------------------------------------------------------------------- .../retention/EvictedInstanceSerDeTest.java | 18 ++++++++++-------- pom.xml | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/3c2d7949/common/src/test/java/org/apache/falcon/retention/EvictedInstanceSerDeTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/falcon/retention/EvictedInstanceSerDeTest.java b/common/src/test/java/org/apache/falcon/retention/EvictedInstanceSerDeTest.java index 0f2ee7b..76ae556 100644 --- a/common/src/test/java/org/apache/falcon/retention/EvictedInstanceSerDeTest.java +++ b/common/src/test/java/org/apache/falcon/retention/EvictedInstanceSerDeTest.java @@ -39,7 +39,8 @@ public class EvictedInstanceSerDeTest { private EmbeddedCluster cluster; private FileSystem fs; - private Path csvFilePath; + private Path csvFilePathWithNoContent; + private Path csvFilePathWithContent; private StringBuffer evictedInstancePaths = new StringBuffer( "thrift://falcon-distcp-1.cs1cloud.internal:9083/default/retention_hours_7/year=2010") .append(EvictedInstanceSerDe.INSTANCEPATH_SEPARATOR) @@ -51,7 +52,8 @@ public class EvictedInstanceSerDeTest { String hdfsUrl = cluster.getConf().get(HadoopClientFactory.FS_DEFAULT_NAME_KEY); fs = FileSystem.get(cluster.getConf()); - csvFilePath = new Path(hdfsUrl + "/falcon/staging/feed/instancePaths-2014-10-01-01-00.csv"); + csvFilePathWithNoContent = new Path(hdfsUrl + "/falcon/staging/feed/instancePaths-2014-10-01-01-00.csv"); + csvFilePathWithContent = new Path(hdfsUrl + "/falcon/staging/feed/instancePaths-2014-10-01-02-00.csv"); } @AfterClass @@ -61,27 +63,27 @@ public class EvictedInstanceSerDeTest { @Test public void testSerializeEvictedInstancePathsForNoEviction() throws Exception { - EvictedInstanceSerDe.serializeEvictedInstancePaths(fs, csvFilePath, new StringBuffer()); + EvictedInstanceSerDe.serializeEvictedInstancePaths(fs, csvFilePathWithNoContent, new StringBuffer()); - Assert.assertEquals(readLogFile(csvFilePath), + Assert.assertEquals(readLogFile(csvFilePathWithNoContent), EvictedInstanceSerDe.INSTANCEPATH_PREFIX); } @Test public void testSerializeEvictedInstancePathsWithEviction() throws Exception { - EvictedInstanceSerDe.serializeEvictedInstancePaths(fs, csvFilePath, evictedInstancePaths); - Assert.assertEquals(readLogFile(csvFilePath), evictedInstancePaths.toString()); + EvictedInstanceSerDe.serializeEvictedInstancePaths(fs, csvFilePathWithContent, evictedInstancePaths); + Assert.assertEquals(readLogFile(csvFilePathWithContent), evictedInstancePaths.toString()); } @Test(dependsOnMethods = "testSerializeEvictedInstancePathsForNoEviction") public void testDeserializeEvictedInstancePathsForNoEviction() throws Exception { - String[] instancePaths = EvictedInstanceSerDe.deserializeEvictedInstancePaths(fs, csvFilePath); + String[] instancePaths = EvictedInstanceSerDe.deserializeEvictedInstancePaths(fs, csvFilePathWithNoContent); Assert.assertEquals(instancePaths.length, 0); } @Test(dependsOnMethods = "testSerializeEvictedInstancePathsWithEviction") public void testDeserializeEvictedInstancePathsWithEviction() throws Exception { - String[] instancePaths = EvictedInstanceSerDe.deserializeEvictedInstancePaths(fs, csvFilePath); + String[] instancePaths = EvictedInstanceSerDe.deserializeEvictedInstancePaths(fs, csvFilePathWithContent); Assert.assertEquals(instancePaths.length, 2); Assert.assertTrue(instancePaths[0].equals( "thrift://falcon-distcp-1.cs1cloud.internal:9083/default/retention_hours_7/year=2010")); http://git-wip-us.apache.org/repos/asf/falcon/blob/3c2d7949/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e357c3d..71e02f0 100644 --- a/pom.xml +++ b/pom.xml @@ -810,7 +810,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.1.1</version> + <version>6.13.1</version> <scope>test</scope> </dependency>
