Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 547-process-architecture

Conflicts:
	src/main/java/fr/xephi/authme/settings/Settings.java
This commit is contained in:
ljacqu
2016-02-28 09:08:35 +01:00
9 changed files with 37 additions and 23 deletions
@@ -167,7 +167,9 @@ public abstract class AbstractResourceClosingTest {
* Verify that all AutoCloseables that have been created during the method execution have been closed.
*/
private void verifyHaveMocksBeenClosed() {
System.out.println("Found " + closeables.size() + " resources");
if (closeables.isEmpty()) {
System.out.println("Note: detected no AutoCloseables for method '" + method.getName() + "'");
}
try {
for (AutoCloseable autoCloseable : closeables) {
verify(autoCloseable).close();