From fe60fabce92ea041333d5b529fb9796cf29e0ed3 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Berthier Date: Wed, 29 Jul 2026 21:55:41 +0200 Subject: [PATCH 1/3] Update dependencies --- PhotoManager/Directory.Packages.props | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/PhotoManager/Directory.Packages.props b/PhotoManager/Directory.Packages.props index ea4f471e..19f5e47a 100644 --- a/PhotoManager/Directory.Packages.props +++ b/PhotoManager/Directory.Packages.props @@ -4,12 +4,12 @@ true - - - - - - + + + + + + all @@ -21,17 +21,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -39,15 +39,15 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - - + + From 889e975f926a81ef79e3136fdb9f861459e0f578 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Berthier Date: Thu, 30 Jul 2026 00:05:18 +0200 Subject: [PATCH 2/3] Update PHashes since Magick.NET update --- .../Integration/Constants.cs | 96 +++++++++---------- .../PhotoManager.Tests/Unit/Constants.cs | 22 ++--- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/PhotoManager/PhotoManager.Tests/Integration/Constants.cs b/PhotoManager/PhotoManager.Tests/Integration/Constants.cs index bc196059..3de9fa68 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Constants.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Constants.cs @@ -734,101 +734,101 @@ public static class MD5Hashes public static class PHashes { public const string HOMER_GIF = - "a6aed62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a738962ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0abca685e0f877208957c61c928c5e761dbcaf783881028a11d8ad696231b8ee326225d"; + "a6aed672d7678a466b706dd7b6a6186e27a47e4b47e4b47e4b47e4b47e4b47e4b47e4ba73896753167c0e66c3b6e0c06aa976e14047e4b47e4b47e4b47e4b47e4b47e4b47e4babca685e0f877208957c61c928c5e761dbcaf783881028a11d8ad696231b8ee326225d"; public const string IMAGE_1_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_90_DEG_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_180_DEG_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_270_DEG_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_DUPLICATE_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_2_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add3d8456a8d85d8b4df625f38d79462e57afba2849d18fc388dc1662da0619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd3d8456a8d85d8b4df625f38d79462e57afba2849d18fc388dc1662da0619b3635dd"; public const string IMAGE_2_DUPLICATED_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add3d8456a8d85d8b4df625f38d79462e57afba2849d18fc388dc1662da0619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd3d8456a8d85d8b4df625f38d79462e57afba2849d18fc388dc1662da0619b3635dd"; public const string IMAGE_3_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add34845688d8638b4e0625f38d79462ee0afb9e849d08fc428dc1a62da1619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd34845688d8638b4e0625f38d79462f59afb9e849d08fc428dc1a62da1619b3636d2"; public const string IMAGE_4_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add2d845678d8648b4df625f38d79362ee0afb9b849cf8fc488dc1b62da1619b462ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd2d845678d8648b4df625f38d79363099afb9b849cf8fc488dc1b62da1619b463808"; public const string IMAGE_5_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add35845688d8668b4e1625f48d79562ee0afb9e849d08fc458dc1a62da1619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd35845688d8668b4e1625f48d79562ee6afb9e849d08fc458dc1a62da1619b363667"; public const string IMAGE_6_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add1c845638d8638b4dc625f38d78d62ee0afb93849ce8fc508dc1d62da2619b462ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd1c845638d8638b4dc625f38d78d63017afb93849ce8fc508dc1d62da2619b4637a7"; public const string IMAGE_7_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add538456e8d8738b4eb625f68d7a362d43afbac849d38fc408dc1b62da1619b462ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd538456e8d8738b4eb625f68d7a362d43afbac849d38fc408dc1b62da1619b4634c1"; public const string IMAGE_8_JPEG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add078455f8d8688b4db625f38d78b62de4afb8a849cc8fc608dc2362da4619b462ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd078455f8d8688b4db625f38d78b62de4afb8a849cc8fc608dc2362da4619b463574"; public const string IMAGE_9_PNG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0adc32845338d8e28b4a7625f18d74062ee0afb2d849b98fd038dc1062da9619b162ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badc32845338d8e28b4a7625f18d74062fd8afb2d849b98fd038dc1062da9619b16377b"; public const string IMAGE_9_DUPLICATE_PNG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0adc32845338d8e28b4a7625f18d74062ee0afb2d849b98fd038dc1062da9619b162ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badc32845338d8e28b4a7625f18d74062fd8afb2d849b98fd038dc1062da9619b16377b"; public const string IMAGE_10_PORTRAIT_PNG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0adbc58451f8d8dd8b494625ee8d72362ee0afaff849b08fd348dc1f62dae619b262ee0"; + "a505b8264166b60669e56d4a066c086d66747e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d1866bad6d83066df46d9c147e4b47e4b47e4b47e4b47e4b47e4b47e4badbc58451f8d8dd8b494625ee8d7236312bafaff849b08fd348dc1f62dae619b263a3f"; public const string IMAGE_11_HEIC = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b1ae2820bc83d0c84a5388e04880cb8d539a929b84a9b881408946061cba8d60062086"; + "a640c83f2866d7e66a8f6d76a66ec66d6fc47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e166f3266c026da2d6700d6da3747e4b47e4b47e4b47e4b47e4b47e4b47e4bb1ae2820bc83d0c84a5388e04880cb8d539a929b84a9b881408946061cba8d60062086"; public const string IMAGE_11_90_DEG_HEIC = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b1adb820bf83d0a84a6188e178808d8d8c2a929e84a9d881418946b61cbc8d62a62080"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bb1adb820bf83d0a84a6188e178808d8d8c2a929e84a9d881418946b61cbc8d62a62080"; public const string IMAGE_11_180_DEG_HEIC = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b1ade820bd83d0f84a5688e09880c28d635a929d84a9b881438946161cbb8d60362085"; + "a640c83f2866d7e66a8f6d76a66ec66d6fc47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e166f3266c026da2d6700d6da3747e4b47e4b47e4b47e4b47e4b47e4b47e4bb1ade820bd83d0f84a5688e09880c28d635a929d84a9b881438946161cbb8d60362085"; public const string IMAGE_11_270_DEG_HEIC = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b1ad8820c083d0e84a6388e1b880888d9c0a92a084a9d881458946c61cbd8d62b6207e"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bb1ad8820c083d0e84a6388e1b880888d9c0a92a084a9d881458946c61cbd8d62b6207e"; public const string IMAGE_WITH_UPPERCASE_NAME_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0ad810844d58d60b8b35e6259c8d5d362a61af946849858fab58dc6b62d9a619b962ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4bad810844d58d60b8b35e6259c8d5d362a61af946849858fab58dc6b62d9a619b963205"; public const string _1336_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; public const string _1336_ORIGINAL_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; public const string _1336_1_K_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a560c827bc8927a86d5d8f1ff8814b8f485abf0a846dd8aef48929a61f458b6af61f62"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba560c827bc8927a86d5d8f1ff8814b8f485abf0a846dd8aef48929a61f458b6af61f62"; public const string _1336_2_K_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a560e827bd8927486d5e8f1f98814b8f487abf0b846dd8aef18929961f458b6af61f62"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba560e827bd8927486d5e8f1f98814b8f487abf0b846dd8aef18929961f458b6af61f62"; public const string _1336_3_K_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a54f1827778922e86d108f170880da8f3ddabe7a846b68aeb78925961f3a8b65a61f54"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba54f1827778922e86d108f170880da8f3ddabe7a846b68aeb78925961f3a8b65a61f54"; public const string _1336_4_K_ORIGINAL_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; public const string _1336_8_K_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a56c6827ec8928a86d8e8f24b881938f4deabf6a846f88af0c892c361f4d8b6e661f6a"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba56c6827ec8928a86d8e8f24b881938f4deabf6a846f88af0c892c361f4d8b6e661f6a"; public const string _1336_THUMBNAIL_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a5617827be8925d86d628f215881508f458abf0f846de8aeee8929b61f478b6b061f60"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba5617827be8925d86d628f215881508f458abf0f846de8aeee8929b61f478b6b061f60"; public const string IMAGE_1336_ORIGINAL_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba572f82804892c286dad8f285881be8f53dabf9e847058af2e892da61f508b70361f71"; public const string IMAGE_1336_MINI_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a5267826b58933d86cb98f0ab880198f50eabd4f8464c8af0d8926261f378b61d61f63"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba5267826b58933d86cb98f0ab880198f50eabd4f8464c8af0d8926261f378b61d61f63"; public const string IMAGE_1336_SHIT_QUALITY_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a527e826b28935486d038f13e880658f561abd4c846458af188927261f388b63261f69"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba527e826b28935486d038f13e880658f561abd4c846458af188927261f388b63261f69"; public const string IMAGE_1336_SMALL_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a5286826b4891a986d208f166880898f388abd60846478ae848929b61f458b66761f58"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba5286826b4891a986d208f166880898f388abd60846478ae848929b61f458b66761f58"; public const string _1336_BOTTOM_LEFT_PART_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0d312e8281883b2483b64876d884fb78971ba939484b35885058815f61a1f8a70361c45"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bd312e8281883b2483b64876d884fb78971ba939484b35885058815f61a1f8a70361c45"; public const string _1336_BOTTOM_PART_JPG = - "a23edaa75562ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a2c89ab88d62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b7607b98008216381bde83ee5ae1478422aa3cb9ad75a86e60869ba8da5c876de8dd2f"; + "a23edaa75566a8f66a0e6d46066afc6d7b447e4b47e4b47e4b47e4b47e4b47e4b47e4ba2c89ab88d66be566b7b6d73566c916d9cd47e4b47e4b47e4b47e4b47e4b47e4b47e4bb7607b98008216381bde83ee5ae1478422aa3cb9ad75a86e60869ba8da5c876de8dd2f"; public const string _1336_BOTTOM_RIGHT_PART_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b3c948219381ee081fb583eff84ef98a200a757a847f2873ca86abd8dc848a10a8e58f"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bb3c948219381ee081fb583eff84ef98a200a757a847f2873ca86abd8dc848a10a8e58f"; public const string _1336_LEFT_PART_JPG = - "a5c5e831b162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a64fa8336a62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a7347850ef85302856d98abcb87f5d8e1ccac9c684f6c8797587bc88f6668a37d62072"; + "a5c5e831b166c3a66a2b6d5a966d216d66a47e4b47e4b47e4b47e4b47e4b47e4b47e4ba64fa8336a66dbf66ba76d89e66ea86d97847e4b47e4b47e4b47e4b47e4b47e4b47e4ba7347850ef85302856d98abcb87f5d8e1ccac9c684f6c8797587bc88f6668a37d62072"; public const string _1336_RIGHT_PART_JPG = - "a5c5e831b162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a64fa8336a62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a747a857ab847f784cdd8984987a478a9dcac49784f3886c9286e8b8dcb9896648f286"; + "a5c5e831b166c3a66a2b6d5a966d216d66a47e4b47e4b47e4b47e4b47e4b47e4b47e4ba64fa8336a66dbf66ba76d89e66ea86d97847e4b47e4b47e4b47e4b47e4b47e4b47e4ba747a857ab847f784cdd8984987a478a9dcac49784f3886c9286e8b8dcb9896648f286"; public const string _1336_TOP_LEFT_PART_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a860983dff890f188d7761cef8ad6d61d32ade578542a8bf548bb8b6261a8e6c362685"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba860983dff890f188d7761cef8ad6d61d32ade578542a8bf548bb8b6261a8e6c362685"; public const string _1336_TOP_PART_JPG = - "a23edaa75562ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a2c89ab88d62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a4309ad6ef88013881ba61a8088da261a68a9d838286c8b5668b5f3625668cbfa624a8"; + "a23edaa75566a8f66a0e6d46066afc6d7b447e4b47e4b47e4b47e4b47e4b47e4b47e4ba2c89ab88d66be566b7b6d73566c916d9cd47e4b47e4b47e4b47e4b47e4b47e4b47e4ba4309ad6ef88013881ba61a8088da261a68a9d838286c8b5668b5f3625668cbfa624a8"; public const string _1336_TOP_RIGHT_PART_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a90b183f0189676896d6621fe8b92161e28ae3968548a8c4158c2f562b528f01e6270e"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba90b183f0189676896d6621fe8b92161e28ae3968548a8c4158c2f562b528f01e6270e"; public const string _1337_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a46fb824c38613386f858e91b88a378d912aba21844698994389c3061fba8c26061fa3"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba46fb824c38613386f858e91b88a378d912aba21844698994389c3061fba8c26061fa3"; public const string _1349_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a45a48230087223877b48eca388a4761d0bab6ba84445890c1895e961dea8b85961f16"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba45a48230087223877b48eca388a4761d0bab6ba84445890c1895e961dea8b85961f16"; public const string _1350_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a53dd82ae985d8b863678c4e6878f88d657abc9584a4e88a8388f3e61c818b47a61e58"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4ba53dd82ae985d8b863678c4e6878f88d657abc9584a4e88a8388f3e61c818b47a61e58"; public const string _1413_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b3ae3a6c078366e82a5e86127833498602ca66038379386f52862528d84e87e738cd29"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bb3ae3a6c078366e82a5e86127833498602ca66038379386f52862528d84e87e738cd29"; public const string _1414_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b420fa61b5834ce8279585b0582ff685c58a610d836af86c76860278de5287c4d8c6fc"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bb420fa61b5834ce8279585b0582ff685c58a610d836af86c76860278de5287c4d8c6fc"; public const string _1415_JPG = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0db53884cb781b71ad09d82dea841d78407ca74048491d84b8c84917893a186db68b255"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bdb53884cb781b71ad09d82dea841d78407ca74048491d84b8c84917893a186db68b255"; public const int LENGTH = 210; // The PHash is a 210-character hexadecimal string } diff --git a/PhotoManager/PhotoManager.Tests/Unit/Constants.cs b/PhotoManager/PhotoManager.Tests/Unit/Constants.cs index 633430e6..4f1bb510 100644 --- a/PhotoManager/PhotoManager.Tests/Unit/Constants.cs +++ b/PhotoManager/PhotoManager.Tests/Unit/Constants.cs @@ -243,27 +243,27 @@ public static class MD5Hashes public static class PHashes { public const string HOMER_GIF = - "a6aed62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a738962ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0abca685e0f877208957c61c928c5e761dbcaf783881028a11d8ad696231b8ee326225d"; + "a6aed672d7678a466b706dd7b6a6186e27a47e4b47e4b47e4b47e4b47e4b47e4b47e4ba73896753167c0e66c3b6e0c06aa976e14047e4b47e4b47e4b47e4b47e4b47e4b47e4babca685e0f877208957c61c928c5e761dbcaf783881028a11d8ad696231b8ee326225d"; public const string IMAGE_1_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_90_DEG_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_180_DEG_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_1_270_DEG_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd4f8456d8d85a8b4e0625f38d79862d57afbaa849d28fc2b8dc1262d9e619b3634e0"; public const string IMAGE_2_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add3d8456a8d85d8b4df625f38d79462e57afba2849d18fc388dc1662da0619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd3d8456a8d85d8b4df625f38d79462e57afba2849d18fc388dc1662da0619b3635dd"; public const string IMAGE_4_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add2d845678d8648b4df625f38d79362ee0afb9b849cf8fc488dc1b62da1619b462ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd2d845678d8648b4df625f38d79363099afb9b849cf8fc488dc1b62da1619b463808"; public const string IMAGE_5_JPG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add35845688d8668b4e1625f48d79562ee0afb9e849d08fc458dc1a62da1619b362ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd35845688d8668b4e1625f48d79562ee6afb9e849d08fc458dc1a62da1619b363667"; public const string IMAGE_8_JPEG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0add078455f8d8688b4db625f38d78b62de4afb8a849cc8fc608dc2362da4619b462ee0"; + "a505b8264166bb766a586d57f66c8a6d71947e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d7366c086d8d666e356db0047e4b47e4b47e4b47e4b47e4b47e4b47e4badd078455f8d8688b4db625f38d78b62de4afb8a849cc8fc608dc2362da4619b463574"; public const string IMAGE_10_PORTRAIT_PNG = - "a505b8264162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a58f7827fa62ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0adbc58451f8d8dd8b494625ee8d72362ee0afaff849b08fd348dc1f62dae619b262ee0"; + "a505b8264166b60669e56d4a066c086d66747e4b47e4b47e4b47e4b47e4b47e4b47e4ba58f7827fa66d1866bad6d83066df46d9c147e4b47e4b47e4b47e4b47e4b47e4b47e4badbc58451f8d8dd8b494625ee8d7236312bafaff849b08fd348dc1f62dae619b263a3f"; public const string IMAGE_11_90_DEG_HEIC = - "a640c83f2862ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0a6ca8840e162ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee062ee0b1adb820bf83d0a84a6188e178808d8d8c2a929e84a9d881418946b61cbc8d62a62080"; + "a640c83f2866d9066a896d78266f096d6ee47e4b47e4b47e4b47e4b47e4b47e4b47e4ba6ca8840e16700a66ca66db6f670546dbc047e4b47e4b47e4b47e4b47e4b47e4b47e4bb1adb820bf83d0a84a6188e178808d8d8c2a929e84a9d881418946b61cbc8d62a62080"; public const int LENGTH = 210; // The PHash is a 210-character hexadecimal string } From 96e62a396a3821dc4686a901175f6492a5c73489 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Berthier Date: Thu, 30 Jul 2026 02:48:38 +0200 Subject: [PATCH 3/3] Fix remaining PHash tests --- ...icatedAssetsThumbnailNotDuplicatesTests.cs | 4 +- ...onGetDuplicatedAssetsThumbnailPartTests.cs | 40 +++++---- ...uplicatedAssetsThumbnailResolutionTests.cs | 4 +- ...DuplicatedAssetsThumbnailThumbnailTests.cs | 14 +-- ...ssetsServiceThumbnailNotDuplicatesTests.cs | 4 +- ...plicatedAssetsServiceThumbnailPartTests.cs | 40 +++++---- ...edAssetsServiceThumbnailResolutionTests.cs | 4 +- ...tedAssetsServiceThumbnailThumbnailTests.cs | 14 +-- ...FindDuplicatedAssetsViewModelPHashTests.cs | 88 +++++++------------ .../Unit/Common/HashingHelperTests.cs | 2 +- 10 files changed, 104 insertions(+), 110 deletions(-) diff --git a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailNotDuplicatesTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailNotDuplicatesTests.cs index 85ef26ea..185f3fa4 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailNotDuplicatesTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailNotDuplicatesTests.cs @@ -521,13 +521,13 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_NotDuplicateSample3DHashDif new[] { FileNames._1336_JPG, FileNames._1337_JPG, FileNames._1349_JPG, FileNames._1350_JPG, FileNames._1413_JPG, - FileNames._1414_JPG, FileNames._1415_JPG, FileNames.IMAGE_1_JPG + FileNames._1414_JPG, FileNames._1415_JPG }, new string[] { }, new string[] { })] [TestCase(90, 1, new[] { FileNames._1336_JPG, FileNames._1337_JPG, FileNames._1349_JPG, FileNames._1350_JPG, FileNames._1413_JPG, - FileNames._1414_JPG, FileNames._1415_JPG, FileNames.IMAGE_1_JPG + FileNames._1414_JPG, FileNames._1415_JPG }, new string[] { }, new string[] { })] [TestCase(100, 1, new[] diff --git a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailPartTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailPartTests.cs index cb1f15bd..e9669497 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailPartTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailPartTests.cs @@ -528,30 +528,34 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_PartDHashDifferentThreshold FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG }, new[] { FileNames._1336_LEFT_PART_JPG, FileNames._1336_RIGHT_PART_JPG }, new string[] { })] - [TestCase(80, 1, + [TestCase(80, 3, new[] { - FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_PART_JPG, - FileNames._1336_BOTTOM_RIGHT_PART_JPG, FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, - FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_PART_JPG, - FileNames._1336_TOP_RIGHT_PART_JPG, FileNames.IMAGE_1_JPG - }, new string[] { }, new string[] { })] - [TestCase(90, 1, + FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_ORIGINAL_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG + }, + new[] { FileNames._1336_BOTTOM_PART_JPG, FileNames._1336_TOP_PART_JPG }, + new[] { FileNames._1336_LEFT_PART_JPG, FileNames._1336_RIGHT_PART_JPG })] + [TestCase(90, 3, new[] { - FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_PART_JPG, - FileNames._1336_BOTTOM_RIGHT_PART_JPG, FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, - FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_PART_JPG, - FileNames._1336_TOP_RIGHT_PART_JPG, FileNames.IMAGE_1_JPG - }, new string[] { }, new string[] { })] - [TestCase(100, 1, + FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_ORIGINAL_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG + }, + new[] { FileNames._1336_BOTTOM_PART_JPG, FileNames._1336_TOP_PART_JPG }, + new[] { FileNames._1336_LEFT_PART_JPG, FileNames._1336_RIGHT_PART_JPG })] + [TestCase(100, 2, new[] { - FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_PART_JPG, - FileNames._1336_BOTTOM_RIGHT_PART_JPG, FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, - FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_PART_JPG, - FileNames._1336_TOP_RIGHT_PART_JPG, FileNames.IMAGE_1_JPG - }, new string[] { }, new string[] { })] + FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, FileNames._1336_RIGHT_PART_JPG, + FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG + }, + new[] + { + FileNames._1336_BOTTOM_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_PART_JPG + }, new string[] { })] [TestCase(120, 1, new[] { diff --git a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailResolutionTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailResolutionTests.cs index 07bd933a..83e27460 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailResolutionTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailResolutionTests.cs @@ -438,13 +438,13 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_ResolutionDHashDifferentThr new[] { FileNames._1336_1_K_JPG, FileNames._1336_2_K_JPG, FileNames._1336_3_K_JPG, FileNames._1336_4_K_ORIGINAL_JPG, - FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG, FileNames.IMAGE_1_JPG + FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG })] [TestCase(90, 1, new[] { FileNames._1336_1_K_JPG, FileNames._1336_2_K_JPG, FileNames._1336_3_K_JPG, FileNames._1336_4_K_ORIGINAL_JPG, - FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG, FileNames.IMAGE_1_JPG + FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG })] [TestCase(100, 1, new[] diff --git a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailThumbnailTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailThumbnailTests.cs index edaee1bb..62c50121 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailThumbnailTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Application/FindDuplicatedAssets/ApplicationGetDuplicatedAssetsThumbnailThumbnailTests.cs @@ -379,20 +379,24 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_ThumbnailDHashDifferentThre new[] { FileNames.IMAGE_1336_MINI_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG, - FileNames.IMAGE_1336_SMALL_JPG, FileNames.IMAGE_1_JPG + FileNames.IMAGE_1336_SMALL_JPG }, new string[] { })] [TestCase(90, 1, new[] { FileNames.IMAGE_1336_MINI_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG, - FileNames.IMAGE_1336_SMALL_JPG, FileNames.IMAGE_1_JPG + FileNames.IMAGE_1336_SMALL_JPG }, new string[] { })] - [TestCase(100, 1, + [TestCase(100, 2, + new[] + { + FileNames.IMAGE_1_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG + }, new[] { FileNames.IMAGE_1336_MINI_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG, - FileNames.IMAGE_1336_SMALL_JPG, FileNames.IMAGE_1_JPG - }, new string[] { })] + FileNames.IMAGE_1336_SMALL_JPG + })] [TestCase(120, 1, new[] { diff --git a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailNotDuplicatesTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailNotDuplicatesTests.cs index 77ccb69a..c1c1a3cb 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailNotDuplicatesTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailNotDuplicatesTests.cs @@ -501,13 +501,13 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_NotDuplicateSample3DHashDif new[] { FileNames._1336_JPG, FileNames._1337_JPG, FileNames._1349_JPG, FileNames._1350_JPG, FileNames._1413_JPG, - FileNames._1414_JPG, FileNames._1415_JPG, FileNames.IMAGE_1_JPG + FileNames._1414_JPG, FileNames._1415_JPG }, new string[] { }, new string[] { })] [TestCase("90", 1, new[] { FileNames._1336_JPG, FileNames._1337_JPG, FileNames._1349_JPG, FileNames._1350_JPG, FileNames._1413_JPG, - FileNames._1414_JPG, FileNames._1415_JPG, FileNames.IMAGE_1_JPG + FileNames._1414_JPG, FileNames._1415_JPG }, new string[] { }, new string[] { })] [TestCase("100", 1, new[] diff --git a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailPartTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailPartTests.cs index 9fa9253c..e3bc5507 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailPartTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailPartTests.cs @@ -503,30 +503,34 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_PartDHashDifferentThreshold FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG }, new[] { FileNames._1336_LEFT_PART_JPG, FileNames._1336_RIGHT_PART_JPG }, new string[] { })] - [TestCase("80", 1, + [TestCase("80", 3, new[] { - FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_PART_JPG, - FileNames._1336_BOTTOM_RIGHT_PART_JPG, FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, - FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_PART_JPG, - FileNames._1336_TOP_RIGHT_PART_JPG, FileNames.IMAGE_1_JPG - }, new string[] { }, new string[] { })] - [TestCase("90", 1, + FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_ORIGINAL_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG + }, + new[] { FileNames._1336_BOTTOM_PART_JPG, FileNames._1336_TOP_PART_JPG }, + new[] { FileNames._1336_LEFT_PART_JPG, FileNames._1336_RIGHT_PART_JPG })] + [TestCase("90", 3, new[] { - FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_PART_JPG, - FileNames._1336_BOTTOM_RIGHT_PART_JPG, FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, - FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_PART_JPG, - FileNames._1336_TOP_RIGHT_PART_JPG, FileNames.IMAGE_1_JPG - }, new string[] { }, new string[] { })] - [TestCase("100", 1, + FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_ORIGINAL_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG + }, + new[] { FileNames._1336_BOTTOM_PART_JPG, FileNames._1336_TOP_PART_JPG }, + new[] { FileNames._1336_LEFT_PART_JPG, FileNames._1336_RIGHT_PART_JPG })] + [TestCase("100", 2, new[] { - FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_PART_JPG, - FileNames._1336_BOTTOM_RIGHT_PART_JPG, FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, - FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_PART_JPG, - FileNames._1336_TOP_RIGHT_PART_JPG, FileNames.IMAGE_1_JPG - }, new string[] { }, new string[] { })] + FileNames._1336_BOTTOM_LEFT_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_LEFT_PART_JPG, FileNames._1336_ORIGINAL_JPG, FileNames._1336_RIGHT_PART_JPG, + FileNames._1336_TOP_LEFT_PART_JPG, FileNames._1336_TOP_RIGHT_PART_JPG + }, + new[] + { + FileNames._1336_BOTTOM_PART_JPG, FileNames._1336_BOTTOM_RIGHT_PART_JPG, + FileNames._1336_RIGHT_PART_JPG, FileNames._1336_TOP_PART_JPG + }, new string[] { })] [TestCase("120", 1, new[] { diff --git a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailResolutionTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailResolutionTests.cs index 5f3d7867..e9682021 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailResolutionTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailResolutionTests.cs @@ -412,13 +412,13 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_ResolutionDHashDifferentThr new[] { FileNames._1336_1_K_JPG, FileNames._1336_2_K_JPG, FileNames._1336_3_K_JPG, FileNames._1336_4_K_ORIGINAL_JPG, - FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG, FileNames.IMAGE_1_JPG + FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG })] [TestCase("90", 1, new[] { FileNames._1336_1_K_JPG, FileNames._1336_2_K_JPG, FileNames._1336_3_K_JPG, FileNames._1336_4_K_ORIGINAL_JPG, - FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG, FileNames.IMAGE_1_JPG + FileNames._1336_8_K_JPG, FileNames._1336_THUMBNAIL_JPG })] [TestCase("100", 1, new[] diff --git a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailThumbnailTests.cs b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailThumbnailTests.cs index e239d1ff..50712ad3 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailThumbnailTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/Domain/Services/FindDuplicatedAssets/FindDuplicatedAssetsServiceThumbnailThumbnailTests.cs @@ -353,20 +353,24 @@ public void GetDuplicatesBetweenOriginalAndThumbnail_ThumbnailDHashDifferentThre new[] { FileNames.IMAGE_1336_MINI_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG, - FileNames.IMAGE_1336_SMALL_JPG, FileNames.IMAGE_1_JPG + FileNames.IMAGE_1336_SMALL_JPG }, new string[] { })] [TestCase("90", 1, new[] { FileNames.IMAGE_1336_MINI_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG, - FileNames.IMAGE_1336_SMALL_JPG, FileNames.IMAGE_1_JPG + FileNames.IMAGE_1336_SMALL_JPG }, new string[] { })] - [TestCase("100", 1, + [TestCase("100", 2, + new[] + { + FileNames.IMAGE_1_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG + }, new[] { FileNames.IMAGE_1336_MINI_JPG, FileNames.IMAGE_1336_ORIGINAL_JPG, FileNames.IMAGE_1336_SHIT_QUALITY_JPG, - FileNames.IMAGE_1336_SMALL_JPG, FileNames.IMAGE_1_JPG - }, new string[] { })] + FileNames.IMAGE_1336_SMALL_JPG + })] [TestCase("120", 1, new[] { diff --git a/PhotoManager/PhotoManager.Tests/Integration/UI/ViewModels/FindDuplicatedAssetsVM/FindDuplicatedAssetsViewModelPHashTests.cs b/PhotoManager/PhotoManager.Tests/Integration/UI/ViewModels/FindDuplicatedAssetsVM/FindDuplicatedAssetsViewModelPHashTests.cs index 3c8bece8..f0587156 100644 --- a/PhotoManager/PhotoManager.Tests/Integration/UI/ViewModels/FindDuplicatedAssetsVM/FindDuplicatedAssetsViewModelPHashTests.cs +++ b/PhotoManager/PhotoManager.Tests/Integration/UI/ViewModels/FindDuplicatedAssetsVM/FindDuplicatedAssetsViewModelPHashTests.cs @@ -621,7 +621,7 @@ List findDuplicatedAssetsViewModelInstances Asset[][] duplicatedAssetsSets = _application!.GetDuplicatedAssets(); - Assert.That(duplicatedAssetsSets, Has.Length.EqualTo(7)); + Assert.That(duplicatedAssetsSets, Has.Length.EqualTo(6)); // First set (6 items) Asset[] image1DuplicatesSet = @@ -633,27 +633,22 @@ List findDuplicatedAssetsViewModelInstances duplicatedAssetsSets.First(s => s.Any(a => a.FileName == _asset5!.FileName)); Assert.That(image5DuplicatesSet, Has.Length.EqualTo(2)); - // Third set (2 items) - Asset[] image7DuplicatesSet = - duplicatedAssetsSets.First(s => s.Any(a => a.FileName == _asset7!.FileName)); - Assert.That(image7DuplicatesSet, Has.Length.EqualTo(2)); - - // Fourth set (3 items) + // Third set (3 items) Asset[] image13DuplicatesSet = duplicatedAssetsSets.First(s => s.Any(a => a.FileName == _asset13!.FileName)); Assert.That(image13DuplicatesSet, Has.Length.EqualTo(3)); - // Fifth set (2 items) + // Fourth set (2 items) Asset[] image15DuplicatesSet = duplicatedAssetsSets.First(s => s.Any(a => a.FileName == _asset15!.FileName)); Assert.That(image15DuplicatesSet, Has.Length.EqualTo(2)); - // Sixth set (4 items) + // Fifth set (4 items) Asset[] image24DuplicatesSet = duplicatedAssetsSets.First(s => s.Any(a => a.FileName == _asset24!.FileName)); Assert.That(image24DuplicatesSet, Has.Length.EqualTo(4)); - // Seventh set (2 items) + // Sixth set (2 items) Asset[] image26DuplicatesSet = duplicatedAssetsSets.First(s => s.Any(a => a.FileName == _asset26!.FileName)); Assert.That(image26DuplicatesSet, Has.Length.EqualTo(2)); @@ -722,7 +717,6 @@ List findDuplicatedAssetsViewModelInstances DuplicatedSetViewModel duplicatedAssetSet4 = []; DuplicatedSetViewModel duplicatedAssetSet5 = []; DuplicatedSetViewModel duplicatedAssetSet6 = []; - DuplicatedSetViewModel duplicatedAssetSet7 = []; // First set DuplicatedAssetViewModel duplicatedAssetViewModel1 = new() @@ -783,100 +777,85 @@ List findDuplicatedAssetsViewModelInstances duplicatedAssetSet2.Add(duplicatedAssetViewModel8); // Third set - DuplicatedAssetViewModel duplicatedAssetViewModel9 = new() - { - Asset = _asset7, - ParentViewModel = duplicatedAssetSet3 - }; - duplicatedAssetSet3.Add(duplicatedAssetViewModel9); - - DuplicatedAssetViewModel duplicatedAssetViewModel10 = new() - { - Asset = _asset9, - ParentViewModel = duplicatedAssetSet3 - }; - duplicatedAssetSet3.Add(duplicatedAssetViewModel10); - - // Fourth set DuplicatedAssetViewModel duplicatedAssetViewModel11 = new() { Asset = _asset13, - ParentViewModel = duplicatedAssetSet4 + ParentViewModel = duplicatedAssetSet3 }; - duplicatedAssetSet4.Add(duplicatedAssetViewModel11); + duplicatedAssetSet3.Add(duplicatedAssetViewModel11); DuplicatedAssetViewModel duplicatedAssetViewModel12 = new() { Asset = _asset21, - ParentViewModel = duplicatedAssetSet4 + ParentViewModel = duplicatedAssetSet3 }; - duplicatedAssetSet4.Add(duplicatedAssetViewModel12); + duplicatedAssetSet3.Add(duplicatedAssetViewModel12); DuplicatedAssetViewModel duplicatedAssetViewModel13 = new() { Asset = _asset22, - ParentViewModel = duplicatedAssetSet4 + ParentViewModel = duplicatedAssetSet3 }; - duplicatedAssetSet4.Add(duplicatedAssetViewModel13); + duplicatedAssetSet3.Add(duplicatedAssetViewModel13); - // Fifth set + // Fourth set DuplicatedAssetViewModel duplicatedAssetViewModel14 = new() { Asset = _asset15, - ParentViewModel = duplicatedAssetSet5 + ParentViewModel = duplicatedAssetSet4 }; - duplicatedAssetSet5.Add(duplicatedAssetViewModel14); + duplicatedAssetSet4.Add(duplicatedAssetViewModel14); DuplicatedAssetViewModel duplicatedAssetViewModel15 = new() { Asset = _asset23, - ParentViewModel = duplicatedAssetSet5 + ParentViewModel = duplicatedAssetSet4 }; - duplicatedAssetSet5.Add(duplicatedAssetViewModel15); + duplicatedAssetSet4.Add(duplicatedAssetViewModel15); - // Sixth set + // Fifth set DuplicatedAssetViewModel duplicatedAssetViewModel16 = new() { Asset = _asset24, - ParentViewModel = duplicatedAssetSet6 + ParentViewModel = duplicatedAssetSet5 }; - duplicatedAssetSet6.Add(duplicatedAssetViewModel16); + duplicatedAssetSet5.Add(duplicatedAssetViewModel16); DuplicatedAssetViewModel duplicatedAssetViewModel17 = new() { Asset = _asset25, - ParentViewModel = duplicatedAssetSet6 + ParentViewModel = duplicatedAssetSet5 }; - duplicatedAssetSet6.Add(duplicatedAssetViewModel17); + duplicatedAssetSet5.Add(duplicatedAssetViewModel17); DuplicatedAssetViewModel duplicatedAssetViewModel18 = new() { Asset = _asset28, - ParentViewModel = duplicatedAssetSet6 + ParentViewModel = duplicatedAssetSet5 }; - duplicatedAssetSet6.Add(duplicatedAssetViewModel18); + duplicatedAssetSet5.Add(duplicatedAssetViewModel18); DuplicatedAssetViewModel duplicatedAssetViewModel19 = new() { Asset = _asset31, - ParentViewModel = duplicatedAssetSet6 + ParentViewModel = duplicatedAssetSet5 }; - duplicatedAssetSet6.Add(duplicatedAssetViewModel19); + duplicatedAssetSet5.Add(duplicatedAssetViewModel19); - // Seventh set + // Sixth set DuplicatedAssetViewModel duplicatedAssetViewModel20 = new() { Asset = _asset26, - ParentViewModel = duplicatedAssetSet7 + ParentViewModel = duplicatedAssetSet6 }; - duplicatedAssetSet7.Add(duplicatedAssetViewModel20); + duplicatedAssetSet6.Add(duplicatedAssetViewModel20); DuplicatedAssetViewModel duplicatedAssetViewModel21 = new() { Asset = _asset27, - ParentViewModel = duplicatedAssetSet7 + ParentViewModel = duplicatedAssetSet6 }; - duplicatedAssetSet7.Add(duplicatedAssetViewModel21); + duplicatedAssetSet6.Add(duplicatedAssetViewModel21); List expectedDuplicatedAssetsSets = [ @@ -885,8 +864,7 @@ List findDuplicatedAssetsViewModelInstances duplicatedAssetSet3, duplicatedAssetSet4, duplicatedAssetSet5, - duplicatedAssetSet6, - duplicatedAssetSet7 + duplicatedAssetSet6 ]; _findDuplicatedAssetsViewModel!.SetDuplicates( @@ -899,7 +877,7 @@ List findDuplicatedAssetsViewModelInstances expectedDuplicatedAssetsSets, 0, 0, - duplicatedAssetSet6, + duplicatedAssetSet5, duplicatedAssetViewModel16); Assert.That(notifyApplicationVmPropertyChangedEvents, Has.Count.EqualTo(197)); @@ -1120,7 +1098,7 @@ List findDuplicatedAssetsViewModelInstances expectedDuplicatedAssetsSets, 0, 0, - duplicatedAssetSet6, + duplicatedAssetSet5, duplicatedAssetViewModel16); } } diff --git a/PhotoManager/PhotoManager.Tests/Unit/Common/HashingHelperTests.cs b/PhotoManager/PhotoManager.Tests/Unit/Common/HashingHelperTests.cs index 7497ffd2..51c0bae3 100644 --- a/PhotoManager/PhotoManager.Tests/Unit/Common/HashingHelperTests.cs +++ b/PhotoManager/PhotoManager.Tests/Unit/Common/HashingHelperTests.cs @@ -440,7 +440,7 @@ public void CalculateHammingDistance_SameHashes_ReturnsZero(string hash) [Test] [TestCase(Hashes.IMAGE_1_JPG, Hashes.IMAGE_1_90_DEG_JPG, 118)] // SHA512 - [TestCase(PHashes.IMAGE_1_JPG, PHashes.IMAGE_10_PORTRAIT_PNG, 27)] // PHash + [TestCase(PHashes.IMAGE_1_JPG, PHashes.IMAGE_10_PORTRAIT_PNG, 57)] // PHash [TestCase(DHashes.IMAGE_1_JPG, DHashes.IMAGE_10_PORTRAIT_PNG, 14)] // DHash [TestCase(MD5Hashes.IMAGE_1_JPG, MD5Hashes.IMAGE_1_90_DEG_JPG, 32)] // MD5Hash public void CalculateHammingDistance_DifferentHashes_ReturnsCorrectDistance(string hash1, string hash2,