Make decompress tests working again

ReCodEx · Jan 9, 2021 · 56bc52a · 56bc52a
1 parent 02aebfe
commit 56bc52a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -43,11 +43,7 @@ function(add_test_suite name)
 		target_compile_definitions(run_test_${name} PRIVATE LIBARCHIVE_STATIC)
 	endif()
 
-	if(TEST_WORKING_DIRECTORY)
-		add_test(NAME ${name} COMMAND run_test_${name} WORKING_DIRECTORY "${TEST_WORKING_DIRECTORY}")
-	else()
-		add_test(NAME ${name} COMMAND run_test_${name})
-	endif()
+	add_test(NAME ${name} COMMAND run_test_${name} WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
 endfunction()
 
 # Unit and integration tests

diff --git a/tests/archivator.cpp b/tests/archivator.cpp
@@ -18,38 +18,50 @@ TEST(Archivator, DecompressNonexistingArchive)
 
 TEST(Archivator, DecompressZip)
 {
-	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_zip.zip", fs::temp_directory_path().string()));
-	EXPECT_TRUE(fs::is_directory(fs::temp_directory_path() / "valid_zip"));
-	EXPECT_TRUE(fs::is_regular_file(fs::temp_directory_path() / "valid_zip" / "a.txt"));
-	EXPECT_TRUE(fs::file_size(fs::temp_directory_path() / "valid_zip" / "a.txt") > 0);
-	fs::remove_all(fs::temp_directory_path() / "valid_zip");
+	fs::path unziped_path = fs::temp_directory_path() / "valid_zip";
+	fs::create_directory(unziped_path);
+
+	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_zip.zip", unziped_path.string()));
+	EXPECT_TRUE(fs::is_directory(unziped_path));
+	EXPECT_TRUE(fs::is_regular_file(unziped_path / "a.txt"));
+	EXPECT_TRUE(fs::file_size(unziped_path / "a.txt") > 0);
+	fs::remove_all(unziped_path);
 }
 
 TEST(Archivator, DecompressTar)
 {
-	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_tar.tar", fs::temp_directory_path().string()));
-	EXPECT_TRUE(fs::is_directory(fs::temp_directory_path() / "valid_tar"));
-	EXPECT_TRUE(fs::is_regular_file(fs::temp_directory_path() / "valid_tar" / "a.txt"));
-	EXPECT_TRUE(fs::file_size(fs::temp_directory_path() / "valid_tar" / "a.txt") > 0);
-	fs::remove_all(fs::temp_directory_path() / "valid_tar");
+	fs::path untared_path = fs::temp_directory_path() / "valid_tar";
+	fs::create_directory(untared_path);
+
+	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_tar.tar", untared_path.string()));
+	EXPECT_TRUE(fs::is_directory(untared_path));
+	EXPECT_TRUE(fs::is_regular_file(untared_path / "a.txt"));
+	EXPECT_TRUE(fs::file_size(untared_path / "a.txt") > 0);
+	fs::remove_all(untared_path);
 }
 
 TEST(Archivator, DecompressTarGz)
 {
-	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_tar.tar.gz", fs::temp_directory_path().string()));
-	EXPECT_TRUE(fs::is_directory(fs::temp_directory_path() / "valid_tar"));
-	EXPECT_TRUE(fs::is_regular_file(fs::temp_directory_path() / "valid_tar" / "a.txt"));
-	EXPECT_TRUE(fs::file_size(fs::temp_directory_path() / "valid_tar" / "a.txt") > 0);
-	fs::remove_all(fs::temp_directory_path() / "valid_tar");
+	fs::path untared_path = fs::temp_directory_path() / "valid_tar";
+	fs::create_directory(untared_path);
+
+	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_tar.tar.gz", untared_path.string()));
+	EXPECT_TRUE(fs::is_directory(untared_path));
+	EXPECT_TRUE(fs::is_regular_file(untared_path / "a.txt"));
+	EXPECT_TRUE(fs::file_size(untared_path / "a.txt") > 0);
+	fs::remove_all(untared_path);
 }
 
 TEST(Archivator, DecompressTarBz2)
 {
-	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_tar.tar.bz2", fs::temp_directory_path().string()));
-	EXPECT_TRUE(fs::is_directory(fs::temp_directory_path() / "valid_tar"));
-	EXPECT_TRUE(fs::is_regular_file(fs::temp_directory_path() / "valid_tar" / "a.txt"));
-	EXPECT_TRUE(fs::file_size(fs::temp_directory_path() / "valid_tar" / "a.txt") > 0);
-	fs::remove_all(fs::temp_directory_path() / "valid_tar");
+	fs::path untared_path = fs::temp_directory_path() / "valid_tar";
+	fs::create_directory(untared_path);
+
+	ASSERT_NO_THROW(archivator::decompress("testing_archives/valid_tar.tar.bz2", untared_path.string()));
+	EXPECT_TRUE(fs::is_directory(untared_path));
+	EXPECT_TRUE(fs::is_regular_file(untared_path / "a.txt"));
+	EXPECT_TRUE(fs::file_size(untared_path / "a.txt") > 0);
+	fs::remove_all(untared_path);
 }
 
 TEST(Archivator, DecompressCorruptedZip)