Issue #3193955 by mondrake, daffie, catch: Swap assertEqual arguments in preparation to replace with assertEquals