assertEquals is deprecated, use assertEqual

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