Use setExpectedException method instead of annotation @expectedException
Merge remote-tracking branch 'origin/1.3.0-tests-viewsimple' into 1.3.0-tests-viewsimple