assertEquals is deprecated, use assertEqual

Change-Id: Id3ebdf4862b02f2965199701a4994846bcecbb18
Merge "assertEquals is deprecated, use assertEqual"