From 3265b55119d39ecbda6d75be04a9a1bf59c631f1 Mon Sep 17 00:00:00 2001 From: Yiqun Lin Date: Wed, 2 May 2018 18:14:02 +0900 Subject: [PATCH] YARN-6385. Fix checkstyle warnings in TestFileSystemApplicationHistoryStore Signed-off-by: Akira Ajisaka --- .../TestFileSystemApplicationHistoryStore.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java index df4adbe0c6..6b068c132d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java @@ -272,20 +272,20 @@ public void testInitExistingWorkingDirectoryInSafeMode() throws Exception { tearDown(); // Setup file system to inject startup conditions - FileSystem fs = spy(new RawLocalFileSystem()); + FileSystem fileSystem = spy(new RawLocalFileSystem()); FileStatus fileStatus = Mockito.mock(FileStatus.class); doReturn(true).when(fileStatus).isDirectory(); - doReturn(fileStatus).when(fs).getFileStatus(any(Path.class)); + doReturn(fileStatus).when(fileSystem).getFileStatus(any(Path.class)); try { - initAndStartStore(fs); + initAndStartStore(fileSystem); } catch (Exception e) { Assert.fail("Exception should not be thrown: " + e); } // Make sure that directory creation was not attempted verify(fileStatus, never()).isDirectory(); - verify(fs, times(1)).mkdirs(any(Path.class)); + verify(fileSystem, times(1)).mkdirs(any(Path.class)); } @Test @@ -294,14 +294,14 @@ public void testInitNonExistingWorkingDirectoryInSafeMode() throws Exception { tearDown(); // Setup file system to inject startup conditions - FileSystem fs = spy(new RawLocalFileSystem()); + FileSystem fileSystem = spy(new RawLocalFileSystem()); FileStatus fileStatus = Mockito.mock(FileStatus.class); doReturn(false).when(fileStatus).isDirectory(); - doReturn(fileStatus).when(fs).getFileStatus(any(Path.class)); - doThrow(new IOException()).when(fs).mkdirs(any(Path.class)); + doReturn(fileStatus).when(fileSystem).getFileStatus(any(Path.class)); + doThrow(new IOException()).when(fileSystem).mkdirs(any(Path.class)); try { - initAndStartStore(fs); + initAndStartStore(fileSystem); Assert.fail("Exception should have been thrown"); } catch (Exception e) { // Expected failure @@ -309,6 +309,6 @@ public void testInitNonExistingWorkingDirectoryInSafeMode() throws Exception { // Make sure that directory creation was attempted verify(fileStatus, never()).isDirectory(); - verify(fs, times(1)).mkdirs(any(Path.class)); + verify(fileSystem, times(1)).mkdirs(any(Path.class)); } }