From d8c064857fc8ac0c1bc3d7fc2c2f74a606324835 Mon Sep 17 00:00:00 2001
From: kagahd <kay.agahd@idealo.de>
Date: Tue, 12 Mar 2024 08:48:55 +0100
Subject: [PATCH] re-enable unit test that keywords from photo are merged with
 keywords from sidecar

---
 .../assets/sidecar/metadata.jpg_original      | Bin 4489 -> 0 bytes
 test/backend/assets/sidecar/metadata_v2.jpg   | Bin 4489 -> 5095 bytes
 .../assets/sidecar/metadata_v2.jpg.json       |   4 ++--
 .../model/threading/MetaDataLoader.spec.ts    |   3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 test/backend/assets/sidecar/metadata.jpg_original

diff --git a/test/backend/assets/sidecar/metadata.jpg_original b/test/backend/assets/sidecar/metadata.jpg_original
deleted file mode 100644
index c3d685e8df29ddfb9a23c6594e593a328e74acc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4489
zcmeHKS!^3c7@j?RZ7YZy*GUa1+jWyV5%#V(Nn5XMhbE~TR|?8eXn?2ndTnoFd)@U0
zyOt12ISRama=(Rg_N|n1K0u+IZ!K4k7s64Fhtfd9Q4nU<b~aA2DuXJ)gU1^ApPBFf
z=l{NcN17>~EPf7}c7(zqfFKAMf<I84$FOaADF#3|+y%@402HtY3T)8ofL+>$0|fqa
zu-^bX%dkBh!*c9q(z}K8_Hw=5a8_#=z>qT52uBE7wkM&DR_s|+!@)hP^MFuogW?%5
z0F1c7Xuyp|gVAI%nu#WYuviG&RadWWYO%Gpw%F`;$93&(j%%FP+U?}^q_bmVXIJOC
zHaFvTG3~BSmlgyunM{P4XeNkem&5LG{o_`A6Iji_00<1B0BS`rD^ffL+F+grsG25R
zr6DK=^EH_*#3~3l(gaWh!%!SE7;qe-?||z7w;I;0_ii;dkMbsJw~d{doijW84;@`Q
zcKrN??ufG2LfBhc*E!ldHo7{ydU`i)-s0m12DgQ_4~2J(@4V^eT@$z5Dn!LtJRwbH
z)#=-F`8|cZ?!M>VefQn}z=QiAdiaq?AA9_XCl5UJ^fS*s_x!;Z4!?NhrI%lM^|iO&
zKK9PL@4f%QhbKPz_>)gRJ9+B#{1;z-_4V0rzWwg|g&%*qu=w*Yzy5Yn<AuPoEwwVS
zOL$o!FBHcy+@$eB&>ZZT6*sK+8rN(cHSxQfDR#ze>z|!FbkySP9y`A_q8ume8+zv3
z7c^=mX7v%<`>&Yk#FlxT2CFdy77w$6J}|R*+Xdz9xsW(=F#P+06NiIm`u<ql|L4V?
z(TVNC+_^i8r;78d780tO;b=OY_3%+SB6<WlMd$ep?e#D;@b~32yf7uIWJHWh=>YY^
z>u*q`6b(?jdWV_e%z&7Xh6;)}Ubu0mP?!>YQK~OU`14#ol}U*zPv%p}be78ps8Vna
z+S)WtktK*a6`&@DN5}zL5y?#+#=}rSf+R`55{+?VgQ1E$90jOKp1EAklk4`#N}Trk
zd_J0CX_j?Eggd(@t@3$yI_oS4S&B0#W(7scsFIu}wYYplo>l`CrER3QN}j2VzEMp<
zYB>!{f+A<-m^zY>Rk_+fwX{+aHKQ$;WUUn?D(Ie>X(d@A7!_zSDW=4<nuUH|x|Uy3
z(fw9roRs1TRgqyawL<EOK*D}l8*YqOrF1;V`01+AvLgPKq^jVx7pgp?0+*eROp1b9
zDy6P)siysWeC4c`k5-hV6pSThS@F}A(Q?Fcge6o&mZxfi%CjqX@Y6NZ@h257A&CmF
z2nk8xljHxRgfE|3nPk-`T|O@*)!>1FXOGqo-`|whYjGuwOAB=+W9zXRo9I&1V>INd
zM<pH8kV}`M9-|>wJu2y#hFrQ7^%xDg>QPC@Tuv@x`T8!V;hjAPFXxT-X5+nC_^;lZ
Fe*t<S<^uo#

diff --git a/test/backend/assets/sidecar/metadata_v2.jpg b/test/backend/assets/sidecar/metadata_v2.jpg
index c3d685e8df29ddfb9a23c6594e593a328e74acc1..6afec58115942368f87ec1c9867e4fa370454cb7 100644
GIT binary patch
delta 722
zcmeBFey%=2oH1mgga+e;iH_o-tPBhj*cn(D7#IwUjE$HlFfoV#*)>4SI1wVw$i&RR
zumGyY(7=Fk0W$+5Q2zgaAOQqM21X`U2F6x~h6+XoRz{{)rX~|(#Tj>PEM3CH%JBao
z@4v|pSVSfpGD~Kwzu&!IT_H2YRz2L**TA>HIW;5GqpB!1xXLdixhgx^GDY3qj?1RP
zsv@@_H?<^Dp&~aYuh^=>Ry{E#KPlA;$OZ}Pt1Ez&lw{kgd*&vlr&?LLR%E7y<mcxo
z7#iuBS*qJ{P2R{X%&0#3D6=*TkjFLo2eXW{x;mEv)JWgV<f8oI{IrsQjQo;(TlL9#
zEQ-t^Z3e6+A~yO(DQQ+Nsl~}fnFS@8`FT(S_>l}qNd{_K!J;4!)TE$blag#zT$+@X
znp^_nD%gMwa7s)E8tBa?Ke?1m(g0#8SPUqykD`GX3v-Hq7CvB60=tr*O^yrG4sIkn
zCa+|Z#pw|NB##uNq=5|<Nd&U=4fTxmAwB}~telHd6G8rWNi0dV1I4qhfw8WkVF)aq
zwG9ld41hkvP|F4MA@(ptwi+1A5UaT>5(|J<8-T2y%)=@tj79h6hiu{;n=f!zGEV-<
Q$H%H(4ooT==hQL*0B#-6tpET3

delta 582
zcmaE^-l;r6oRN8=ga)I-L`QK}1`wFIR-7?w<IyEdEdL*Jf1I4htgEc_e)oPQh0GLN
zrEpVU1K$GY)Qn7zs-o23D!-8As_bOT6s5`gn8low5>xV%Qmyiet#VUK67`i7Dy%AU
z3rezWl_Got6rA&mQWebf4D<|??6?#Z6l{u8(yW49+!QKubAVcaJX@v7QY_jW5NQR4
z$@^Gkq?D9EYT*E)7HBF^Z633X3N~5a%;ci{;{3FdfQ<Z-e4xSx7DY*YY${WdfwJPP
z3KG~PbBchHFIkniVD16BXd1g5C(JE2lMk?nP2S5QZ3Y)fNwz93P0C75E&=-xCJync
zQ(`)b=;Sa~d3LCh$%U-4MhNBlprAojZ=;XJ@X35^a&ic5n7V*YMzcj8p&Y9%lLgtN
rC4p*ez_Ko>#mPmP1tppJd0@A1KF%)AF*!_-pH-<`$=+_`n_4CSHocIl

diff --git a/test/backend/assets/sidecar/metadata_v2.jpg.json b/test/backend/assets/sidecar/metadata_v2.jpg.json
index 5c544af4..e66ce699 100644
--- a/test/backend/assets/sidecar/metadata_v2.jpg.json
+++ b/test/backend/assets/sidecar/metadata_v2.jpg.json
@@ -3,8 +3,8 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
-  "fileSize": 4489,
+  "creationDate": 1710188754000,
+  "fileSize": 5095,
   "keywords": [
     "floor",
     "book",
diff --git a/test/backend/unit/model/threading/MetaDataLoader.spec.ts b/test/backend/unit/model/threading/MetaDataLoader.spec.ts
index 298c6582..e0b0b8c6 100644
--- a/test/backend/unit/model/threading/MetaDataLoader.spec.ts
+++ b/test/backend/unit/model/threading/MetaDataLoader.spec.ts
@@ -155,7 +155,8 @@ describe('MetadataLoader', () => {
 
   it('should merge keywords from photo with keywords from sidecar', async () => {
     const data = await MetadataLoader.loadPhotoMetadata(path.join(__dirname, '/../../../assets/sidecar/metadata_v2.jpg'));
-    const expected = require(path.join(__dirname, '/../../../assets/sidecar/metadata_v2.jpg.json')); //"metadata_v2.jpg" is identical to "metadata.jpg" and "metadata_v2.xmp" contains 2 different keywords    expect(Utils.clone(data)).to.be.deep.equal(expected);
+    const expected = require(path.join(__dirname, '/../../../assets/sidecar/metadata_v2.jpg.json')); //"metadata_v2.jpg" is identical to "metadata.jpg" and "metadata_v2.xmp" contains 2 different keywords
+    expect(Utils.clone(data)).to.be.deep.equal(expected);
   });