Avoid deprecated junit.framework.Assert, use org.junit.Assert instead
Merge pull request #890 from olivergondza/deprecated-assert

Avoid deprecated junit.framework.Assert, use org.junit.Assert instead