Updated tests for Mojave

tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/VisionService/PersonPromoter

@@ -2,7 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ProcessedInQuiescentState</key>
+	<true/>
 	<key>SuggestedMeIdentifier</key>
 	<string></string>
+	<key>Version</key>
+	<integer>3</integer>
 </dict>
 </plist>

tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>LastHistoryRowId</key>
-	<integer>943</integer>
+	<integer>947</integer>
 	<key>LibraryBuildTag</key>
 	<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 	<key>LibrarySchemaVersion</key>

tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist

@@ -9,7 +9,7 @@
 	<key>HistoricalMarker</key>
 	<dict>
 		<key>LastHistoryRowId</key>
-		<integer>943</integer>
+		<integer>947</integer>
 		<key>LibraryBuildTag</key>
 		<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 		<key>LibrarySchemaVersion</key>

tests/test_cli.py

@@ -257,7 +257,7 @@ CLI_TEMPLATE_SIDECAR_FILENAME = "Pumkins1.jpg.json"
 
 CLI_UUID_DICT_14_6 = {"intrash": "3tljdX43R8+k6peNHVrJNQ"}
 
-PHOTOS_NOT_IN_TRASH_LEN_14_6 = 7
+PHOTOS_NOT_IN_TRASH_LEN_14_6 = 12
 PHOTOS_IN_TRASH_LEN_14_6 = 1
 PHOTOS_MISSING_14_6 = 1
 
@@ -265,6 +265,10 @@ PHOTOS_NOT_IN_TRASH_LEN_15_5 = 13
 PHOTOS_IN_TRASH_LEN_15_5 = 2
 PHOTOS_MISSING_15_5 = 2
 
+PHOTOS_NOT_IN_TRASH_LEN_15_6 = 14
+PHOTOS_IN_TRASH_LEN_15_6 = 2
+PHOTOS_MISSING_15_6 = 1
+
 CLI_PLACES_JSON = """{"places": {"_UNKNOWN_": 1, "Maui, Wailea, Hawai'i, United States": 1, "Washington, District of Columbia, United States": 1}}"""
 
 CLI_EXIFTOOL = {
@@ -1419,11 +1423,11 @@ def test_query_deleted_2():
     runner = CliRunner()
     cwd = os.getcwd()
     result = runner.invoke(
-        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_14_6), "--deleted"]
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_6), "--deleted"]
     )
     assert result.exit_code == 0
     json_got = json.loads(result.output)
-    assert len(json_got) == PHOTOS_NOT_IN_TRASH_LEN_14_6 + PHOTOS_IN_TRASH_LEN_14_6
+    assert len(json_got) == PHOTOS_NOT_IN_TRASH_LEN_15_6 + PHOTOS_IN_TRASH_LEN_15_6
 
 
 def test_query_deleted_3():
@@ -1456,11 +1460,11 @@ def test_query_deleted_4():
     runner = CliRunner()
     cwd = os.getcwd()
     result = runner.invoke(
-        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_14_6), "--deleted-only"]
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_6), "--deleted-only"]
     )
     assert result.exit_code == 0
     json_got = json.loads(result.output)
-    assert len(json_got) == PHOTOS_IN_TRASH_LEN_14_6
+    assert len(json_got) == PHOTOS_IN_TRASH_LEN_15_6
     assert json_got[0]["intrash"]
 
 

tests/test_shared_mojave_10_14_6.py

@@ -1,8 +1,6 @@
 import pytest
 
 
-# TODO: put some of this code into a pre-function
-
 PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.14.6.photoslibrary/database/photos.db"
 PHOTOS_LIBRARY_PATH = "/Test-10.14.6.photoslibrary"
@@ -16,6 +14,10 @@ ALBUM_DICT = {
 }
 
 
+PHOTOS_DB_LEN = 13
+PHOTOS_NOT_IN_TRASH_LEN = 12
+PHOTOS_IN_TRASH_LEN = 1
+
 def test_album_names():
     import osxphotos
 
@@ -69,4 +71,4 @@ def test_not_shared():
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     photos = [p for p in photosdb.photos() if not p.shared]
-    assert len(photos) == 7
+    assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN