Fix order of arguments in assertEquals

Part 2

Related to: bug #1277104

Change-Id: If2aa8f43d1a9f788e805abe0119f4715a7e14c24
Merge "Fix order of arguments in assertEquals"