Revise the test code to audit the second revision based on e1fafcc0#13

TonyTangAndroid merged 1 commit intomainTonyTangAndroid/motif:mainfrom

v2TonyTangAndroid/motif:v2Copy head branch name to clipboard