Skip to content

Commit 38af35b

Browse files
jeremiahjstaceyjeremiahjstacey
committed
Whitespace cleanup
1 parent 55f5002 commit 38af35b

File tree

4 files changed

+132
-132
lines changed

4 files changed

+132
-132
lines changed

‎src/test/java/org/owasp/esapi/logging/java/JavaLogBridgeImplTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class JavaLogBridgeImplTest {
4848
public void setup() {
4949
Map<Integer, JavaLogLevelHandler> levelLookup = new HashMap<>();
5050
levelLookup.put(Logger.ALL, mockHandler);
51-
51+
5252
java.util.logging.Logger wrappedLogger = java.util.logging.Logger.getLogger(testName.getMethodName());
5353
javaLogSpy = Mockito.spy(wrappedLogger);
5454
bridge = new JavaLogBridgeImpl(mockAppender, mockScrubber, levelLookup);
@@ -61,21 +61,21 @@ public void testLogMessageWithUnmappedEsapiLevelThrowsException() {
6161
Map<Integer, JavaLogLevelHandler> emptyMap = Collections.emptyMap();
6262
new JavaLogBridgeImpl(mockAppender, mockScrubber, emptyMap).log(javaLogSpy, 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 Java level mapping");
6969
Map<Integer, JavaLogLevelHandler> emptyMap = Collections.emptyMap();
7070
new JavaLogBridgeImpl(mockAppender, mockScrubber, emptyMap).log(javaLogSpy, 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() + "-LOGGER";
77-
String orignMsg = testName.getMethodName();
78-
String appendMsg = "[APPEND] " + orignMsg;
75+
EventType eventType = Logger.EVENT_UNSPECIFIED;
76+
String loggerName = testName.getMethodName() + "-LOGGER";
77+
String orignMsg = testName.getMethodName();
78+
String appendMsg = "[APPEND] " + orignMsg;
7979
String cleanMsg = appendMsg + " [CLEANED]";
8080

8181
//Setup for Appender
@@ -94,16 +94,16 @@ public void testLogMessage() {
9494
Mockito.verify(mockHandler, Mockito.times(1)).isEnabled(javaLogSpy);
9595
Mockito.verify(mockHandler, Mockito.times(0)).log(ArgumentMatchers.any(java.util.logging.Logger.class), ArgumentMatchers.any(String.class), ArgumentMatchers.any(Throwable.class));
9696
Mockito.verify(mockHandler, Mockito.times(1)).log(ArgumentMatchers.same(javaLogSpy), ArgumentMatchers.eq(cleanMsg));
97-
97+
9898
Mockito.verifyNoMoreInteractions(javaLogSpy, mockAppender, mockScrubber,mockHandler);
9999
}
100100

101101
@Test
102102
public void testLogErrorMessageWithException() {
103-
EventType eventType = Logger.EVENT_UNSPECIFIED;
104-
String loggerName = testName.getMethodName() + "-LOGGER";
105-
String orignMsg = testName.getMethodName();
106-
String appendMsg = "[APPEND] " + orignMsg;
103+
EventType eventType = Logger.EVENT_UNSPECIFIED;
104+
String loggerName = testName.getMethodName() + "-LOGGER";
105+
String orignMsg = testName.getMethodName();
106+
String appendMsg = "[APPEND] " + orignMsg;
107107
String cleanMsg = appendMsg + " [CLEANED]";
108108

109109
//Setup for Appender
@@ -123,7 +123,7 @@ public void testLogErrorMessageWithException() {
123123
Mockito.verify(mockHandler, Mockito.times(0)).log(ArgumentMatchers.any(java.util.logging.Logger.class), ArgumentMatchers.any(String.class));
124124

125125
Mockito.verify(mockHandler, Mockito.times(1)).log(ArgumentMatchers.same(javaLogSpy), ArgumentMatchers.eq(cleanMsg), ArgumentMatchers.same(testEx));
126-
126+
127127
Mockito.verifyNoMoreInteractions(javaLogSpy, mockAppender, mockScrubber,mockHandler);
128128
}
129129

‎src/test/java/org/owasp/esapi/logging/java/JavaLogFactoryTest.java‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -45,109 +45,109 @@
4545
@RunWith(PowerMockRunner.class)
4646
@PrepareForTest (JavaLogFactory.class)
4747
public class JavaLogFactoryTest {
48-
@Rule
48+
@Rule
4949
public TestName testName = new TestName();
5050

51-
@Test
52-
public void testIOExceptionOnMissingConfiguration() throws Exception {
53-
final IOException originException = new IOException(testName.getMethodName());
54-
55-
LogManager testLogManager = new LogManager() {
56-
@Override
57-
public void readConfiguration(InputStream ins) throws IOException, SecurityException {
58-
throw originException;
59-
}
60-
};
61-
62-
OutputStream nullOutputStream = new OutputStream() {
63-
@Override
64-
public void write(int b) throws IOException {
65-
//No Op
66-
}
67-
};
68-
69-
ArgumentCaptor<Object> stdErrOut = ArgumentCaptor.forClass(Object.class);
70-
PrintStream orig = System.err;
71-
try (PrintStream errPrinter = new PrintStream(nullOutputStream)) {
72-
PrintStream spyPrinter = PowerMockito.spy(errPrinter);
73-
Mockito.doCallRealMethod().when(spyPrinter).print(stdErrOut.capture());
74-
System.setErr(spyPrinter);
75-
76-
JavaLogFactory.readLoggerConfiguration(testLogManager);
77-
78-
Object writeData = stdErrOut.getValue();
79-
assertTrue(writeData instanceof IOException);
80-
IOException actual = (IOException) writeData;
81-
assertEquals(originException, actual.getCause());
82-
assertEquals("Failed to load esapi-java-logging.properties.", actual.getMessage());
83-
} finally {
84-
System.setErr(orig);
85-
}
86-
87-
}
51+
@Test
52+
public void testIOExceptionOnMissingConfiguration() throws Exception {
53+
final IOException originException = new IOException(testName.getMethodName());
54+
55+
LogManager testLogManager = new LogManager() {
56+
@Override
57+
public void readConfiguration(InputStream ins) throws IOException, SecurityException {
58+
throw originException;
59+
}
60+
};
61+
62+
OutputStream nullOutputStream = new OutputStream() {
63+
@Override
64+
public void write(int b) throws IOException {
65+
//No Op
66+
}
67+
};
68+
69+
ArgumentCaptor<Object> stdErrOut = ArgumentCaptor.forClass(Object.class);
70+
PrintStream orig = System.err;
71+
try (PrintStream errPrinter = new PrintStream(nullOutputStream)) {
72+
PrintStream spyPrinter = PowerMockito.spy(errPrinter);
73+
Mockito.doCallRealMethod().when(spyPrinter).print(stdErrOut.capture());
74+
System.setErr(spyPrinter);
75+
76+
JavaLogFactory.readLoggerConfiguration(testLogManager);
77+
78+
Object writeData = stdErrOut.getValue();
79+
assertTrue(writeData instanceof IOException);
80+
IOException actual = (IOException) writeData;
81+
assertEquals(originException, actual.getCause());
82+
assertEquals("Failed to load esapi-java-logging.properties.", actual.getMessage());
83+
} finally {
84+
System.setErr(orig);
85+
}
86+
87+
}
8888

8989
@Test
9090
public void testCreateLoggerByString() {
9191
Logger logger = new JavaLogFactory().getLogger("test");
9292
Assert.assertTrue(logger instanceof JavaLogger);
9393
}
94-
94+
9595
@Test public void testCreateLoggerByClass() {
9696
Logger logger = new JavaLogFactory().getLogger(JavaLogBridgeImplTest.class);
9797
Assert.assertTrue(logger instanceof JavaLogger);
9898
}
99-
99+
100100
@Test
101101
public void checkScrubberWithEncoding() throws Exception {
102102
ArgumentCaptor<List> delegates = ArgumentCaptor.forClass(List.class);
103103
PowerMockito.whenNew(CompositeLogScrubber.class).withArguments(delegates.capture()).thenReturn(null);
104-
104+
105105
//Call to invoke the constructor capture
106106
JavaLogFactory.createLogScrubber(true);
107-
107+
108108
List<LogScrubber> scrubbers = delegates.getValue();
109109
Assert.assertEquals(2, scrubbers.size());
110110
Assert.assertTrue(scrubbers.get(0) instanceof NewlineLogScrubber);
111111
Assert.assertTrue(scrubbers.get(1) instanceof CodecLogScrubber);
112112
}
113-
113+
114114
@Test
115115
public void checkScrubberWithoutEncoding() throws Exception {
116116
ArgumentCaptor<List> delegates = ArgumentCaptor.forClass(List.class);
117117
PowerMockito.whenNew(CompositeLogScrubber.class).withArguments(delegates.capture()).thenReturn(null);
118-
118+
119119
//Call to invoke the constructor capture
120120
JavaLogFactory.createLogScrubber(false);
121-
121+
122122
List<LogScrubber> scrubbers = delegates.getValue();
123123
Assert.assertEquals(1, scrubbers.size());
124124
Assert.assertTrue(scrubbers.get(0) instanceof NewlineLogScrubber);
125125
}
126-
126+
127127
/**
128-
* At this time there are no special considerations or handling for the appender
129-
* creation in this scope. It is expected that the arguments to the internal
130-
* creation method are passed directly to the constructor of the
131-
* LogPrefixAppender with no mutation or additional validation.
132-
*/
128+
* At this time there are no special considerations or handling for the appender
129+
* creation in this scope. It is expected that the arguments to the internal
130+
* creation method are passed directly to the constructor of the
131+
* LogPrefixAppender with no mutation or additional validation.
132+
*/
133133
@Test
134134
public void checkPassthroughAppenderConstruct() throws Exception {
135-
LogPrefixAppender stubAppender = new LogPrefixAppender(true, true, true, "");
136-
ArgumentCaptor<Boolean> clientInfoCapture = ArgumentCaptor.forClass(Boolean.class);
137-
ArgumentCaptor<Boolean> serverInfoCapture = ArgumentCaptor.forClass(Boolean.class);
138-
ArgumentCaptor<Boolean> logAppNameCapture = ArgumentCaptor.forClass(Boolean.class);
139-
ArgumentCaptor<String> appNameCapture = ArgumentCaptor.forClass(String.class);
140-
141-
PowerMockito.whenNew(LogPrefixAppender.class).withArguments(clientInfoCapture.capture(), serverInfoCapture.capture(), logAppNameCapture.capture(), appNameCapture.capture()).thenReturn(stubAppender);
142-
143-
LogAppender appender = JavaLogFactory.createLogAppender(true, false, true, testName.getMethodName());
144-
145-
Assert.assertEquals(stubAppender, appender);
146-
Assert.assertTrue(clientInfoCapture.getValue());
147-
Assert.assertFalse(serverInfoCapture.getValue());
148-
Assert.assertTrue(logAppNameCapture.getValue());
149-
Assert.assertEquals(testName.getMethodName(), appNameCapture.getValue());
135+
LogPrefixAppender stubAppender = new LogPrefixAppender(true, true, true, "");
136+
ArgumentCaptor<Boolean> clientInfoCapture = ArgumentCaptor.forClass(Boolean.class);
137+
ArgumentCaptor<Boolean> serverInfoCapture = ArgumentCaptor.forClass(Boolean.class);
138+
ArgumentCaptor<Boolean> logAppNameCapture = ArgumentCaptor.forClass(Boolean.class);
139+
ArgumentCaptor<String> appNameCapture = ArgumentCaptor.forClass(String.class);
140+
141+
PowerMockito.whenNew(LogPrefixAppender.class).withArguments(clientInfoCapture.capture(), serverInfoCapture.capture(), logAppNameCapture.capture(), appNameCapture.capture()).thenReturn(stubAppender);
142+
143+
LogAppender appender = JavaLogFactory.createLogAppender(true, false, true, testName.getMethodName());
144+
145+
Assert.assertEquals(stubAppender, appender);
146+
Assert.assertTrue(clientInfoCapture.getValue());
147+
Assert.assertFalse(serverInfoCapture.getValue());
148+
Assert.assertTrue(logAppNameCapture.getValue());
149+
Assert.assertEquals(testName.getMethodName(), appNameCapture.getValue());
150150
}
151-
152-
151+
152+
153153
}

‎src/test/java/org/owasp/esapi/logging/java/JavaLogLevelHandlersTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void testErrorDelegation() {
3737
JavaLogLevelHandlers.ERROR.log(mockLogger, testName.getMethodName(), testException);
3838

3939
Level expectedJavaLevel = ESAPIErrorJavaLevel.ERROR_LEVEL;
40-
40+
4141
Mockito.verify(mockLogger, Mockito.times(1)).isLoggable(expectedJavaLevel);
4242
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName());
4343
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName(), testException);
@@ -51,7 +51,7 @@ public void testWarnDelegation() {
5151
JavaLogLevelHandlers.WARNING.log(mockLogger, testName.getMethodName(), testException);
5252

5353
Level expectedJavaLevel = Level.WARNING;
54-
54+
5555
Mockito.verify(mockLogger, Mockito.times(1)).isLoggable(expectedJavaLevel);
5656
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName());
5757
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName(), testException);
@@ -64,7 +64,7 @@ public void testInfoDelegation() {
6464
JavaLogLevelHandlers.INFO.log(mockLogger, testName.getMethodName(), testException);
6565

6666
Level expectedJavaLevel = Level.INFO;
67-
67+
6868
Mockito.verify(mockLogger, Mockito.times(1)).isLoggable(expectedJavaLevel);
6969
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName());
7070
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName(), testException);
@@ -78,7 +78,7 @@ public void testDebugDelegation() {
7878
JavaLogLevelHandlers.FINE.log(mockLogger, testName.getMethodName(), testException);
7979

8080
Level expectedJavaLevel = Level.FINE;
81-
81+
8282
Mockito.verify(mockLogger, Mockito.times(1)).isLoggable(expectedJavaLevel);
8383
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName());
8484
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName(), testException);
@@ -92,7 +92,7 @@ public void testTraceDelegation() {
9292
JavaLogLevelHandlers.FINEST.log(mockLogger, testName.getMethodName(), testException);
9393

9494
Level expectedJavaLevel = Level.FINEST;
95-
95+
9696
Mockito.verify(mockLogger, Mockito.times(1)).isLoggable(expectedJavaLevel);
9797
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName());
9898
Mockito.verify(mockLogger, Mockito.times(1)).log(expectedJavaLevel, testName.getMethodName(), testException);

0 commit comments

Comments
 (0)