Updated test data

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp

@@ -19,6 +19,10 @@
          <rdf:Bag>
           <rdf:li>Kids</rdf:li>
           <rdf:li>Pumpkin Farm</rdf:li>
+          <rdf:li>Sorted Manual</rdf:li>
+          <rdf:li>Sorted Newest First</rdf:li>
+          <rdf:li>Sorted Oldest First</rdf:li>
+          <rdf:li>Sorted Title</rdf:li>
           <rdf:li>Test Album</rdf:li>
          </rdf:Bag>
         </dc:subject>
@@ -39,6 +43,10 @@
         <rdf:Seq>
           <rdf:li>Kids</rdf:li>
           <rdf:li>Pumpkin Farm</rdf:li>
+          <rdf:li>Sorted Manual</rdf:li>
+          <rdf:li>Sorted Newest First</rdf:li>
+          <rdf:li>Sorted Oldest First</rdf:li>
+          <rdf:li>Sorted Title</rdf:li>
           <rdf:li>Test Album</rdf:li>
         </rdf:Seq>
         </digiKam:TagsList>

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Sorted Manual", "Sorted Newest First", "Sorted Oldest First", "Sorted Title", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp

@@ -20,6 +20,10 @@
           <rdf:li>2018</rdf:li>
           <rdf:li>Kids</rdf:li>
           <rdf:li>Pumpkin Farm</rdf:li>
+          <rdf:li>Sorted Manual</rdf:li>
+          <rdf:li>Sorted Newest First</rdf:li>
+          <rdf:li>Sorted Oldest First</rdf:li>
+          <rdf:li>Sorted Title</rdf:li>
           <rdf:li>Test Album</rdf:li>
          </rdf:Bag>
         </dc:subject>
@@ -41,6 +45,10 @@
           <rdf:li>2018</rdf:li>
           <rdf:li>Kids</rdf:li>
           <rdf:li>Pumpkin Farm</rdf:li>
+          <rdf:li>Sorted Manual</rdf:li>
+          <rdf:li>Sorted Newest First</rdf:li>
+          <rdf:li>Sorted Oldest First</rdf:li>
+          <rdf:li>Sorted Title</rdf:li>
           <rdf:li>Test Album</rdf:li>
         </rdf:Seq>
         </digiKam:TagsList>

tests/test_cli.py

@@ -608,31 +608,22 @@ CLI_FINDER_TAGS = {
 
 LABELS_JSON = {
     "labels": {
-        "Outdoor": 3,
+        "Water": 2,
-        "Sky": 2,
+        "Underwater": 2,
-        "Land": 2,
+        "Jellyfish": 2,
-        "Plant": 2,
+        "Animal": 2,
-        "Art": 2,
+        "Wine Bottle": 2,
-        "Food": 2,
+        "Drink": 2,
-        "People": 2,
+        "Wine": 2,
-        "Cloudy": 1,
-        "Grass": 1,
-        "Flower": 1,
-        "Container": 1,
         "Vase": 1,
+        "Flower": 1,
+        "Plant": 1,
         "Flower Arrangement": 1,
         "Bouquet": 1,
+        "Art": 1,
+        "Container": 1,
         "Camera": 1,
-        "Blue Sky": 1,
+        "Document": 1,
-        "Fruit": 1,
-        "Apricot": 1,
-        "Foliage": 1,
-        "Pumpkin": 1,
-        "Child": 1,
-        "Vegetable": 1,
-        "Recreation": 1,
-        "Clothing": 1,
-        "Adult": 1,
     }
 }
 
@@ -668,6 +659,10 @@ ALBUMS_JSON = {
         "2018-10 - Sponsion, Museum, Frühstück, Römermuseum": 1,
         "2019-10/11 Paris Clermont": 1,
         "EmptyAlbum": 0,
+        "Sorted Manual": 3,
+        "Sorted Newest First": 3,
+        "Sorted Oldest First": 3,
+        "Sorted Title": 3,
     },
     "shared albums": {},
 }
@@ -4054,6 +4049,10 @@ def test_no_folder_1_15():
                     "AlbumInFolder",
                     "I have a deleted twin",
                     "Multi Keyword",
+                    "Sorted Manual",
+                    "Sorted Newest First",
+                    "Sorted Oldest First",
+                    "Sorted Title",
                 ]
 
 

tests/test_template.py

@@ -653,6 +653,10 @@ def test_subst_multi_folder_albums_1(photosdb):
         "2018-10 - Sponsion, Museum, Frühstück, Römermuseum",
         "2019-10/11 Paris Clermont",
         "Folder1/SubFolder2/AlbumInFolder",
+        "Sorted Manual",
+        "Sorted Newest First",
+        "Sorted Oldest First",
+        "Sorted Title",
     ]
     rendered, unknown = photo.render_template(template)
     assert sorted(rendered) == sorted(expected)
@@ -669,6 +673,10 @@ def test_subst_multi_folder_albums_1_path_sep(photosdb):
         "2018-10 - Sponsion, Museum, Frühstück, Römermuseum",
         "2019-10/11 Paris Clermont",
         "Folder1:SubFolder2:AlbumInFolder",
+        "Sorted Manual",
+        "Sorted Newest First",
+        "Sorted Oldest First",
+        "Sorted Title",
     ]
     rendered, unknown = photo.render_template(template)
     assert sorted(rendered) == sorted(expected)
@@ -685,6 +693,10 @@ def test_subst_multi_folder_albums_1_path_sep_lower(photosdb):
         "2018-10 - sponsion, museum, frühstück, römermuseum",
         "2019-10/11 paris clermont",
         "folder1:subfolder2:albuminfolder",
+        "sorted manual",
+        "sorted newest first",
+        "sorted oldest first",
+        "sorted title",
     ]
     rendered, unknown = photo.render_template(template)
     assert sorted(rendered) == sorted(expected)