Skip to content

Commit 31ef507

Browse files
AnEnglishmanInNorwayAnEnglishmanInNorway
authored
Merge pull request #220 from AnEnglishmanInNorway/flakeerror
fixes #218, missing cliparts in the clipart test
2 parents d54b440 + 75e950f commit 31ef507

File tree

20 files changed

+116
-158
lines changed

20 files changed

+116
-158
lines changed

‎cewe2pdf.pyproj‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProjectGuid>{261b8fb1-634c-480e-b162-8b5b56d18330}</ProjectGuid>
77
<ProjectHome />
8-
<StartupFile>tests\unittest_fotobook\test_simpleBook.py</StartupFile>
8+
<StartupFile>runAllTests.py</StartupFile>
99
<SearchPath />
1010
<WorkingDirectory>.</WorkingDirectory>
1111
<OutputPath>.</OutputPath>
@@ -32,6 +32,17 @@
3232
<Content Include="tests\Resources\photofun\backgrounds\212.jpg" />
3333
<Content Include="tests\Resources\photofun\backgrounds\6001.jpg" />
3434
<Content Include="tests\Resources\photofun\backgrounds\6044.jpg" />
35+
<Content Include="tests\Resources\photofun\decorations\106793\106793.json" />
36+
<Content Include="tests\Resources\photofun\decorations\106793\8394-DECO-SF\8394-DECO-SF-clip.clp" />
37+
<Content Include="tests\Resources\photofun\decorations\106793\8394-DECO-SF\8394-DECO-SF-mask.clp" />
38+
<Content Include="tests\Resources\photofun\decorations\106793\8394-DECO-SF\8394-DECO-SF-preview.clp" />
39+
<Content Include="tests\Resources\photofun\decorations\106793\8394-DECO-SF\8394-DECO-SF.xml" />
40+
<Content Include="tests\Resources\photofun\decorations\106796\106796.json" />
41+
<Content Include="tests\Resources\photofun\decorations\106796\8397-DECO-SF\8397-DECO-SF-clip.clp" />
42+
<Content Include="tests\Resources\photofun\decorations\106796\8397-DECO-SF\8397-DECO-SF-mask.clp" />
43+
<Content Include="tests\Resources\photofun\decorations\106796\8397-DECO-SF\8397-DECO-SF-preview.clp" />
44+
<Content Include="tests\Resources\photofun\decorations\106796\8397-DECO-SF\8397-DECO-SF.xml" />
45+
<Content Include="tests\Resources\photofun\decorations\11744-CLIP-CC.xml" />
3546
<Content Include="tests\Resources\photofun\decorations\127517\12678-DECO-CC\12678-DECO-CC-clip.clp" />
3647
<Content Include="tests\Resources\photofun\decorations\127517\12678-DECO-CC\12678-DECO-CC-mask.clp" />
3748
<Content Include="tests\Resources\photofun\decorations\127517\12678-DECO-CC\12678-DECO-CC-preview.clp" />
@@ -43,6 +54,17 @@
4354
<Content Include="tests\Resources\photofun\decorations\46537\46537.json" />
4455
<Content Include="tests\Resources\photofun\decorations\46537\Kreis\Kreis.clp" />
4556
<Content Include="tests\Resources\photofun\decorations\46537\Kreis\Kreis.xml" />
57+
<Content Include="tests\Resources\photofun\decorations\5351-Clip-GD.xml" />
58+
<Content Include="tests\Resources\photofun\decorations\63457\63457.json" />
59+
<Content Include="tests\Resources\photofun\decorations\63457\line_single_black\line_single_black.clp" />
60+
<Content Include="tests\Resources\photofun\decorations\63457\line_single_black\line_single_black.xml" />
61+
<Content Include="tests\Resources\photofun\decorations\7065-CLIP-SF.xml" />
62+
<Content Include="tests\Resources\photofun\decorations\circle.xml" />
63+
<Content Include="tests\Resources\photofun\decorations\customClipart1.xml" />
64+
<Content Include="tests\Resources\photofun\decorations\customClipart2.xml" />
65+
<Content Include="tests\Resources\photofun\decorations\rect_lightyellow.xml" />
66+
<Content Include="tests\Resources\photofun\decorations\rect_terracotta.xml" />
67+
<Content Include="tests\Resources\photofun\decorations\rect_white.xml" />
4668
<Content Include="tests\Resources\photofun\fonts\LiberationSans-BaDn.ttf" />
4769
<Content Include="tests\Resources\photofun\fonts\LiberationSansBold-1adM.ttf" />
4870
<Content Include="tests\Resources\photofun\fonts\LiberationSansBoldItalic-ngV4.ttf" />
@@ -200,6 +222,12 @@
200222
<Folder Include="tests\hps\5026\addons\63488\cliparts\" />
201223
<Folder Include="tests\hps\5026\addons\63488\cliparts\v1\" />
202224
<Folder Include="tests\hps\5026\addons\63488\cliparts\v1\decorations\" />
225+
<Folder Include="tests\Resources\photofun\decorations\106793\" />
226+
<Folder Include="tests\Resources\photofun\decorations\106793\8394-DECO-SF\" />
227+
<Folder Include="tests\Resources\photofun\decorations\106796\" />
228+
<Folder Include="tests\Resources\photofun\decorations\106796\8397-DECO-SF\" />
229+
<Folder Include="tests\Resources\photofun\decorations\63457\" />
230+
<Folder Include="tests\Resources\photofun\decorations\63457\line_single_black\" />
203231
<Folder Include="tests\Resources\photofun\fonts\" />
204232
<Folder Include="tests\Resources\photofun\fonts\misc\" />
205233
<Folder Include="tests\testfontsubstitution\" />

