1
- /**
1
+ /*
2
2
* Logback: the reliable, generic, fast and flexible logging framework.
3
- * Copyright (C) 1999-2015 , QOS.ch. All rights reserved.
3
+ * Copyright (C) 1999-2024 , QOS.ch. All rights reserved.
4
4
*
5
5
* This program and the accompanying materials are dual-licensed under
6
6
* either the terms of the Eclipse Public License v1.0 as published by
11
11
* under the terms of the GNU Lesser General Public License version 2.1
12
12
* as published by the Free Software Foundation.
13
13
*/
14
- package ch .qos .logback .core .joran . action ;
14
+ package ch .qos .logback .core .model . processor ;
15
15
16
16
import java .util .HashMap ;
17
17
import java .util .function .Supplier ;
18
18
19
+ import ch .qos .logback .core .joran .action .Action ;
20
+ import ch .qos .logback .core .joran .action .DefinePropertyAction ;
21
+ import ch .qos .logback .core .joran .action .TopElementAction ;
19
22
import org .junit .jupiter .api .AfterEach ;
20
23
import org .junit .jupiter .api .BeforeEach ;
21
24
import org .junit .jupiter .api .Disabled ;
29
32
import ch .qos .logback .core .model .DefineModel ;
30
33
import ch .qos .logback .core .model .ImplicitModel ;
31
34
import ch .qos .logback .core .model .TopModel ;
32
- import ch .qos .logback .core .model .processor .DefaultProcessor ;
33
- import ch .qos .logback .core .model .processor .DefineModelHandler ;
34
- import ch .qos .logback .core .model .processor .ImplicitModelHandler ;
35
- import ch .qos .logback .core .model .processor .ModelInterpretationContext ;
36
- import ch .qos .logback .core .model .processor .NOPModelHandler ;
37
35
import ch .qos .logback .core .status .Status ;
38
36
import ch .qos .logback .core .testUtil .CoreTestConstants ;
39
37
import ch .qos .logback .core .status .testUtil .StatusChecker ;
@@ -103,7 +101,7 @@ public void noName() throws JoranException {
103
101
assertNull (inContextFoo );
104
102
// check context errors
105
103
106
- checker .assertContainsMatch (Status .ERROR , "Missing attribute \\ [name\\ ] in element \\ [define\\ ]" );
104
+ checker .assertContainsMatch (Status .ERROR , "Missing attribute \\ [name\\ ]. See element \\ [define\\ ]" );
107
105
}
108
106
109
107
@ Test
@@ -113,7 +111,7 @@ public void noClass() throws JoranException {
113
111
114
112
StatusPrinter .print (context );
115
113
assertNull (inContextFoo );
116
- checker .assertContainsMatch (Status .ERROR , "Missing attribute \\ [class\\ ] in element \\ [define\\ ]" );
114
+ checker .assertContainsMatch (Status .ERROR , "Missing attribute \\ [class\\ ]. See element \\ [define\\ ]" );
117
115
}
118
116
119
117
@ Test
0 commit comments