Skip to content

Commit 5454c14

Browse files
jeremiahjstaceyjeremiahjstacey
committed
Whitespace cleanup
1 parent 38af35b commit 5454c14

File tree

4 files changed

+87
-87
lines changed

4 files changed

+87
-87
lines changed

‎src/test/java/org/owasp/esapi/logging/log4j/Log4JLogBridgeImplTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Log4JLogBridgeImplTest {
4848
public void setup() {
4949
Map<Integer, Log4JLogLevelHandler> levelLookup = new HashMap<>();
5050
levelLookup.put(Logger.ALL, mockHandler);
51-
51+
5252
org.apache.log4j.Logger wrappedLogger =org.apache.log4j.Logger.getLogger(testName.getMethodName());
5353
log4JSpy = Mockito.spy(wrappedLogger);
5454
bridge = new Log4JLogBridgeImpl(mockAppender, mockScrubber, levelLookup);
@@ -61,21 +61,21 @@ public void testLogMessageWithUnmappedEsapiLevelThrowsException() {
6161
Map<Integer, Log4JLogLevelHandler> emptyMap = Collections.emptyMap();
6262
new Log4JLogBridgeImpl(mockAppender, mockScrubber, emptyMap).log(log4JSpy, 0, Logger.EVENT_UNSPECIFIED, "This Should fail");
6363
}
64-
64+
6565
@Test
6666
public void testLogMessageAndExceptionWithUnmappedEsapiLevelThrowsException() {
6767
exEx.expect(IllegalArgumentException.class);
6868
exEx.expectMessage("Unable to lookup LOG4J level mapping");
6969
Map<Integer, Log4JLogLevelHandler> emptyMap = Collections.emptyMap();
7070
new Log4JLogBridgeImpl(mockAppender, mockScrubber, emptyMap).log(log4JSpy, 0, Logger.EVENT_UNSPECIFIED, "This Should fail", testEx);
7171
}
72-
72+
7373
@Test
7474
public void testLogMessage() {
75-
EventType eventType = Logger.EVENT_UNSPECIFIED;
76-
String loggerName = testName.getMethodName();
77-
String orignMsg = testName.getMethodName();
78-
String appendMsg = "[APPEND] " + orignMsg;
75+
EventType eventType = Logger.EVENT_UNSPECIFIED;
76+
String loggerName = testName.getMethodName();
77+
String orignMsg = testName.getMethodName();
78+
String appendMsg = "[APPEND] " + orignMsg;
7979
String cleanMsg = appendMsg + " [CLEANED]";
8080

8181
//Setup for Appender
@@ -92,16 +92,16 @@ public void testLogMessage() {
9292
Mockito.verify(mockHandler, Mockito.times(1)).isEnabled(log4JSpy);
9393
Mockito.verify(mockHandler, Mockito.times(0)).log(ArgumentMatchers.any(org.apache.log4j.Logger.class), ArgumentMatchers.any(String.class), ArgumentMatchers.any(Throwable.class));
9494
Mockito.verify(mockHandler, Mockito.times(1)).log(ArgumentMatchers.same(log4JSpy), ArgumentMatchers.eq(cleanMsg));
95-
95+
9696
Mockito.verifyNoMoreInteractions(log4JSpy, mockAppender, mockScrubber,mockHandler);
9797
}
9898

9999
@Test
100100
public void testLogErrorMessageWithException() {
101-
EventType eventType = Logger.EVENT_UNSPECIFIED;
102-
String loggerName = testName.getMethodName();
103-
String orignMsg = testName.getMethodName();
104-
String appendMsg = "[APPEND] " + orignMsg;
101+
EventType eventType = Logger.EVENT_UNSPECIFIED;
102+
String loggerName = testName.getMethodName();
103+
String orignMsg = testName.getMethodName();
104+
String appendMsg = "[APPEND] " + orignMsg;
105105
String cleanMsg = appendMsg + " [CLEANED]";
106106

107107
//Setup for Appender
@@ -119,7 +119,7 @@ public void testLogErrorMessageWithException() {
119119
Mockito.verify(mockHandler, Mockito.times(0)).log(ArgumentMatchers.any(org.apache.log4j.Logger.class), ArgumentMatchers.any(String.class));
120120

121121
Mockito.verify(mockHandler, Mockito.times(1)).log(ArgumentMatchers.same(log4JSpy), ArgumentMatchers.eq(cleanMsg), ArgumentMatchers.same(testEx));
122-
122+
123123
Mockito.verifyNoMoreInteractions(log4JSpy, mockAppender, mockScrubber,mockHandler);
124124
}
125125

‎src/test/java/org/owasp/esapi/logging/log4j/Log4JLogFactoryTest.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,71 +38,71 @@
3838
@RunWith(PowerMockRunner.class)
3939
@PrepareForTest (Log4JLogFactory.class)
4040
public class Log4JLogFactoryTest {
41-
@Rule
41+
@Rule
4242
public TestName testName = new TestName();
43-
43+
4444
@Test
4545
public void testCreateLoggerByString() {
4646
Logger logger = new Log4JLogFactory().getLogger("test");
4747
Assert.assertTrue(logger instanceof Log4JLogger);
4848
}
49-
49+
5050
@Test public void testCreateLoggerByClass() {
5151
Logger logger = new Log4JLogFactory().getLogger(Log4JLogBridgeImplTest.class);
5252
Assert.assertTrue(logger instanceof Log4JLogger);
5353
}
54-
54+
5555
@Test
5656
public void checkScrubberWithEncoding() throws Exception {
5757
ArgumentCaptor<List> delegates = ArgumentCaptor.forClass(List.class);
5858
PowerMockito.whenNew(CompositeLogScrubber.class).withArguments(delegates.capture()).thenReturn(null);
59-
59+
6060
//Call to invoke the constructor capture
6161
Log4JLogFactory.createLogScrubber(true);
62-
62+
6363
List<LogScrubber> scrubbers = delegates.getValue();
6464
Assert.assertEquals(2, scrubbers.size());
6565
Assert.assertTrue(scrubbers.get(0) instanceof NewlineLogScrubber);
6666
Assert.assertTrue(scrubbers.get(1) instanceof CodecLogScrubber);
6767
}
68-
68+
6969
@Test
7070
public void checkScrubberWithoutEncoding() throws Exception {
7171
ArgumentCaptor<List> delegates = ArgumentCaptor.forClass(List.class);
7272
PowerMockito.whenNew(CompositeLogScrubber.class).withArguments(delegates.capture()).thenReturn(null);
73-
73+
7474
//Call to invoke the constructor capture
7575
Log4JLogFactory.createLogScrubber(false);
76-
76+
7777
List<LogScrubber> scrubbers = delegates.getValue();
7878
Assert.assertEquals(1, scrubbers.size());
7979
Assert.assertTrue(scrubbers.get(0) instanceof NewlineLogScrubber);
8080
}
81-
81+
8282
/**
83-
* At this time there are no special considerations or handling for the appender
84-
* creation in this scope. It is expected that the arguments to the internal
85-
* creation method are passed directly to the constructor of the
86-
* LogPrefixAppender with no mutation or additional validation.
87-
*/
83+
* At this time there are no special considerations or handling for the appender
84+
* creation in this scope. It is expected that the arguments to the internal
85+
* creation method are passed directly to the constructor of the
86+
* LogPrefixAppender with no mutation or additional validation.
87+
*/
8888
@Test
8989
public void checkPassthroughAppenderConstruct() throws Exception {
90-
LogPrefixAppender stubAppender = new LogPrefixAppender(true, true, true, "");
91-
ArgumentCaptor<Boolean> clientInfoCapture = ArgumentCaptor.forClass(Boolean.class);
92-
ArgumentCaptor<Boolean> serverInfoCapture = ArgumentCaptor.forClass(Boolean.class);
93-
ArgumentCaptor<Boolean> logAppNameCapture = ArgumentCaptor.forClass(Boolean.class);
94-
ArgumentCaptor<String> appNameCapture = ArgumentCaptor.forClass(String.class);
95-
96-
PowerMockito.whenNew(LogPrefixAppender.class).withArguments(clientInfoCapture.capture(), serverInfoCapture.capture(), logAppNameCapture.capture(), appNameCapture.capture()).thenReturn(stubAppender);
97-
98-
LogAppender appender = Log4JLogFactory.createLogAppender(true, false, true, testName.getMethodName());
99-
100-
Assert.assertEquals(stubAppender, appender);
101-
Assert.assertTrue(clientInfoCapture.getValue());
102-
Assert.assertFalse(serverInfoCapture.getValue());
103-
Assert.assertTrue(logAppNameCapture.getValue());
104-
Assert.assertEquals(testName.getMethodName(), appNameCapture.getValue());
90+
LogPrefixAppender stubAppender = new LogPrefixAppender(true, true, true, "");
91+
ArgumentCaptor<Boolean> clientInfoCapture = ArgumentCaptor.forClass(Boolean.class);
92+
ArgumentCaptor<Boolean> serverInfoCapture = ArgumentCaptor.forClass(Boolean.class);
93+
ArgumentCaptor<Boolean> logAppNameCapture = ArgumentCaptor.forClass(Boolean.class);
94+
ArgumentCaptor<String> appNameCapture = ArgumentCaptor.forClass(String.class);
95+
96+
PowerMockito.whenNew(LogPrefixAppender.class).withArguments(clientInfoCapture.capture(), serverInfoCapture.capture(), logAppNameCapture.capture(), appNameCapture.capture()).thenReturn(stubAppender);
97+
98+
LogAppender appender = Log4JLogFactory.createLogAppender(true, false, true, testName.getMethodName());
99+
100+
Assert.assertEquals(stubAppender, appender);
101+
Assert.assertTrue(clientInfoCapture.getValue());
102+
Assert.assertFalse(serverInfoCapture.getValue());
103+
Assert.assertTrue(logAppNameCapture.getValue());
104+
Assert.assertEquals(testName.getMethodName(), appNameCapture.getValue());
105105
}
106-
107-
106+
107+
108108
}

‎src/test/java/org/owasp/esapi/logging/log4j/Log4JLogLevelHandlersTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testFatalDelegation() {
4242
Mockito.verifyNoMoreInteractions(mockLogger);
4343
}
4444

45-
45+
4646
@Test
4747
public void testErrorDelegation() {
4848
Log4JLogLevelHandlers.ERROR.isEnabled(mockLogger);

0 commit comments

Comments
 (0)