Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream/master into ljacqu/enums

Browse Source
This commit is contained in:
ljacqu
2015-11-23 23:31:26 +01:00
parent 6422f90114 09067ddbd1
commit 16a69d4126
137 changed files with 4848 additions and 4477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/Log4JFilterTest.java
+5 -5
View File
@@ -97,7 +97,7 @@ public class Log4JFilterTest {
@Test
public void shouldFilterSensitiveStringMessage() {
// given / when
Result result = log4JFilter.filter(null, null, null, SENSITIVE_COMMAND, new Object[0]);
Result result = log4JFilter.filter(null, null, null, SENSITIVE_COMMAND);
// then
assertThat(result, equalTo(Result.DENY));
@@ -106,7 +106,7 @@ public class Log4JFilterTest {
@Test
public void shouldNotFilterNormalStringMessage() {
// given / when
Result result = log4JFilter.filter(null, null, null, NORMAL_COMMAND, new Object[0]);
Result result = log4JFilter.filter(null, null, null, NORMAL_COMMAND);
// then
assertThat(result, equalTo(Result.NEUTRAL));
@@ -115,7 +115,7 @@ public class Log4JFilterTest {
@Test
public void shouldNotFilterNonCommandStringMessage() {
// given / when
Result result = log4JFilter.filter(null, null, null, OTHER_COMMAND, new Object[0]);
Result result = log4JFilter.filter(null, null, null, OTHER_COMMAND);
// then
assertThat(result, equalTo(Result.NEUTRAL));
@@ -124,7 +124,7 @@ public class Log4JFilterTest {
@Test
public void shouldReturnNeutralForNullMessage() {
// given / when
Result result = log4JFilter.filter(null, null, null, null, new Object[0]);
Result result = log4JFilter.filter(null, null, null, null);
// then
assertThat(result, equalTo(Result.NEUTRAL));
@@ -211,7 +211,7 @@ public class Log4JFilterTest {
@Test
public void shouldNotFilterNullMessage() {
// given / when
Result result = log4JFilter.filter(null, null, null, (Message) null, new Exception());
Result result = log4JFilter.filter(null, null, null, null, new Exception());
// then
assertThat(result, equalTo(Result.NEUTRAL));