Merge lp:~alecu/unity-scope-click/move-libpay-usage into lp:unity-scope-click

[Alejandro J. Cura]

Move libpay usage from store scope to libclickscope

This refactor is needed to support cancelling purchases from the apps scope.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/580/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/794/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/634/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/947
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/947/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/580/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[dobey (dobey)]

Actually, I think you need to move the tests too, for this.

review: Needs Fixing

[lp:~alecu/unity-scope-click/move-libpay-usage]

320. By Alejandro J. Cura on 2015-04-14

Move the pay.cpp tests to libclickscope

[dobey (dobey)]

review: Approve

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-07-25 05:35:28 +0000
+++ libclickscope/click/CMakeLists.txt	2015-04-14 20:43:22 +0000
@@ -4,6 +4,7 @@
 find_package (Qt5Sql REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
+pkg_check_modules(LIBPAY REQUIRED pay-2)
 
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
@@ -25,6 +26,7 @@
   launcher.cpp
   network_access_manager.cpp
   package.cpp
+  pay.cpp
   preview.cpp
   reviews.cpp
   qtbridge.cpp
@@ -39,12 +41,14 @@
 
 include_directories(
   ${JSON_CPP_INCLUDE_DIRS}
+  ${LIBPAY_INCLUDE_DIRS}
   ${GSETTINGS_QT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libclickscope
 )
 
 target_link_libraries (${SCOPE_LIB_NAME}
   ${JSON_CPP_LDFLAGS}
+  ${LIBPAY_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}

=== renamed file 'scope/clickstore/pay.cpp' => 'libclickscope/click/pay.cpp'
=== renamed file 'scope/clickstore/pay.h' => 'libclickscope/click/pay.h'
=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2014-07-25 16:52:39 +0000
+++ libclickscope/tests/CMakeLists.txt	2015-04-14 20:43:22 +0000
@@ -31,6 +31,7 @@
   test_index.cpp
   test_interface.cpp
   test_package.cpp
+  test_pay.cpp
   test_preview.cpp
   test_reviews.cpp
   test_smartconnect.cpp

=== renamed file 'scope/tests/mock_pay.h' => 'libclickscope/tests/mock_pay.h'
--- scope/tests/mock_pay.h	2015-03-25 21:56:03 +0000
+++ libclickscope/tests/mock_pay.h	2015-04-14 20:43:22 +0000
@@ -27,7 +27,7 @@
  * files in the program, then also delete it here.
  */
 
-#include "clickstore/pay.h"
+#include <click/pay.h>
 
 #include <click/webclient.h>
 

=== renamed file 'scope/tests/test_pay.cpp' => 'libclickscope/tests/test_pay.cpp'
=== modified file 'scope/clickstore/CMakeLists.txt'
--- scope/clickstore/CMakeLists.txt	2015-03-13 23:04:36 +0000
+++ scope/clickstore/CMakeLists.txt	2015-04-14 20:43:22 +0000
@@ -3,7 +3,6 @@
 find_package (Qt5Core REQUIRED)
 find_package (Qt5Sql REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
-pkg_check_modules(LIBPAY REQUIRED pay-2)
 
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
@@ -11,7 +10,6 @@
 )
 
 add_library(${STORE_LIB_UNVERSIONED} SHARED
-  pay.cpp
   store-query.cpp
   store-scope.cpp
 )
@@ -20,7 +18,6 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/libclickscope
   ${JSON_CPP_INCLUDE_DIRS}
-  ${LIBPAY_INCLUDE_DIRS}
 )
 
 qt5_use_modules (${STORE_LIB_UNVERSIONED} Network Sql)
@@ -30,7 +27,6 @@
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}
-  ${LIBPAY_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
 )

=== modified file 'scope/clickstore/store-query.h'
--- scope/clickstore/store-query.h	2015-03-05 20:48:35 +0000
+++ scope/clickstore/store-query.h	2015-04-14 20:43:22 +0000
@@ -30,8 +30,6 @@
 #ifndef STORE_QUERY_H
 #define STORE_QUERY_H
 
-#include "pay.h"
-
 #include <unity/scopes/SearchQueryBase.h>
 #include <unity/scopes/Department.h>
 
@@ -42,6 +40,7 @@
 
 #include <click/department-lookup.h>
 #include <click/package.h>
+#include <click/pay.h>
 #include <click/highlights.h>
 #include <click/interface.h>
 

=== modified file 'scope/clickstore/store-scope.h'
--- scope/clickstore/store-scope.h	2014-08-01 15:04:19 +0000
+++ scope/clickstore/store-scope.h	2015-04-14 20:43:22 +0000
@@ -30,7 +30,7 @@
 #ifndef CLICK_SCOPE_H
 #define CLICK_SCOPE_H
 
-#include "pay.h"
+#include <click/pay.h>
 
 #include <memory>
 #include <click/network_access_manager.h>

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-10-01 15:10:28 +0000
+++ scope/tests/CMakeLists.txt	2015-04-14 20:43:22 +0000
@@ -18,7 +18,6 @@
 )
 
 add_executable (${CLICKSCOPE_TESTS_TARGET}
-  test_pay.cpp
   test_query.cpp
   test_store_scope.cpp
 

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2015-03-05 20:48:35 +0000
+++ scope/tests/test_query.cpp	2015-04-14 20:43:22 +0000
@@ -27,7 +27,7 @@
  * files in the program, then also delete it here.
  */
 
-#include "mock_pay.h"
+#include <tests/mock_pay.h>
 
 #include "clickstore/store-query.h"