[Test] Update tests to verify BIT7Z_DETECT_FROM_EXTENSION

rikyoz · Feb 26, 2025 · 1f268af · 1f268af
1 parent 79133ec
commit 1f268af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/tests/src/test_bitarchivereader.cpp b/tests/src/test_bitarchivereader.cpp
@@ -1115,13 +1115,18 @@ TEMPLATE_TEST_CASE( "BitInputArchive: Reading a nested archive with wrong extens
     SECTION( "Checking archive start by scanning through the input file" ){
 #ifdef BIT7Z_AUTO_FORMAT
         const BitArchiveReader reader( lib, inputArchive, ArchiveStartOffset::None );
+#ifdef BIT7Z_DETECT_FROM_EXTENSION
         if ( reader.archivePath().empty() ) {
             REQUIRE( reader.detectedFormat() == BitFormat::SevenZip );
             REQUIRE_NOTHROW( reader.test() );
         } else {
             REQUIRE( reader.detectedFormat() == BitFormat::Zip );
             REQUIRE_THROWS( reader.test() );
         }
+#else
+        REQUIRE( reader.detectedFormat() == BitFormat::SevenZip );
+        REQUIRE_NOTHROW( reader.test() );
+#endif
 #else
         const BitArchiveReader reader( lib, inputArchive, ArchiveStartOffset::None, BitFormat::Zip );
         REQUIRE_THROWS( reader.test() );

diff --git a/tests/src/test_formatdetect.cpp b/tests/src/test_formatdetect.cpp
@@ -28,6 +28,7 @@ using namespace bit7z;
 using namespace bit7z::test;
 using namespace bit7z::test::filesystem;
 
+#ifdef BIT7Z_DETECT_FROM_EXTENSION
 // Note: format detection by extension doesn't actually require the file to exist.
 TEST_CASE( "formatdetect: Format detection by extension", "[formatdetect]" ) {
     const TestDirectory testDir{ fs::path{ test_archives_dir } / "detection" / "valid" };
@@ -129,6 +130,7 @@ TEST_CASE( "formatdetect: Format detection by extension", "[formatdetect]" ) {
         REQUIRE( detect_format_from_extension( "valid." + test.extension ) == test.format );
     }
 }
+#endif
 
 TEST_CASE( "formatdetect: Format detection by signature", "[formatdetect]" ) {
     const TestDirectory testDir{ fs::path{ test_archives_dir } / "detection" / "valid" };
@@ -286,7 +288,9 @@ TEST_CASE( "formatdetect: Format detection of archive with a wrong extension (Is
 TEST_CASE( "formatdetect: Format detection of an archive file without an extension", "[formatdetect]" ) {
     const TestDirectory testDir{ fs::path{ test_archives_dir } / "detection" };
 
+#ifdef BIT7Z_DETECT_FROM_EXTENSION
     REQUIRE( detect_format_from_extension( "noextension" ) == BitFormat::Auto );
+#endif
 
     const Bit7zLibrary lib{ test::sevenzip_lib_path() };
     const BitArchiveReader reader{ lib, BIT7Z_STRING( "noextension" ) };