summaryrefslogtreecommitdiffstats
path: root/tests/testpicture.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/testpicture.cpp')
-rw-r--r--tests/testpicture.cpp40
1 files changed, 24 insertions, 16 deletions
diff --git a/tests/testpicture.cpp b/tests/testpicture.cpp
index 3021ece46..38e8e3d5b 100644
--- a/tests/testpicture.cpp
+++ b/tests/testpicture.cpp
@@ -15,28 +15,36 @@ void TestPicture::initTestCase()
void TestPicture::addPicture()
{
struct dive *dive;
- struct picture *pic;
+ struct picture *pic1, *pic2;
verbose = 1;
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test44.xml"), 0);
dive = get_dive(0);
QVERIFY(dive != NULL);
- pic = dive->picture_list;
+ pic1 = dive->picture_list;
// So far no picture in dive
- QVERIFY(pic == NULL);
-
- dive_create_picture(dive, SUBSURFACE_TEST_DATA "/wreck.jpg", 0, false);
- pic = dive->picture_list;
- // Now there is a picture
- QVERIFY(pic != NULL);
- // Appearing at time 21:01
- QVERIFY(pic->offset.seconds == 1261);
- QVERIFY(pic->latitude.udeg == 47934500);
- QVERIFY(pic->longitude.udeg == 11334500);
-
- QVERIFY(pic->hash == NULL);
- learnHash(pic, hashFile(localFilePath(pic->filename)));
- QCOMPARE(pic->hash, "929ad9499b7ae7a9e39ef63eb6c239604ac2adfa");
+ QVERIFY(pic1 == NULL);
+
+ dive_create_picture(dive, SUBSURFACE_TEST_DATA "/dives/images/wreck.jpg", 0, false);
+ dive_create_picture(dive, SUBSURFACE_TEST_DATA "/dives/images/data_after_EOI.jpg", 0, false);
+ pic1 = dive->picture_list;
+ pic2 = pic1->next;
+ // Now there are two picture2
+ QVERIFY(pic1 != NULL);
+ QVERIFY(pic2 != NULL);
+ // 1st appearing at time 21:01
+ // 2nd appearing at time 22:01
+ QVERIFY(pic1->offset.seconds == 1261);
+ QVERIFY(pic1->latitude.udeg == 47934500);
+ QVERIFY(pic1->longitude.udeg == 11334500);
+ QVERIFY(pic2->offset.seconds == 1321);
+
+ QVERIFY(pic1->hash == NULL);
+ QVERIFY(pic2->hash == NULL);
+ learnHash(pic1, hashFile(localFilePath(pic1->filename)));
+ learnHash(pic2, hashFile(localFilePath(pic2->filename)));
+ QCOMPARE(pic1->hash, "929ad9499b7ae7a9e39ef63eb6c239604ac2adfa");
+ QCOMPARE(pic2->hash, "fa8bd48f8f24017a81e1204f52300bd98b43d4a7");
}