From 33644af64de4727b8722c2e8699dec9f7c483bbf Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Thu, 28 Apr 2016 23:14:33 -0700
Subject: [PATCH] Extend test cases for trying to rename a file to an existing
 directory or the other way round

---
 src/fspp/fstest/FsppNodeTest_Rename.h | 40 ++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/fspp/fstest/FsppNodeTest_Rename.h b/src/fspp/fstest/FsppNodeTest_Rename.h
index ab5bb33e..9fb9a98f 100644
--- a/src/fspp/fstest/FsppNodeTest_Rename.h
+++ b/src/fspp/fstest/FsppNodeTest_Rename.h
@@ -131,7 +131,7 @@ public:
         EXPECT_EQ(3u, this->LoadDir("/")->children()->size()); // 3, because of '.' and '..'
     }
 
-    void Test_Overwrite_DirWithFile() {
+    void Test_Overwrite_DirWithFile_InSameDir() {
         auto file = this->CreateFile("/oldname");
         this->CreateDir("/newname");
         try {
@@ -144,7 +144,22 @@ public:
         EXPECT_NE(boost::none, this->device->Load("/newname"));
     }
 
-    void Test_Overwrite_FileWithDir() {
+    void Test_Overwrite_DirWithFile_InDifferentDir() {
+        this->CreateDir("/parent1");
+        this->CreateDir("/parent2");
+        auto file = this->CreateFile("/parent1/oldname");
+        this->CreateDir("/parent2/newname");
+        try {
+            file->rename("/parent2/newname");
+            EXPECT_TRUE(false); // expect throw
+        } catch (const fspp::fuse::FuseErrnoException &e) {
+            EXPECT_EQ(EISDIR, e.getErrno());
+        }
+        EXPECT_NE(boost::none, this->device->Load("/parent1/oldname"));
+        EXPECT_NE(boost::none, this->device->Load("/parent2/newname"));
+    }
+
+    void Test_Overwrite_FileWithDir_InSameDir() {
         auto dir = this->CreateDir("/oldname");
         this->CreateFile("/newname");
         try {
@@ -156,6 +171,21 @@ public:
         EXPECT_NE(boost::none, this->device->Load("/oldname"));
         EXPECT_NE(boost::none, this->device->Load("/newname"));
     }
+
+    void Test_Overwrite_FileWithDir_InDifferentDir() {
+        this->CreateDir("/parent1");
+        this->CreateDir("/parent2");
+        auto dir = this->CreateDir("/parent1/oldname");
+        this->CreateFile("/parent2/newname");
+        try {
+            dir->rename("/parent2/newname");
+            EXPECT_TRUE(false); // expect throw
+        } catch (const fspp::fuse::FuseErrnoException &e) {
+            EXPECT_EQ(ENOTDIR, e.getErrno());
+        }
+        EXPECT_NE(boost::none, this->device->Load("/parent1/oldname"));
+        EXPECT_NE(boost::none, this->device->Load("/parent2/newname"));
+    }
 };
 
 REGISTER_NODE_TEST_CASE(FsppNodeTest_Rename,
@@ -173,8 +203,10 @@ REGISTER_NODE_TEST_CASE(FsppNodeTest_Rename,
     RootDir,
     Overwrite,
     Overwrite_DoesntHaveSameEntryTwice,
-    Overwrite_DirWithFile,
-    Overwrite_FileWithDir
+    Overwrite_DirWithFile_InSameDir,
+    Overwrite_DirWithFile_InDifferentDir,
+    Overwrite_FileWithDir_InSameDir,
+    Overwrite_FileWithDir_InDifferentDir
 );
 
 #endif