Created attachment 177897 [details] [review]
Squashed diff of the 639113-aggregation-tests branch

http://git.collabora.co.uk/?p=user/pwith/folks;a=shortlog;h=refs/heads/639113-aggregation-tests

The “untrusted store” test fails at the moment because the aggregator is emitting individuals-changed signals listing removed individuals whose persona lists are empty. That's a bug in the aggregator which should be fixed separately.

This seems pretty solid. Thanks for the work!

Merged (some commit message characters transliterated):

commit f3917b1e8f279ec255cee96c210c74e882da754b
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Jan 10 00:30:13 2011 +0000

    Bug 639113 -- Add static aggregation tests
    
    Add some tests which cover several of the ways which personas can be
    statically aggregated at present. These tests are "static" (as opposed to
    "dynamic") because they don't change the inputs to the aggregator after
    it's been prepared. Consequently, they don't cover much of the interesting
    and bug-prone behaviour of the aggregator. Still, they're a start.
    
    Closes: bgo#639113

 NEWS                                      |    1 +
 tests/folks/Makefile.am                   |   22 +-
 tests/folks/aggregation.vala              |  653 +++++++++++++++++++++++++++++
 tests/folks/backend-loading.vala          |   11 +
 tests/lib/telepathy/contactlist/backend.c |    8 +
 5 files changed, 694 insertions(+), 1 deletions(-)

commit 39bf15f146f6ec29010b8d71330a98809c097d6a
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Tue Jan 11 11:31:10 2011 -0800

    Don't announce removal of Individuals twice.
    
    Before this patch, we would announce an Individual's removal, "dispose" of t
    individual, then announce their removal again (at which point they would hav
    zero Personas, which can make it harder for clients to do anything useful wi
    the notification anyhow).
    
    Helps: bgo#639113

 folks/individual-aggregator.vala |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit b81e26d48507e7fd61b26c9732fb67b150593e20
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Sun Jan 9 21:52:54 2011 +0000

    Allow multiple test accounts to be connected simultaneously
    
    This doesn't affect any existing tests, but will be useful for testing that
    aggregation across different persona stores works correctly.

 tests/lib/telepathy/contactlist/account-manager.c |   50 ++++++-
 tests/lib/telepathy/contactlist/account-manager.h |    5 +
 tests/lib/telepathy/contactlist/backend.c         |  152 +++++++++++++++------
 tests/lib/telepathy/contactlist/backend.h         |    8 +
 tests/telepathy/individual-properties.vala        |    4 +
 tests/telepathy/individual-retrieval.vala         |    4 +
 tests/telepathy/persona-store-capabilities.vala   |    4 +
 7 files changed, 178 insertions(+), 49 deletions(-)