From 4ba1982d745f0d532ead090177051d928465ed03 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Tue, 9 Jun 2020 23:03:30 -0700
Subject: [PATCH] Added test for issue #156

---
 .../database/Photos.sqlite-shm                | Bin 32768 -> 32768 bytes
 .../database/Photos.sqlite-wal                | Bin 3683312 -> 4095312 bytes
 .../CLSBusinessCategoryCache.POI.sqlite-shm   | Bin 32768 -> 32768 bytes
 .../CLSBusinessCategoryCache.POI.sqlite-wal   | Bin 2966432 -> 2970552 bytes
 .../caches/graph/changetoken.plist            | Bin 605 -> 605 bytes
 .../resources/journals/Folder-change.plj      | Bin 648 -> 1214 bytes
 .../resources/journals/HistoryToken.plist     | Bin 552 -> 552 bytes
 tests/test_catalina_10_15_5.py                |  16 ++++++++++++++++
 8 files changed, 16 insertions(+)

diff --git a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-shm b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-shm
index 3b514a9559af77b7027ef13d7ceeab3a2449e8e1..03ccd4abc981c480e3a7bc56556e4e0781217e8e 100644
GIT binary patch
delta 1481
zcmds#TWnNS6o%JY+XgykhSVZp)N!0BR1q{W1z!l1wldNSX(@~?sbz40dVzqgG*&4c
zD<Y1=b(K;P7@!wRsYpHJh!soArCv}(TMHr%I1<8(5BdPU2(G>31M$sQce2j;{(t>z
zpX{6+3Q;IT^>-#GgI-Ds0n(BJbp%i|+;*~ZO2>UwMT3_g9CQ6z%KVFCkEUPs{nxzN
zTpoJgo42fgd<AP%cf$?W82L5~N$IzI9!5xcx!5_QWmzh^R*F?6wOXo<f44mUa{8Yw
zw2NMH;Q#)?6S5-M%H3H}*F4w)vv3s+(lqt0IJ3E9W&(SJyxfspq3YFZ!fu|B6TqmD
z$C?QDU_R}qbk!z0%0;<OJR>xl+jFntr$Xbn{fPzGAap-JFe`w2ggn;6;Kl;#q|vHf
zbd=}#ocNuPJGBgI=`3ZbK~aT#+84tkLSAltGJ$)AJk}(*7YpeC-J#wS9p!?&QTV;k
z-CUD*X2g)XDEH!5UNrL|D;qK~Nc}WXeWv%Y_vMd7>=4{*7Zg5**lXN9bHv?m+`OW(
z=>9=n(pUGEl?zjG2_2_N>ZqQ;54bz0g#RdxVW(&h56nG`jY2*iD2ZdA@pjIuz}F4k
zH9w38guGTN?1IU(fv(Y;qN_RA?^oN@IpGXG;g4azPVtVX61Y#u!_B3muuI78a=>nQ
zgf`N33aa(uyvW&Qe$}LY6wcsdWpO;FC+y}0a+dc6y_N-0c$7BLpY)dKYR)PzRom5h
z;qly89>?Qmpy_EDIH(7>ufl<06P>=WR5h!gOtg1l98Z{NV?d&EbcyyZa^Tx0I_;TK
z^^UrrqbcL?HdrfE%;~`Zo)q%%)?g;?GIS*v!$U$|KC*ZuMhsn9+@*G?pM}SB&k_f|
zA(YQ)O9MC{<gqs|bs%<Y<eo|gZZLGYGJ)%KP~Wti5?29)VLC3SQ<SMb*9rXC{Ga4=
zar{tgD-Bv8lN#wS+Guu2J|Dq%g?t=;A%<TFdF{wDIi0Q1x*b|!3T>ksv`NS9OUvhC
z%CPzkei50$6)T+hrD=p$$V|-4q(d7_r6#&bn{|s5D`U7@s9K#>NqLuWd6g5t(mi{9
zm5hBP=(R>eJ3LO?3Dg$Tx=<ZPJY{g*DoMq4iVxK|aH}!T*GT_sgKJ-wzMNG02WuV3
z+T?S!Jt-lzQzb;r;Ne#y_>BoSyei?tI&62X7Hl!;p}Gj3HvP~VF+b6L?yUF!4Xo7*
A4FCWD

delta 1258
zcmd^;Ye*DP6vyuz1)DWvTYE^DjGL&L7Q|*>L|k{$WnFE3w5gb{^+B0vzQ{6NBqA1j
z9y5v3C=)ZYY{J4qv_b+QB%>liViW005Pr~t((b)8lwbSYz|8DD=Xd|-f6kqCyTR>-
zmLP8oVOIdX1w!=AK7=#@y^j=6-tBwxt;R7u8@YaQ!TYmfUiVV|@vl4=rw^vPyyDX0
zJ|qH$T9*Pa%NnLQ>U6^Y@jyr2AVwy5@PVa^PCkoVAW1?!OhX(FSyHgiJVP@^>`TnY
z46B6UmO{Fg#3&Lhq`+-3P^uf#<TW&E!(RCdeFtIho?Lt_hhbQfN^c{Z1v~UZAgArg
zj1KY3A&u}35@>8MzDj;bV@B+;vU-vjO+tiJxC86>4x3F+qruo<oAOhS>oXRaw~C3x
zB)DK4qA0aRxskF;pja1Hn|&2~>Q1&WD%aCiL~V`@ENT#C5-XI#bBJa;g?l(|$;A0|
z=0U=VjK}nC#fi*ezP_5J_P%K!o03r!$u$xKXJ7%-tr0k7NkiG`q?ssu;Z(c0vY&T>
zo!Puoe;w%}+u<xMf{WIx#l#$yf0n~5D4n_7qfzuH-DC%xgYSQ&6Y{d@C?jz!PenTp
zs3?x*>*$Gu^ZM}xDl}T4LhXebG+Oi*iYw-j&ql$Qw`*|m!@-L#6K`|QrJ8?QvWf~D
zajs;5R~{)<HLA_ws4wGtl=EdeHb)6Z%2`sv+433ghC;#=llQk14~Z8lVG>NV=TPAh
zFX}zW9g2E#lbE0#e$hrl(R-+ks#$Tkf?H794r}vROM1vIxCBcKQ$AH@2=veUm7P82
zSFL6a6i=1L8ptgY3mve`C1<Lc6#EvUF|S5NPuFN@An7H$;W7~BO!-*r;ms(g>b0@m
zZ_sh=4-H!8<WVg%*vK>ZzHx*SGQK^=oJ&gUaTQPon)nY1-<(i0?q+Rke~a@s;ylhm

diff --git a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-wal b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-wal
index db3b7d87d5f6b9fc3e7d93b040986bd21041e194..a3a8fac99036945119acd9f0b5753a72dea2c314 100644
GIT binary patch
delta 5657
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

delta 123
zcmV~$H&Oxt006)_ksKsvB!gt(NYA6#C-D%TU`KncRO~)p|3UQp3vL1*Vm`$sB&DQf
zWaZ=)d?_j^tEj4}YiMd|>*(tF);BOTGBz<aGxuX*X=QC=Yv<SALFnk@>~g<G;Tvvi
BDr^7%

diff --git a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
index 7c42481d2d019b2292644a8bb539140e2c4f9417..78d7e2556d283f592d8d90ce06080851934ff21e 100644
GIT binary patch
delta 167
zcmZo@U}|V!s+V}A%K!q55G-(!iGe`?$Ud=OpwFFQo#8s`sOu-!?pw`&(Q$SC<)$oB
z)q~6i0g$=>kpM)Lfr;V5#zuGUi3?aZpWrq!-~7*M9xKyDrp*_*T~szd%8?TW0FGoi
AEdT%j

delta 165
zcmZo@U}|V!s+V}A%K!q55G-(kiGe`?$llwg`I2)s=i+tNQP)qd-M4z%&vTb<#kRze
ysvcxE2!PD}j|3p13``8?H#WL+Z$86qWIp);H_PUKPV-ndU*vXE+59L+P8a}YV>}lC

diff --git a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
index f841cc00aac38e344b586ef0ecc35a7eb7413c94..accec77af0ef941eed30fedd113c520b379ce2c3 100644
GIT binary patch
delta 132
zcmV~$xebC~7=U3vFFa7dTT#IquS92{uyp{3v3L_FFtmSXXQL!`wDv6E2yOt+qi&&m
z9-&+jvgF89pom6^G8L-m)Tm=%V$q;Ui#8p)^yo9dX2^&!4lWa>%$T!a$qJ7(8@BA;
fd*uh`i)U$O^gTW^r{JGBw#0Yc^(B7&4$4RYLJlnB

delta 101
zcmV~$*A0SD006)|6??DPu`A*fF6PH2uEC!RNaA?j{XRv=-$i%{O3ErCRW)@DO)YI5
mT|IpRLnC7oQ!}x-g{76XjjhDa-oeqy*~QgO>Mr{}^5-9r`5?sr

diff --git a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
index 842aacf224e0026786bca956a77970946f07db00..c51bd8abd93decb86472d9c027fb88c6a6353805 100644
GIT binary patch
delta 14
Vcmcc1a+hU;5F_KK&BBaci~uNr1d9Lw

delta 14
Vcmcc1a+hU;5F_J<&BBaci~uNf1c?9u

diff --git a/tests/Test-10.15.5.photoslibrary/resources/journals/Folder-change.plj b/tests/Test-10.15.5.photoslibrary/resources/journals/Folder-change.plj
index bdec336d64b95c9540acf6514f3cb766397cc128..bfc0debb95671364ee53c5c34db4c518ca5a51a3 100644
GIT binary patch
delta 348
zcmeBR-N(71gQ?!3ZxMq$2ZNBnrH@NImcDV_xZ?7HhuSH-o+&VDY-2Q-y#K;K#-xIr
z%;FLQgX@e;%q*;I>>Qk2+&sK|vB{;yCHc9*`9&q(sg+>`nR$7sDe(fr2w}(K<kY;B
z%)IoN<f7EXlFa-(m&B6P(2~rOoYe5lypW>AxZ;eE?999r0R|vsG<H1X5!NzuqJ6vo
ze`p?9S&D*Neojhi5r-iE0uFIi9Vh?L*rb%SjKby?1~6b`gwPE9P#Q+HJFL4g@w6nz
z6-I+ECl23bocKn8al+)Mj13rGom|VP<hs#8T9QGIgAr>;I2s&mywb%13y6!1Ob}1R
Z1eE3$0Nt<PmROX_!7Vtsfl;1O4gmIhd6EDC

delta 7
OcmdnT*}=M@g9!i&O#+Vq

diff --git a/tests/Test-10.15.5.photoslibrary/resources/journals/HistoryToken.plist b/tests/Test-10.15.5.photoslibrary/resources/journals/HistoryToken.plist
index 9b4deea4847c3ee360c052d31c158637fb797a07..b010c3dcfdad0619a5a7c6f9842866e0017695ad 100644
GIT binary patch
delta 14
VcmZ3%vVvs;J0s(#%^Zvhi~u4#1K|Jw

delta 14
VcmZ3%vVvs;J0s(V%^Zvhi~u4p1K$7u

diff --git a/tests/test_catalina_10_15_5.py b/tests/test_catalina_10_15_5.py
index 8504f1f5..0efc3cdf 100644
--- a/tests/test_catalina_10_15_5.py
+++ b/tests/test_catalina_10_15_5.py
@@ -65,6 +65,12 @@ UUID_DICT = {
     "export_tif": "8846E3E6-8AC8-4857-8448-E3D025784410",
 }
 
+UUID_PUMPKIN_FARM = [
+    "F12384F6-CD17-4151-ACBA-AE0E3688539E",
+    "D79B8D77-BFFC-460B-9312-034F2877D35B",
+    "1EB2B765-0765-43BA-A90C-0D0580E6172C",
+]
+
 
 def test_init1():
     # test named argument
@@ -407,6 +413,16 @@ def test_keyword_not_in_album():
     assert photos3[0].uuid == "A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C"
 
 
+def test_album_folder_name():
+    """Test query with album name same as a folder name """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+
+    photos = photosdb.photos(albums=["Pumpkin Farm"])
+    assert sorted(p.uuid for p in photos) == sorted(UUID_PUMPKIN_FARM)
+
+
 def test_get_db_path():
     import osxphotos