addendum

Author: virajjasani

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellTouch.java

@@ -201,16 +201,20 @@ public void testTouch() throws Exception {
     assertThat(fileStatus.getAccessTime()).isEqualTo(dateObj.getTime());
     assertThat(fileStatus.getModificationTime()).isEqualTo(dateObj.getTime());
 
-    touchDirTests();
+    lfs.delete(newFile, true);
+    assertThat(lfs.exists(newFile)).isFalse();
+
   }
 
-  private void touchDirTests() throws Exception {
+  @Test
+  public void testTouchDir() throws Exception {
     String strTime;
     final String newFileName = "dir3/newFile3";
     Date dateObj;
     final Path newFile = new Path(newFileName);
     FileStatus fstatus;
     Path dirPath = new Path("dir3");
+    lfs.delete(dirPath, true);
     lfs.mkdirs(dirPath);
     lfs.delete(newFile, true);
     assertThat(lfs.exists(newFile)).isFalse();
@@ -266,6 +270,8 @@ private void touchDirTests() throws Exception {
 
     lfs.delete(newFile, true);
     lfs.delete(dirPath, true);
+    assertThat(lfs.exists(newFile)).isFalse();
+    assertThat(lfs.exists(dirPath)).isFalse();
   }
 
   private String formatTimestamp(long timeInMillis) {

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShellTouch.java

@@ -38,6 +38,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+/**
+ * Tests to perform Touch operations on DFS.
+ */
 public class TestDFSShellTouch {
 
   private static final Logger LOG = LoggerFactory.getLogger(TestDFSShellTouch.class);
@@ -147,11 +150,10 @@ public void testTouch() throws Exception {
     dfs.delete(newFile, true);
     assertThat(dfs.exists(newFile)).isFalse();
 
-    touchDirTests();
-
   }
 
-  private void touchDirTests() throws IOException, ParseException, InterruptedException {
+  @Test
+  public void testTouchDirs() throws IOException, ParseException, InterruptedException {
     final String newFileName = "dir2/newFile2";
     final Path newFile = new Path(newFileName);
     FileStatus newStatus;