From de0d1643c8b0f0243fa2a3a9aa34a34b3dec250a Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 9 Oct 2025 22:57:23 +0100
Subject: [PATCH] Add test for HiFD image in AaruFormat V2.

---
 tests/CMakeLists.txt |   1 +
 tests/data/hifd.aif  | Bin 0 -> 2104 bytes
 tests/open_image.cpp |  58 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100755 tests/data/hifd.aif

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ed70cf4..5f6366c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -34,6 +34,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/floptical.aif DESTINATION ${CMAKE_CUR
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/gigamo_v1.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/gigamo.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/hifd_v1.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/hifd.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
 
 # Test executable (all unit tests)
 add_executable(tests_run crc64.cpp spamsum.cpp crc32.c crc32.h flac.cpp lzma.cpp sha256.cpp md5.cpp sha1.cpp open_image.cpp)
diff --git a/tests/data/hifd.aif b/tests/data/hifd.aif
new file mode 100755
index 0000000000000000000000000000000000000000..10047499aa13ac1974b32faaf69c58a1dee253dc
GIT binary patch
literal 2104
zcmZ>C3<`A%@(oF3NMtBtC}l`v$Y&^G$Yn@mC}AjJ$Y;oB$YCG`FflMPOlM+XVBmnL
z=Gyn*mW|~dMi>nd9VG`_2)H=;cr!9EGB7YPFnnf&#NUpqc6#Sdp7G67-Yalr?RS<q
z29R`VKOf7bwGTf}58ZlPc!rWdw4Fdl5W9EMi66o{=EzRE=x00a<>@(jDr-&^^a)vC
zSShx7LaAz#_Q9F;sV8rh*cK-2@k&c!j##i;b)T+(SEPn->i)BLYZI0gg^Qi>c2(DN
z)3#aqBVj`HgNF;>WZNr0h`HBzepeE^u2zlzPd0DXgA0U$W<S`*(h{KRE;Px=c~0m2
z(3w9cTZ?ve=NqJVa89mCDz&JVKl#Mycj&&3DIWXp?wcC1aF>X1Ug(^)yHDKua67la
zxb{k-{VI>n&>Gc~-;B6-SFD)x>FN0yZyOJ2U+<OX)o_z4{@krFEBw&pDZ3rl-!t34
zZ^d4P@C_@bd#<r$);j3)sIO~z*MyH8%fio}+WSzXSfT7*y34)47Dq%@ScXZ*{dGJy
zA**Tn#>o3ZF>C80=lrO+JSpW-moCqgp9ULVTsk_}cyA<Qobra!!!IpL7uMU|{V&eC
zU~2tZ^|RLtcV9mKa6tgWA9d#CYbwHpeLZWq3k7a`d3~?<%9MuP+K<e=pSUktB5wBe
z<kSWKxdQt6Y~!Op`5&Ih@OO{@iiz&aix$l9W!(2v`cH$G)4$j^+4I|qJa$golPPhr
zAc=L_bt}#(vi`!sNi)SJe@y63o>AcKYArR%B*&QVL3g1d!zIh$o>$TZT%6aohR9X#
zm^Ii^>8N{X6#_0UAx5D556b#5JC-o8!I)5*lZSy3CTamyI)O<7EbHTcv0;L1ly}&6
z&O=YV^mjl?3kH@IypMkTdE_+Nnq_HT^r@@Ac@C^SyuaC}b7uty*Y!pFPW@vPynp@1
z?uCuFcD(s^T4dJ!@22McOkG)OVGfPq#}Ci{5PGMwHRE26Q+dp}f10HyBAV5M&peNa
zy0J|6#R*Hro3+17<5?c-m#q3&{&(NH8bhi1+j|Z33g#_Wj(?+Zy7l7J8C`W+6F;e!
zewRGJHp6$u-y7?%PT)VH8vNtyL^DIyr5oPmA1v^7=eamhaMjub*<I&0s!PN~w!KUX
zirDwEY)#~or_rn&Kaby9`{#F%cF9?}Xa%RAcY|$zXr^#lH=NeWxxdx=!;!su@vHdl
zywjW}2=o0HnEa!#BJv0K+5b~D-1t}isk!%imVsW_f&SLd&5Z|Aaa)~UyG<D!mh>k)
kT_TJ@)i%iH6USuxUsell1+hUGQa6BV1~3ntQea5~0Jx33>Hq)$

