assertEquals is deprecated, use assertEqual

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