gallery-app

Merge lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event into lp:gallery-app

gallery-app-fix_show_imported_media_on_today_event
Merge into trunk

Proposed by Arthur Mello on 2015-05-06

Status:

Merged

Approved by:

Bill Filler on 2015-06-30

Approved revision:

1201

Merged at revision:

1203

Proposed branch:

lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event

Merge into:

lp:gallery-app

Diff against target:

168 lines (+112/-2)

6 files modified

debian/rules (+3/-0)
src/config.h.in (+1/-1)
src/photoeditor/photo-metadata.cpp (+1/-1)
tests/unittests/CMakeLists.txt (+1/-0)
tests/unittests/photo-metadata/CMakeLists.txt (+60/-0)
tests/unittests/photo-metadata/tst_photo-metadata.cpp (+46/-0)

To merge this branch:

bzr merge lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-05-08
Ubuntu Phablet Team		2015-05-06	Pending
Review via email: mp+258429@code.launchpad.net

Commit message

Make sure that DateTimeDigitized is the first tag evaluated to get exposure time

Description of the change

Make sure that DateTimeDigitized is the first tag evaluated to get exposure time

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1147/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event updated on 2015-05-07

1196. By Arthur Mello on 2015-05-07: Update unittest for resource since gallery handle removable sd cards

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-07:

FAILED: Continuous integration, rev:1196
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/76/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/218
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/885/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/558
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20287
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1062/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1148/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event updated on 2015-05-08

1197. By Arthur Mello on 2015-05-08: Add new unittest to check the exposure date time

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-08:

FAILED: Continuous integration, rev:1197
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/219
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/888/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/559
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20303
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1065/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1149/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event updated on 2015-05-08

1198. By Arthur Mello on 2015-05-08: Revert changes on resource test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-08:

FAILED: Continuous integration, rev:1198
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1150/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/78/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/220
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/889/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/562
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20313
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1067/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1150/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event updated on 2015-05-08

1199. By Arthur Mello on 2015-05-08: Add rule to output log when test fails

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1151/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_show_imported_media_on_today_event updated on 2015-05-08

1200. By Arthur Mello on 2015-05-08: Fix wrong header in config.h.in
1201. By Arthur Mello on 2015-05-08: Fix unittest

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1152/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1153/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Arthur Mello

Ubuntu Phablet Team

 === modified file 'debian/rules'
 --- debian/rules	2014-09-09 08:14:03 +0000
 +++ debian/rules	2015-05-08 17:05:39 +0000
@@ -17,3 +17,6 @@
  	# Unfortunately, the default build directory is not exposed
  	# (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).
  	$(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) gallery-app.pot
++
++override_dh_auto_test:
++	QT_QPA_PLATFORM=minimal CTEST_OUTPUT_ON_FAILURE=1 dh_auto_test
 === modified file 'src/config.h.in'
 --- src/config.h.in	2014-03-15 15:29:41 +0000
 +++ src/config.h.in	2015-05-08 17:05:39 +0000
