Regarding the newly implemented combined calendar+todo test, I agree testing calendar and todo separately and then checking URI equalness is a good hint for most cases, but I am not entirely sure whether it works reliably. The first concern is does calendar and todo has the same URI will always mean they are combined? I think there is at least one slightly difference between the two: combined means not only same URI but also same type, while it might be possible that the phone has calendar and todo with the same URI but different types.

The second concern is does testing possible calendar URIs for Calendar and calendar URIs + todo URIs for Todo works? Is it possible that the phone has a combined calendar+task and has the URI named as 'todo'?

Tested with N900 works but there are some syntax error need be fixed, see http://git.moblin.org/cgit.cgi/syncevolution/commit/?h=congwu&id=0494...