Move away of junit Assert.assertThat (take 2)

Use Hamcrest MatcherAssert.assertThat instead.

Change-Id: I3eb6154f9e3861212107292f43007a66f937ddd1
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
6 files changed