From fb6591099354eed63d25f541c54464b1831b8096 Mon Sep 17 00:00:00 2001
From: kagahd <kay.agahd@idealo.de>
Date: Mon, 4 Mar 2024 12:21:39 +0100
Subject: [PATCH] resolve merge conflicts due to PR #829

---
 test/backend/assets/sidecar/metadata.jpg.json        |  2 +-
 test/backend/assets/sidecar/no_metadata.jpg.json     |  4 ++--
 test/backend/assets/sidecar/no_metadata_v2.jpg.json  | 12 ++++++++++++
 test/backend/assets/sidecar/no_metadata_v3.jpg.json  |  4 ++--
 .../unit/model/threading/MetaDataLoader.spec.ts      |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 test/backend/assets/sidecar/no_metadata_v2.jpg.json

diff --git a/test/backend/assets/sidecar/metadata.jpg.json b/test/backend/assets/sidecar/metadata.jpg.json
index dc452767..be6c8652 100644
--- a/test/backend/assets/sidecar/metadata.jpg.json
+++ b/test/backend/assets/sidecar/metadata.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
+  "creationDate": 1709549328178,
   "fileSize": 4489,
   "keywords": [
     "floor",
diff --git a/test/backend/assets/sidecar/no_metadata.jpg.json b/test/backend/assets/sidecar/no_metadata.jpg.json
index 720d2a56..cfda0909 100644
--- a/test/backend/assets/sidecar/no_metadata.jpg.json
+++ b/test/backend/assets/sidecar/no_metadata.jpg.json
@@ -3,10 +3,10 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
+  "creationDate": 1709549328185,
   "fileSize": 1430,
   "keywords": [
     "first",
     "second"
   ]
-}
\ No newline at end of file
+}
diff --git a/test/backend/assets/sidecar/no_metadata_v2.jpg.json b/test/backend/assets/sidecar/no_metadata_v2.jpg.json
new file mode 100644
index 00000000..39768d78
--- /dev/null
+++ b/test/backend/assets/sidecar/no_metadata_v2.jpg.json
@@ -0,0 +1,12 @@
+{
+  "size": {
+    "width": 10,
+    "height": 5
+  },
+  "creationDate": 1709549328188,
+  "fileSize": 1430,
+  "keywords": [
+    "first",
+    "second"
+  ]
+}
diff --git a/test/backend/assets/sidecar/no_metadata_v3.jpg.json b/test/backend/assets/sidecar/no_metadata_v3.jpg.json
index 3cd5fc46..b96e4ade 100644
--- a/test/backend/assets/sidecar/no_metadata_v3.jpg.json
+++ b/test/backend/assets/sidecar/no_metadata_v3.jpg.json
@@ -3,9 +3,9 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
+  "creationDate": 1709549328189,
   "fileSize": 1430,
   "keywords": [
     "first"
   ]
-}
\ No newline at end of file
+}
diff --git a/test/backend/unit/model/threading/MetaDataLoader.spec.ts b/test/backend/unit/model/threading/MetaDataLoader.spec.ts
index 92997ba8..2286212b 100644
--- a/test/backend/unit/model/threading/MetaDataLoader.spec.ts
+++ b/test/backend/unit/model/threading/MetaDataLoader.spec.ts
@@ -131,7 +131,7 @@ describe('MetadataLoader', () => {
 
   it('should load sidecar file without file extension for photo', async () => {
     const data = await MetadataLoader.loadPhotoMetadata(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg'));
-    const expected = require(path.join(__dirname, '/../../../assets/sidecar/no_metadata.jpg.json'));//sidecar "no_metadata_v2.xmp" is identical to "no_metadata.jpg.xmp" so we expect the same result
+    const expected = require(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg.json'));
     expect(Utils.clone(data)).to.be.deep.equal(expected);
   });