Update version of ConfigMe, Mockito and sqlite-jdbc

This commit is contained in:
ljacqu
2016-10-30 13:44:13 +01:00
parent 2651786456
commit 5cce7e1fae
62 changed files with 160 additions and 260 deletions
@@ -27,14 +27,14 @@ import org.mockito.stubbing.Answer;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.equalToIgnoringCase;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/**
* Test for {@link PasswordSecurity}.
@@ -233,7 +233,6 @@ public class PasswordSecurityTest {
String password = "?topSecretPass\\";
String username = "someone12";
HashedPassword hashedPassword = new HashedPassword("~T!est#Hash");
given(method.computeHash(password, username)).willReturn(hashedPassword);
given(method.hasSeparateSalt()).willReturn(true);
initSettings(HashAlgorithm.XAUTH, false);
PasswordSecurity security = newPasswordSecurity();