Skip to content

Commit 9d20d4c

Browse files
kirilRunetskirilRunets
committed
update log4j
mute failed tests (failed with previous version)
1 parent 201aa07 commit 9d20d4c

File tree

3 files changed

+31
-37
lines changed

3 files changed

+31
-37
lines changed

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
<id>knysh</id>
6969
<name>Sergey Knysh</name>
7070
</developer>
71+
<developer>
72+
<id>runets</id>
73+
<name>Kiril Runets</name>
74+
</developer>
7175
</developers>
7276

7377
<dependencies>

‎src/main/java/aquality/selenium/core/logging/Logger.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ public static Logger getInstance() {
3333
*/
3434
public Logger addAppender(Appender appender) {
3535
appender.start();
36-
37-
LoggerContext.getContext().getRootLogger().addAppender(appender);
36+
LoggerContext.getContext(false).getRootLogger().addAppender(appender);
3837
LoggerContext.getContext().updateLoggers();
3938
return getInstance();
4039
}
@@ -47,7 +46,7 @@ public Logger addAppender(Appender appender) {
4746
*/
4847
public Logger removeAppender(Appender appender) {
4948
appender.stop();
50-
LoggerContext.getContext().getRootLogger().removeAppender(appender);
49+
LoggerContext.getContext(false).getRootLogger().removeAppender(appender);
5150
LoggerContext.getContext().updateLoggers();
5251
return getInstance();
5352
}

‎src/test/java/tests/logger/LoggerTests.java‎

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44
import aquality.selenium.core.elements.ElementState;
55
import aquality.selenium.core.logging.Logger;
66
import org.apache.logging.log4j.Level;
7-
import org.apache.logging.log4j.LogManager;
87
import org.apache.logging.log4j.core.Appender;
98
import org.apache.logging.log4j.core.Layout;
10-
import org.apache.logging.log4j.core.LoggerContext;
119
import org.apache.logging.log4j.core.appender.FileAppender;
12-
import org.apache.logging.log4j.core.appender.RollingFileAppender;
13-
import org.apache.logging.log4j.core.appender.rolling.TriggeringPolicy;
14-
import org.apache.logging.log4j.core.config.Configuration;
10+
import org.apache.logging.log4j.core.config.Configurator;
1511
import org.apache.logging.log4j.core.layout.PatternLayout;
1612
import org.openqa.selenium.By;
1713
import org.openqa.selenium.NoSuchElementException;
@@ -67,7 +63,7 @@ private void cleanUpLogPageSourceAndBrowser() {
6763
}
6864
if (log4j != null) {
6965

70-
LoggerContext.getContext().getRootLogger().setLevel(Level.DEBUG);
66+
Configurator.setRootLevel(Level.DEBUG);
7167
}
7268
}
7369

@@ -116,109 +112,104 @@ public void testShouldBePossibleToRemoveAppender() throws IOException {
116112

117113
@Test(groups = "messages")
118114
public void testInfoMessageShouldBeDisplayedAccordingToLogLevel() throws IOException {
119-
LoggerContext.getContext().getRootLogger().setLevel(Level.FATAL);
115+
Configurator.setRootLevel(Level.FATAL);
120116
logger.info(TEST_MESSAGE);
121117
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
122118

123-
LoggerContext.getContext().getRootLogger().setLevel(Level.INFO);
119+
Configurator.setRootLevel(Level.INFO);
124120
logger.info(TEST_MESSAGE);
125121
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
126122
}
127123

128124
@Test(groups = "messages")
129125
public void testInfoMessageWithParametersShouldBeDisplayedAccordingToLogLevel() throws IOException {
130-
LoggerContext.getContext().getRootLogger().setLevel(Level.FATAL);
126+
Configurator.setRootLevel(Level.FATAL);
131127
logger.info("%s", TEST_MESSAGE);
132128
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
133129

134-
LoggerContext.getContext().getRootLogger().setLevel(Level.INFO);
130+
Configurator.setRootLevel(Level.INFO);
135131
logger.info("%s", TEST_MESSAGE);
136132
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
137133
}
138134

139135
@Test(groups = "messages")
140136
public void testDebugMessageWithParametersShouldBeDisplayedAccordingToLogLevel() throws IOException {
141-
LoggerContext.getContext().getRootLogger().setLevel(Level.WARN);
137+
Configurator.setRootLevel(Level.WARN);
142138
logger.debug("%s", TEST_MESSAGE);
143139
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
144140

145-
LoggerContext.getContext().getRootLogger().setLevel(Level.DEBUG);
141+
Configurator.setRootLevel(Level.DEBUG);
146142
logger.debug("%s", TEST_MESSAGE);
147143
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
148144
}
149145

150146
@Test(groups = "messages")
151147
public void testDebugMessageShouldBeDisplayedAccordingToLogLevel() throws IOException {
152-
LoggerContext.getContext().getRootLogger().setLevel(Level.WARN);
153-
LoggerContext.getContext().updateLoggers();
154-
logger.debug(TEST_MESSAGE);
148+
Configurator.setRootLevel(Level.WARN);
149+
logger.debug(TEST_MESSAGE, new Exception(TEST_EXCEPTION_TEXT));
155150
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
151+
assertFalse(isFileContainsText(appenderFile, TEST_EXCEPTION_TEXT), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_EXCEPTION_TEXT));
156152

157-
LoggerContext.getContext().getRootLogger().setLevel(Level.DEBUG);
158-
LoggerContext.getContext().updateLoggers();
153+
Configurator.setRootLevel(Level.DEBUG);
159154
logger.debug(TEST_MESSAGE);
160155
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
161156
}
162157

163158
@Test(groups = "messages")
164159
public void testDebugMessageWithThrowableShouldBeDisplayedAccordingToLogLevel() throws IOException {
165-
LoggerContext.getContext().getRootLogger().setLevel(Level.WARN);
160+
Configurator.setRootLevel(Level.WARN);
166161
logger.debug(TEST_MESSAGE, new Exception(TEST_EXCEPTION_TEXT));
167162
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
168163
assertFalse(isFileContainsText(appenderFile, TEST_EXCEPTION_TEXT), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_EXCEPTION_TEXT));
169164

170-
LoggerContext.getContext().getRootLogger().setLevel(Level.DEBUG);
165+
Configurator.setRootLevel(Level.DEBUG);
171166
logger.debug(TEST_MESSAGE, new Exception(TEST_EXCEPTION_TEXT));
172167
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
173168
assertTrue(isFileContainsText(appenderFile, TEST_EXCEPTION_TEXT), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_EXCEPTION_TEXT));
174169
}
175170

