Merge lp://qastaging/~compiz-team/compiz/compiz.tests_1042537.2 into lp://qastaging/compiz/0.9.8
Proposed by
Sam Spilsbury
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.tests_1042537.2 |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
3976 lines (+2444/-618) 30 files modified
compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c (+1/-1) compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+3/-1) compizconfig/libcompizconfig/include/ccs-defs.h (+3/-0) compizconfig/libcompizconfig/include/ccs.h (+32/-25) compizconfig/libcompizconfig/src/CMakeLists.txt (+16/-0) compizconfig/libcompizconfig/src/ccs-private.h (+0/-3) compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.c (+241/-10) compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.h (+12/-0) compizconfig/libcompizconfig/src/ccs_text_file.c (+212/-0) compizconfig/libcompizconfig/src/ccs_text_file.h (+49/-0) compizconfig/libcompizconfig/src/ccs_text_file_interface.c (+50/-0) compizconfig/libcompizconfig/src/ccs_text_file_interface.h (+67/-0) compizconfig/libcompizconfig/src/main.c (+131/-265) compizconfig/libcompizconfig/tests/CMakeLists.txt (+20/-1) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp (+21/-18) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp (+725/-12) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_text_file.cpp (+49/-0) compizconfig/mocks/libcompizconfig/CMakeLists.txt (+11/-0) compizconfig/mocks/libcompizconfig/compizconfig_ccs_context_mock.h (+3/-3) compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h (+15/-15) compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.h (+18/-18) compizconfig/mocks/libcompizconfig/compizconfig_ccs_text_file_mock.cpp (+104/-0) compizconfig/mocks/libcompizconfig/compizconfig_ccs_text_file_mock.h (+84/-0) compizconfig/tests/compizconfig_backend_concept_test.h (+49/-246) compizconfig/tests/compizconfig_ccs_item_in_list_matcher.h (+106/-0) compizconfig/tests/compizconfig_ccs_list_equality.h (+74/-0) compizconfig/tests/compizconfig_ccs_list_wrapper.h (+199/-0) compizconfig/tests/compizconfig_ccs_mocked_allocator.h (+22/-0) compizconfig/tests/compizconfig_ccs_setting_value_operators.h (+105/-0) compizconfig/tests/compizconfig_test_value_combiners.h (+22/-0) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.tests_1042537.2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| jenkins (community) | continuous-integration | Needs Fixing | |
| Daniel van Vugt | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-09-07.
Commit message
Put some tests in place for the upgrade code, and optimized the upgrade code in the meantime
Description of the change
Put some tests in place for the upgrade code, and optimized the upgrade code in the meantime (some parts of the upgrade code were also totally broken too. Fixed them).
cleanups:
1) constified part of the interface
2) fix copyright headers
3) split out text file read/write code into its own class
Coverage report will come later.
To post a comment you must log in.
Revision history for this message
| jenkins (martin-mrazik+qa) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Sam Spilsbury (smspillaz) wrote | # |
Revision history for this message
| jenkins (martin-mrazik+qa) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| jenkins (martin-mrazik+qa) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| jenkins (martin-mrazik+qa) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:3370
http://
Executed test runs:
SUCCESS: http://