Refactor Log4JFilter and improve branch coverage

2015-11-20 23:17:50 +01:00
parent 019390dfe0
commit 84de22c9c0
3 changed files with 112 additions and 51 deletions
@@ -52,6 +52,20 @@ public class Log4JFilterTest {
 		assertThat(result, equalTo(Result.NEUTRAL));
 	}
 	
+	@Test
+	public void shouldNotFilterNonCommandLogEvent() {
+		// given
+		Message message = mockMessage(OTHER_COMMAND);
+		LogEvent event = Mockito.mock(LogEvent.class);
+		when(event.getMessage()).thenReturn(message);
+		
+		// when
+		Result result = log4JFilter.filter(event);
+		
+		// then
+		assertThat(result, equalTo(Result.NEUTRAL));
+	}
+	
 	@Test
 	public void shouldNotFilterLogEventWithNullMessage() {
 		// given
@@ -96,6 +110,15 @@ public class Log4JFilterTest {
 		assertThat(result, equalTo(Result.NEUTRAL));
 	}
 	
+	@Test
+	public void shouldNotFilterNonCommandStringMessage() {
+		// given / when
+		Result result = log4JFilter.filter(null, null, null, OTHER_COMMAND, new Object[0]);
+		
+		// then
+		assertThat(result, equalTo(Result.NEUTRAL));
+	}
+	
 	@Test
 	public void shouldReturnNeutralForNullMessage() {
 		// given / when
@@ -120,7 +143,7 @@ public class Log4JFilterTest {
 	@Test
 	public void shouldNotFilterNullObjectParam() {
 		// given / when
-		Result result = log4JFilter.filter(null, null, null, null, new Exception());
+		Result result = log4JFilter.filter(null, null, null, (Object) null, new Exception());
 		
 		// then
 		assertThat(result, equalTo(Result.NEUTRAL));
@@ -135,6 +158,15 @@ public class Log4JFilterTest {
 		assertThat(result, equalTo(Result.NEUTRAL));
 	}
 	
+	@Test
+	public void shouldNotFilterNonSensitiveCommand() {
+		// given / when
+		Result result = log4JFilter.filter(null, null, null, NORMAL_COMMAND, new Exception());
+		
+		// then
+		assertThat(result, equalTo(Result.NEUTRAL));
+	}
+	
 	// --------
 	// Test filter(Logger, Level, Marker, Message, Throwable)
 	// --------
@@ -162,10 +194,22 @@ public class Log4JFilterTest {
 		assertThat(result, equalTo(Result.NEUTRAL));
 	}
 	
+	@Test
+	public void shouldNotFilterNonCommandMessage() {
+		// given
+		Message message = mockMessage(OTHER_COMMAND);
+		
+		// when
+		Result result = log4JFilter.filter(null, null, null, message, new Exception());
+		
+		// then
+		assertThat(result, equalTo(Result.NEUTRAL));
+	}
+	
 	@Test
 	public void shouldNotFilterNullMessage() {
 		// given / when
-		Result result = log4JFilter.filter(null, null, null, null, new Exception());
+		Result result = log4JFilter.filter(null, null, null, (Message) null, new Exception());
 		
 		// then
 		assertThat(result, equalTo(Result.NEUTRAL));