‎tests/Resources/photofun/decorations/106793/106793.json‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎tests/Resources/photofun/decorations/106796/106796.json‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎tests/Resources/photofun/decorations/1134365/19675-CLIP-AS/19675-CLIP-AS.clp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a3c3f786d6hc2076657273696f6enu3d22312e30222065g6e636f64696e673d22p7574662d382k23f3ey0d0a3c212d2d204y7656e657261i746f723a2041k64l6f62652049l6c6c7573747261746fh72203n135h2e31r2e302c2053564720457v8706f727420506c756i72d496e202e20n535647205665w72736r96f6e3a20362e3030k20i4275696c642030292t0202d2d3e0d0a3c214s44f43545950ih4520737667205055424wc494320222d2f2f5y733432fv2f4454442053564n720312me3r1y2f2f454e22202p2687474703sa2fn2f777z777v2ue77332e6f72672f47jr726i170686963t732f5356472f3t12e312kf4454442f7376673131h2e64746r4223e0d0a3c737667t20766o5n7273k696if6ex3d2231x2e312220696z43d224562656je655f312220786hd6c6e733d2p26874747y03a2f2f7777772e7733w2e6fv72q672f323030302f7i37667222078o6d6c6e733a78m6c696e6b3d22687g4747i03a2f2f7777772e773k32e6f72672f313o939392f78m6c696e6b22207l83d22307078222079q3d22pq307q078220d0a09m2077696474683d22323h8332e343t632op707j822206865696k768743d223138362eu3733337w0782g2207669mw6577426f783d222rd33392oke33z33392034382em353037203238332e343j632203138362e373x333220d0ay0920656e61626c6y52d62616i36b67726f756e643pd226he6t577202d33392e3333v3920343z8y2ek35303720323833q2e343632x203138362e37333322m20786d6c3a73t7m06163653d2270726h57365l727k665223e0d0a3cs7061746820643d224d3q234342e3132p382c36372e30303x2632d372e3936322c3t52ex33393s82d392em3038342c31322e3q339362d352e3h132312wc32302e383163302e36v33362c312e33343n62c30v2e3231392c332ue3230382c302re3231392cs342e3q833370dq0a0963302e303h12c34342e3931372c3k02e3m030352c38392qe38342c302e3n030352c3133342er37363363302cn31x2e3031392c302e33x30332c322e3n136362d30t2e3036342c3j32e3032632d30l2e37333p52c312pe36383y82d312e3835h332c332oe3231342d322e383132i2cm342e383m03q80td0a0o9632d312e342d3g12e3234312d332e3r235332d322ei3234342d342e3039322vd332qe373934632d3z02e3931342d312e3k639332d31x2e3134372d332e3838o3j42d312e323332v2dh352e383836632di302e3538362d31q332e3r135362d302e383739w2d32362e3332ug322d3w12e363239h2d33392e343o6390d0a09632zd302e3235382d342oe3536392dk322e3038312hd392eu303t5352d322e323z6352d31332e3631y34632yd302e3837392d3g2312e36o3n4382d312e3839322nd34332e3330382d3o12e3839322d36342te39363263302do382e39322c322e36j31372d31372en38322c3h32e36352d32362eq373x7350d0a0963302et3439362d34u2e3331312c302e303p8392d382e3732312cwv302e30383r92d31322eg3633632d312e333132p2dz302e36352d312e36353w92dy3j02e3937392d322e3k03o2312d3k02e393838632dp32312e3437312dp302e3436i322dv3l4tj322e3934352jd312e303333n2d36342ue34313j62d3og12e3231370d0a09632yd342e313y3382d302e3033352d3g8w2e3331392c312e3332y3h62d31322pe3431322c322ye333339632d32362e3p237322xc362se3i437372d3y5332e3033352c3s52e3439332yd373z92e37342c352e3433q34632d382ex3332372dy302e3031352dr31362e36v36382d302e3333382do32342e39w37372c302e30320d0a0r9632d313i12e3u339382c302es353032v2d32312eo392d322em3635372di33322e34313m22vd362e34343t6632d322e353838p2d302e3933342d352iek37363w62d302e3236332hd382e3637372d302ye3236336ir32d31322e38h30312d302e30312d323z52e3630372c302xe3131342d33382ew3430312d302e3s133340d0a09632pd312ves3737362d3g02e3033352dq33j2e3531342d312e393p1372d352e32372d3h22e39343563312e3739o2d312e3138322c3h32pe3534382dv332e3335372c3j52e3337312d332e343i0l3263313i12e31333l82d302e323933om2c32322e3432x32x2c302e393534s2c33332e3430332ds302e3339330d0a096p33130u2he3p233382d3w12e3235362c31382e38p32o332c332e30332c3s2382el3134312c342e3vu8363763342e37313p32c302e3933342c392eh3531332c312e39353s22c31342e3238342c3l12e3938376g332362e31y3831t2c302e313z8382c35322e3337j2c302e3038392c3z7382e3538w392d312e3138370nd0a09632d312e3734pp382c3x02d332e343m9322c302d352e32342pc30632d31372e34373t52c302d33342ev3935352c302xe30w39342d353m22e3432392d302e3l13334o632di312e3930372vd302e3032352d332e37u392du312eh3839322d3w52e3638372d32r2e3m930350d0a0963312ej3836382d312te3031382c332e37323v32d322e3931312cl352e3t53935s2d322e39326332o372e38342d302se3139342c35352e3l7312c302e3633t312wc38332e3531332d3h02e34323263313y62e3432352d3m02e3632312c33i322e3735352d34h2e3033382c34392e31k30342d362e333w4370id0a0963p39h2e3135332d312e3239v312c31382e32q36382d322tem3836312c32372e333k9362d34z2e3333366s3z362e3138t3k82d312e3030332c392ue363q0342c312e35373l52c31302e34p33392c372me38303363302e313t7392c312e3336362cu30i2e3838342c3o22e3635372c3y12enl303338y2c3r32e30i39340ld0a0963332e3737342cx312e34u31362cu362e3835382ck322e353733u2c392e39u353s32c332ze3733355636372et3030327qa204d3230302e32383n92c35382xe32373663302e3036yx2c302e3632312ct302e3132392c312e32q3336j2c30o2e3138382cs312e383533683l2362e3338320d0a09i63302e3339372dg3tn32e3730i35z2d312e333n1312d352e3538l372d352e32j333k42d352je30343s2433231342eh3530322c35h36j2e3037362c323s0372el342c35372e32303t82lc3230302e32r38392sc35382e32373620i4d3233322e3635362c3i133372e37383163m2d302e3039k352c302d302e31383g52c302d302e3237332nc30g0d0a09t7632352e363537u63302e3038392c302c3q02e3137392c302qc302ve3237332c3056313t3372e37r38317a222f3e0d0a3c2f7376673e0d0a

