refator code
modify the testcase
modify the status
Merge pull request #333 from youyong205/master

refactor code