@@ -1,7 +1,7 @@
  /*
   * Copyright 2013 Canonical Ltd.
+  *
-- * This file is part of webbrowser-app.
++ * This file is part of gallery-app.
+  *
   * webbrowser-app is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
 === modified file 'src/photoeditor/photo-metadata.cpp'
 --- src/photoeditor/photo-metadata.cpp	2015-02-26 20:28:06 +0000
 +++ src/photoeditor/photo-metadata.cpp	2015-05-08 17:05:39 +0000
@@ -27,10 +27,10 @@
  const char* EXIF_ORIENTATION_KEY = "Exif.Image.Orientation";
  const char* EXIF_DATETIMEDIGITIZED_KEY = "Exif.Photo.DateTimeDigitized";
  const char* EXPOSURE_TIME_KEYS[] = {
++    "Exif.Photo.DateTimeDigitized",
      "Exif.Photo.DateTimeOriginal",
      "Xmp.exif.DateTimeOriginal",
      "Xmp.xmp.CreateDate",
--    "Exif.Photo.DateTimeDigitized",
      "Xmp.exif.DateTimeDigitized",
      "Exif.Image.DateTime"
  };
 === modified file 'tests/unittests/CMakeLists.txt'
 --- tests/unittests/CMakeLists.txt	2015-02-20 13:39:38 +0000
 +++ tests/unittests/CMakeLists.txt	2015-05-08 17:05:39 +0000
@@ -4,3 +4,4 @@
  add_subdirectory(mediaobjectfactory)
  add_subdirectory(resource)
  add_subdirectory(video)
++add_subdirectory(photo-metadata)
 === added directory 'tests/unittests/photo-metadata'
 === added file 'tests/unittests/photo-metadata/CMakeLists.txt'
 --- tests/unittests/photo-metadata/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/unittests/photo-metadata/CMakeLists.txt	2015-05-08 17:05:39 +0000
@@ -0,0 +1,60 @@
++add_definitions(-DTEST_SUITE)
++
++if(NOT CTEST_TESTING_TIMEOUT)
++    set(CTEST_TESTING_TIMEOUT 60)
++endif()
++
++include_directories(
++    ${gallery_src_SOURCE_DIR}
++    ${gallery_album_src_SOURCE_DIR}
++    ${gallery_core_src_SOURCE_DIR}
++    ${gallery_database_src_SOURCE_DIR}
++    ${gallery_event_src_SOURCE_DIR}
++    ${gallery_media_src_SOURCE_DIR}
++    ${gallery_medialoader_src_SOURCE_DIR}
++    ${gallery_photo_src_SOURCE_DIR}
++    ${gallery_photoeditor_src_SOURCE_DIR}
++    ${gallery_util_src_SOURCE_DIR}
++    ${gallery_video_src_SOURCE_DIR}
++    ${EXIV2_INCLUDEDIR}
++    ${CMAKE_BINARY_DIR}
++    )
++
++QT5_WRAP_CPP(PHOTOMETADATA_MOCS
++    ${gallery_src_SOURCE_DIR}/gallery-manager.h
++    ${gallery_database_src_SOURCE_DIR}/album-table.h
++    ${gallery_database_src_SOURCE_DIR}/database.h
++    ${gallery_database_src_SOURCE_DIR}/media-table.h
++    ${gallery_medialoader_src_SOURCE_DIR}/video-metadata.h
++    ${gallery_photo_src_SOURCE_DIR}/photo.h
++    )
++
++add_definitions(-DSAMPLE_IMAGE_DIR="${CMAKE_CURRENT_SOURCE_DIR}/images")
++add_executable(photo-metadata
++    tst_photo-metadata.cpp
++    ${gallery_photoeditor_src_SOURCE_DIR}/photo-metadata.cpp
++    ../stubs/album-table_stub.cpp
++    ../stubs/database_stub.cpp
++    ../stubs/media-table_stub.cpp
++    ../stubs/photo_stub.cpp
++    ../stubs/video_stub.cpp
++    ../stubs/video-metadata_stub.cpp
++    ../stubs/gallery-manager_stub.cpp
++    ${PHOTOMETADATA_MOCS}
++    )
++
++qt5_use_modules(photo-metadata Widgets Core Quick Qml Test)
++add_test(photo-metadata photo-metadata -xunitxml -o test_video.xml)
++set_tests_properties(photo-metadata PROPERTIES
++    TIMEOUT ${CTEST_TESTING_TIMEOUT}
++    ENVIRONMENT "QT_QPA_PLATFORM=minimal;TZ=Pacific/Auckland"
++    )
++
++target_link_libraries(photo-metadata
++    gallery-album
++    gallery-core
++    gallery-media
++    gallery-util
++    gallery-video
++    ${EXIV2_LIBRARIES}
++    )
 === added directory 'tests/unittests/photo-metadata/images'
 === added file 'tests/unittests/photo-metadata/images/sample01.jpg'
 Binary files tests/unittests/photo-metadata/images/sample01.jpg	1970-01-01 00:00:00 +0000 and tests/unittests/photo-metadata/images/sample01.jpg	2015-05-08 17:05:39 +0000 differ
 === added file 'tests/unittests/photo-metadata/tst_photo-metadata.cpp'
 --- tests/unittests/photo-metadata/tst_photo-metadata.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unittests/photo-metadata/tst_photo-metadata.cpp	2015-05-08 17:05:39 +0000
@@ -0,0 +1,46 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QtTest/QtTest>
++
++#include "photoeditor/photo-metadata.h"
++
++class tst_PhotoMetadata : public QObject
++{
++  Q_OBJECT
++
++private slots:
++    void exposureTime();
++
++private:
++    PhotoMetadata *m_metadata;
++};
++
++void tst_PhotoMetadata::exposureTime()
++{
++    m_metadata = PhotoMetadata::fromFile(SAMPLE_IMAGE_DIR "/sample01.jpg");
++    // Check that the original exposure time is returned
++    QCOMPARE(m_metadata->exposureTime(), QDateTime(QDate(2015, 5, 8), QTime(1, 51, 48)));
++
++    // Set DateTimeDigitized the same way gallery does for imported files
++    m_metadata->setDateTimeDigitized(QDateTime(QDate(2015, 12, 31), QTime(23, 59, 59)));
++    // Check that the new exposure time is returned
++    QCOMPARE(m_metadata->exposureTime(), QDateTime(QDate(2015, 12, 31), QTime(23, 59, 59)));
++}
++
++QTEST_MAIN(tst_PhotoMetadata);
++
++#include "tst_photo-metadata.moc"