Merge "Fix compilation warnings: replace deprecated junit.framework.Assert"