Revert "try mockito"

This reverts commit fa98be4dd457e87ccd9125780c71c32d18b5e74e.
Merge branch 'master' of local repository into mockito
Revert "Revert "try mockito""

This reverts commit 37ce018e76ceccc2bfff7bcb12d3cc3bcc3e4bea.