From c2c5c7d17b46f08d8d65f6dcdec400404e0bc78f Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 10 Oct 2025 00:17:50 +0100
Subject: [PATCH] Add test for 640Mb M.O. image in AaruFormat V2.

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

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5caf5c7..351ec80 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,6 +38,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/hifd.aif DESTINATION ${CMAKE_CURRENT_
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/mo540_v1.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/mo540.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/mo640_v1.aif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/mo640.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/mo640.aif b/tests/data/mo640.aif
new file mode 100755
index 0000000000000000000000000000000000000000..e9b946490bd81f62ee67574daf4da1bf209ea9c5
GIT binary patch
literal 1592
zcmZ>C3<`A%@(oF3NMtBtC}l`v$Y&^G$Yn@mC}AjJ$Y;oB$YCG`FflMPv@tO-Ft9;X
zKX}1mXKQ(f5k^BqN6En!0xnKI-i!>43=A9$48<VFDKIdk`E04v>Sbl*dg1C5KBJ32
zj)8%JiJ^2NA4`(|yVw2_o7H=`Qj{$_UX(f>RoPyv@vzPPhQmFjw66!3M4CKb`LU_|
z<AJTK?w<V1za(!)SpB()lh-Y}{>W+DDv7O@bz5^!Syk!$nV|P1z-{l$Xm%dnTMwKX
z8>?q-US`L{#k{ks)NUWxAt1+$Vp@lQi%W<RDE=9dEDG4eg2V$cIe8cuVWR9%r4Ap3
zKvE2XEG%cQIX6U09TZK95naU#Ni7U4D|jFM`143&*G|4^YNkz(9G-l;_h<gnLm?KI
z<;y0SyFSZk;8V_@%^Sx4ok>)>eAUT=w<pUdeR8}t<CBhKY#G~L-ANMGCrjgXd^xRI
zFZlbuOZa;E<-4dA%iiftoOQn1QZ*%0Ygd|%_x~uhHAOsPla}wZ>{oeMFmJhX{2Pta
ztrw@x=&IA2_({F=yW|138NM_A-dKNi0{;=!;2&Qnni;Y#-S95|V1chY&&7#?tJWsS
z?mD+oT_Ps3?PXd}#J-nhYa*XKjb`QedHmMeKfi;tOU}wgD>(hU8*KYSGlkQ-;j~uH
z{jJs?j_lQoU&U|do#r$_nD4*9<R66<kw3Uk+9;iU01lcVKzO=D7=wy!kW&Tt-#?2^
WJpTd224P6qzyOtoq!b2d(f|NqYu#i3

literal 0
HcmV?d00001

diff --git a/tests/open_image.cpp b/tests/open_image.cpp
index 7c34119..c218c23 100644
--- a/tests/open_image.cpp
+++ b/tests/open_image.cpp
@@ -678,6 +678,64 @@ TEST_F(OpenImageFixture, open_mo640_v1)
     EXPECT_EQ(close_result, AARUF_STATUS_OK) << "Failed to close image";
 }
 
+TEST_F(OpenImageFixture, open_mo640_v2)
+{
+    char path[PATH_MAX];
+    char filename[PATH_MAX];
+
+    getcwd(path, PATH_MAX);
+    snprintf(filename, PATH_MAX, "%s/data/mo640.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 mo640.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, 378) << "Unexpected image size";
+    ASSERT_EQ(image_info.Sectors, 310352) << "Unexpected number of sectors";
+    ASSERT_EQ(image_info.SectorSize, 2048) << "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, 134045024110831840ULL) << "Unexpected creation time";
+    ASSERT_EQ(image_info.LastModificationTime, 134045024110831840ULL) << "Unexpected modification time";
+    ASSERT_EQ(image_info.MediaType, 646) << "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 < 310352; i++)
+    {
+        uint8_t  buffer[2048];
+        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, 2048U) << "Unexpected length for sector " << i;
+        aaruf_crc64_update(ctx, buffer, 2048);
+    }
+
+    aaruf_crc64_final(ctx, &crc);
+    aaruf_crc64_free(ctx);
+
+    ASSERT_EQ(crc, 0x6761926a7b8c1f54) << "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)
 {