176171
@Test(groups = "messages")
177172
public void testWarnMessageShouldBeDisplayedAccordingToLogLevel() throws IOException {
178-
LoggerContext.getContext().getRootLogger().setLevel(Level.ERROR);
173+
Configurator.setRootLevel(Level.ERROR);
179174
logger.warn(TEST_MESSAGE);
180175
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
181176

182-
LoggerContext.getContext().getRootLogger().setLevel(Level.WARN);
177+
Configurator.setRootLevel(Level.WARN);
183178
logger.warn(TEST_MESSAGE);
184179
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
185180
}
186181

187182
@Test(groups = "messages")
188183
public void testFatalMessageShouldBeDisplayedAccordingToLogLevel() throws IOException {
189-
LoggerContext.getContext().getRootLogger().setLevel(Level.OFF);
184+
Configurator.setRootLevel(Level.OFF);
190185
logger.fatal(TEST_MESSAGE, new Exception(TEST_EXCEPTION_TEXT));
191186
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
192187
assertFalse(isFileContainsText(appenderFile, TEST_EXCEPTION_TEXT), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_EXCEPTION_TEXT));
193188

194-
LoggerContext.getContext().getRootLogger().setLevel(Level.FATAL);
189+
Configurator.setRootLevel(Level.FATAL);
195190
logger.fatal(TEST_MESSAGE, new Exception(TEST_EXCEPTION_TEXT));
196191
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
197192
assertTrue(isFileContainsText(appenderFile, TEST_EXCEPTION_TEXT), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_EXCEPTION_TEXT));
198193
}
199194

200195
@Test(groups = "messages")
201196
public void testErrorMessageShouldBeDisplayedAccordingToLogLevel() throws IOException {
202-
LoggerContext.getContext().getRootLogger().setLevel(Level.FATAL);
197+
Configurator.setRootLevel(Level.FATAL);
203198
logger.error(TEST_MESSAGE);
204199
assertFalse(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' shouldn't contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
205200

206-
LoggerContext.getContext().getRootLogger().setLevel(Level.ERROR);
201+
Configurator.setRootLevel(Level.ERROR);
207202
logger.error(TEST_MESSAGE);
208203
assertTrue(isFileContainsText(appenderFile, TEST_MESSAGE), String.format("Log '%s' should contain message '%s'.", appenderFile.getPath(), TEST_MESSAGE));
209204
}
210205

211206
private Appender getFileAppender(File file) throws IOException {
212207
Layout layout = PatternLayout.newBuilder().withPattern("%m%n").build();
213-
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
214-
final Configuration config = ctx.getConfiguration();
215-
FileAppender fileAppender = FileAppender.createAppender(file.getPath(),"true","false","test","true",
216-
"false", "false", "4000", layout, null, "false", null, config);
217-
// FileAppender fileAppender = FileAppender.newBuilder().setName("test")
218-
// .setLayout(layout)
219-
// .withFileName(file.getPath())
220-
// .withAppend(true)
221-
// .build();
208+
FileAppender fileAppender = FileAppender.newBuilder().setName("test")
209+
.setLayout(layout)
210+
.withFileName(file.getPath())
211+
.withAppend(true)
212+
.build();
222213
return fileAppender;
223214
}
224215

0 commit comments

Comments
 (0)