[MPLUGIN-355] Upgrade to JUnit 4.12 and improve code, use Java 7 syntax
10 files changed