35
35
* Utility methods for JUnit rules and conditions.
36
36
*
37
37
* @author Gary Russell
38
+ * @author Artem Bilan
39
+ *
38
40
* @since 2.2
39
41
*
40
42
*/
@@ -52,7 +54,7 @@ private JUnitUtils() {
52
54
* @return the parsed property value if it exists, false otherwise.
53
55
*/
54
56
public static boolean parseBooleanProperty (String property ) {
55
- for (String value : new String [] { System .getenv (property ), System .getProperty (property ) }) {
57
+ for (String value : new String [] { System .getenv (property ), System .getProperty (property ) }) {
56
58
if (Boolean .parseBoolean (value )) {
57
59
return true ;
58
60
}
@@ -108,17 +110,16 @@ public static LevelsContainer adjustLogLevels(String methodName, List<Class<?>>
108
110
ctx .updateLoggers ();
109
111
110
112
Map <String , ch .qos .logback .classic .Level > oldLbLevels = new HashMap <>();
111
- categories .stream ()
112
- .forEach (cat -> {
113
- ch .qos .logback .classic .Logger lbLogger = (ch .qos .logback .classic .Logger ) LoggerFactory .getLogger (cat );
114
- oldLbLevels .put (cat , lbLogger .getLevel ());
115
- lbLogger .setLevel (ch .qos .logback .classic .Level .toLevel (level .name ()));
116
- });
113
+ categories .forEach (cat -> {
114
+ ch .qos .logback .classic .Logger lbLogger = (ch .qos .logback .classic .Logger ) LoggerFactory .getLogger (cat );
115
+ oldLbLevels .put (cat , lbLogger .getLevel ());
116
+ lbLogger .setLevel (ch .qos .logback .classic .Level .toLevel (level .name ()));
117
+ });
117
118
LOGGER .info ("++++++++++++++++++++++++++++ "
118
119
+ "Overridden log level setting for: "
119
120
+ classes .stream ()
120
- .map (Class ::getSimpleName )
121
- .collect (Collectors .toList ())
121
+ .map (Class ::getSimpleName )
122
+ .collect (Collectors .toList ())
122
123
+ " and " + categories .toString ()
123
124
+ " for test " + methodName );
124
125
return new LevelsContainer (classLevels , categoryLevels , oldLbLevels );
@@ -127,35 +128,27 @@ public static LevelsContainer adjustLogLevels(String methodName, List<Class<?>>
127
128
public static void revertLevels (String methodName , LevelsContainer container ) {
128
129
LOGGER .info ("++++++++++++++++++++++++++++ "
129
130
+ "Restoring log level setting for test " + methodName );
130
- container .oldCatLevels .entrySet ()
131
- .stream ()
132
- .forEach (entry -> {
133
- if (!entry .getKey ().contains ("BrokerRunning" )) {
134
- ((Logger ) LogManager .getLogger (entry .getKey ())).setLevel (entry .getValue ());
135
- }
136
- });
137
- container .oldLevels .entrySet ()
138
- .stream ()
139
- .forEach (entry -> {
140
- if (!entry .getKey ().equals (BrokerRunning .class )) {
141
- ((Logger ) LogManager .getLogger (entry .getKey ())).setLevel (entry .getValue ());
142
- }
143
- });
144
- container .oldLbLevels .entrySet ()
145
- .stream ()
146
- .forEach (entry -> {
147
- ((ch .qos .logback .classic .Logger ) LoggerFactory .getLogger (entry .getKey ()))
148
- .setLevel (entry .getValue ());
149
- });
131
+ container .oldCatLevels .forEach ((key , value ) -> {
132
+ if (!key .contains ("BrokerRunning" )) {
133
+ ((Logger ) LogManager .getLogger (key )).setLevel (value );
134
+ }
135
+ });
136
+ container .oldLevels .forEach ((key , value ) -> {
137
+ if (!key .equals (BrokerRunning .class )) {
138
+ ((Logger ) LogManager .getLogger (key )).setLevel (value );
139
+ }
140
+ });
141
+ container .oldLbLevels .forEach ((key , value ) ->
142
+ ((ch .qos .logback .classic .Logger ) LoggerFactory .getLogger (key )).setLevel (value ));
150
143
}
151
144
152
145
public static class LevelsContainer {
153
146
154
- final Map <Class <?>, Level > oldLevels ;
147
+ private final Map <Class <?>, Level > oldLevels ;
155
148
156
- final Map <String , Level > oldCatLevels ;
149
+ private final Map <String , Level > oldCatLevels ;
157
150
158
- final Map <String , ch .qos .logback .classic .Level > oldLbLevels ;
151
+ private final Map <String , ch .qos .logback .classic .Level > oldLbLevels ;
159
152
160
153
public LevelsContainer (Map <Class <?>, Level > oldLevels , Map <String , Level > oldCatLevels ,
161
154
Map <String , ch .qos .logback .classic .Level > oldLbLevels ) {
0 commit comments