Refactor on JUnit test


Signed-off-by: xinzhao-acutate <xzhao@actuate.com>
JUnit test fix.

Signed-off-by: xinzhao-acutate <xzhao@actuate.com>
Merge branch 'Luna' of https://github.com/xinzhao-actuate/birt.git into Luna