literal 0
HcmV?d00001

diff --git a/tests/open_image.cpp b/tests/open_image.cpp
index 9cec0e1..49141ff 100644
--- a/tests/open_image.cpp
+++ b/tests/open_image.cpp
@@ -446,6 +446,64 @@ TEST_F(OpenImageFixture, open_hifd_v1)
     EXPECT_EQ(close_result, AARUF_STATUS_OK) << "Failed to close image";
 }
 
+TEST_F(OpenImageFixture, open_hifd_v2)
+{
+    char path[PATH_MAX];
+    char filename[PATH_MAX];
+
+    getcwd(path, PATH_MAX);
+    snprintf(filename, PATH_MAX, "%s/data/hifd.aif", path);
+
+    // Attempt to open the image file
+    void *context = aaruf_open(filename);
+
+    // Verify that the file was successfully opened
+    ASSERT_NE(context, nullptr) << "Failed to open hifd.aif";
+
+    // Get image info to verify it's a valid image
+    ImageInfo     image_info;
+    const int32_t result = aaruf_get_image_info(context, &image_info);
+
+    ASSERT_EQ(result, AARUF_STATUS_OK) << "Failed to get image info";
+
+    // Basic sanity checks on the image info
+    ASSERT_EQ(image_info.HasPartitions, false) << "Image should not have partitions";
+    ASSERT_EQ(image_info.HasSessions, false) << "Image should not have sessions";
+    ASSERT_EQ(image_info.ImageSize, 811) << "Unexpected image size";
+    ASSERT_EQ(image_info.Sectors, 393380) << "Unexpected number of sectors";
+    ASSERT_EQ(image_info.SectorSize, 512) << "Unexpected sector size";
+    ASSERT_STREQ(image_info.Version, "2.0") << "Unexpected image version";
+    ASSERT_STREQ(image_info.Application, "aaruformattool") << "Unexpected application name";
+    ASSERT_STREQ(image_info.ApplicationVersion, "1.0") << "Unexpected application version";
+    ASSERT_EQ(image_info.CreationTime, 134045022447255050ULL) << "Unexpected creation time";
+    ASSERT_EQ(image_info.LastModificationTime, 134045022447255050ULL) << "Unexpected modification time";
+    ASSERT_EQ(image_info.MediaType, 663) << "Unexpected media type";
+    ASSERT_EQ(image_info.MetadataMediaType, 1) << "Unexpected metadata media type";
+
+    crc64_ctx *ctx = aaruf_crc64_init();
+    uint64_t   crc = 0;
+
+    for(int i = 0; i < 393380; i++)
+    {
+        uint8_t  buffer[512];
+        uint32_t length = sizeof(buffer);
+
+        const int32_t read_result = aaruf_read_sector(context, i, false, buffer, &length);
+        EXPECT_EQ(read_result, AARUF_STATUS_OK) << "Failed to read sector " << i;
+        EXPECT_EQ(length, 512U) << "Unexpected length for sector " << i;
+        aaruf_crc64_update(ctx, buffer, 512);
+    }
+
+    aaruf_crc64_final(ctx, &crc);
+    aaruf_crc64_free(ctx);
+
+    EXPECT_EQ(crc, 0xcf6865ab1977f144) << "Unexpected CRC64 for image data";
+
+    // Close the image
+    const int32_t close_result = aaruf_close(context);
+    EXPECT_EQ(close_result, AARUF_STATUS_OK) << "Failed to close image";
+}
+
 // Test opening a non-existent file
 TEST_F(OpenImageFixture, OpenNonExistentFile)
 {