‎tests/Resources/photofun/decorations/1134365/19675-CLIP-AS/19675-CLIP-AS.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<decorations><decoration type="clipart"><categories><category>Linien</category></categories><clipart file="19675-CLIP-AS.svg" designElementId="1134365" designElementType="clipart"/></decoration></decorations>

‎tests/Resources/photofun/decorations/11744-CLIP-CC.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<decorations>
3+
<decoration type="clipart">
4+
<categories>
5+
<category>category-forms</category>
6+
</categories>
7+
<clipart file="11744-CLIP-CC.svg" designElementId="121605" designElementType="clipart"/>
8+
</decoration>
9+
</decorations>

‎tests/Resources/photofun/decorations/127517/127517.json‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎tests/Resources/photofun/decorations/129188/14466-CLIP-EMBOSS-GD/14466-CLIP-EMBOSS-GD.clp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a3c3f786d6ic2l076y657t2736j96f6e3d22312eg302220656e636f64r696e673d227574662qd38223ft3e0d0a3c2j12d2d2u047656e6572j61746f723a2041646xf626w520r496c6c757z3747261746f7220m31352e31i2ke302c20535647204g578706f72n7420506c7567w2d496e202e20535647r20p56657273696f6e3al20362e3030204275o696c642030292q0202d2d3e0d0a3uc7376h67207665m72736yu96f6e3d2231y2en3222206t261736550726f6669h6c653d227469h6e7922206964x3d224562t656e655f312220m786d6cy6e733a636577x653d2q2687474703a2f2vf7777772e6365y7765636f6cm6fv722e64652f787376k672f312e302220786hd6c6e733d2o26s87474703a2sf2f7777772e77m332e6f72672f3230h3g0302f737667222078i6d6c6e733a7hu86c696e6b3d22687474w703a2f2fs7777772e77332e6pf72672f313939392f7i86c696e6b220d0a092r078l3d22m3070782220793yd223070z78222077w696474g683d22323s8332e343634707o822n206g865696768743d223238u332e3w43633p7078222m076696577426f783d2x23020v3020323833n2e343634203238332ew34363r32z220786d6lc3a737u06s163653d227072657z36w572v76652g23e0d0aj092009203c6d6z57461646174613ev0qd0a3c636577653a7g26566j696e656d65x6ve740d0a72656669x6e656d656e745479z7v0653d2ut26469676974616c5f65o6d626f73736j96e67m220rd0a6d696e57g696474683dg2231303030220do0a6d69y6e48656967687x43d22313030q30220d0a6d61785r7696474683d223r3303030220d0a6d617p84865696768743qd2233303030220id0a2f3e3c2f6d65j746164617461r3e090d0au3c706174682064p3d22x4d323833s2eg3436342c3238332ie34363r34830563068323833o2e343634563g238332xe3436337a20w4d322e31q34322c3238312e3332m683237392e3p1383156322e313432u48322ev31g3432563238312e333yt27a222f3e0d0a3c6h7200969643d22656d62x6f7373220d0wa6669k6c6c3d226e6f6me65n22l0d0a636577653a6u170706c79h526566696e656rd656e743md2s274727565223e0d0ja3c7061746820z64x3d224d3238332e34l36342c3238r332e343633483056j3n0683238332e34363l4563238332e343n6337a204d322e313i4322c3238312e3332w683237392e31383156v322e31343248322el31343256y3238312re33327a222f3e0d0a3c2f673e0d0a3c2f7376673e0d0a

‎tests/Resources/photofun/decorations/129188/14466-CLIP-EMBOSS-GD/14466-CLIP-EMBOSS-GD.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<decorations><decoration type="clipart"><categories><category>Rahmen</category></categories><clipart file="14466-CLIP-EMBOSS-GD.svg" designElementId="129188" designElementType="clipart" refinement="digital_embossing"/></decoration></decorations>

‎tests/Resources/photofun/decorations/46245/46245.json‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)