Skip to content

Commit 538c762

Browse files
committed
fix test
Signed-off-by: Ceki Gulcu <[email protected]>
1 parent 62d1eb1 commit 538c762

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java renamed to logback-core/src/test/java/ch/qos/logback/core/model/processor/DefinePropertyActionTest.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/**
1+
/*
22
* 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.
44
*
55
* This program and the accompanying materials are dual-licensed under
66
* either the terms of the Eclipse Public License v1.0 as published by
@@ -11,11 +11,14 @@
1111
* under the terms of the GNU Lesser General Public License version 2.1
1212
* as published by the Free Software Foundation.
1313
*/
14-
package ch.qos.logback.core.joran.action;
14+
package ch.qos.logback.core.model.processor;
1515

1616
import java.util.HashMap;
1717
import java.util.function.Supplier;
1818

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;
1922
import org.junit.jupiter.api.AfterEach;
2023
import org.junit.jupiter.api.BeforeEach;
2124
import org.junit.jupiter.api.Disabled;
@@ -29,11 +32,6 @@
2932
import ch.qos.logback.core.model.DefineModel;
3033
import ch.qos.logback.core.model.ImplicitModel;
3134
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;
3735
import ch.qos.logback.core.status.Status;
3836
import ch.qos.logback.core.testUtil.CoreTestConstants;
3937
import ch.qos.logback.core.status.testUtil.StatusChecker;
@@ -103,7 +101,7 @@ public void noName() throws JoranException {
103101
assertNull(inContextFoo);
104102
// check context errors
105103

106-
checker.assertContainsMatch(Status.ERROR, "Missing attribute \\[name\\] in element \\[define\\]");
104+
checker.assertContainsMatch(Status.ERROR, "Missing attribute \\[name\\]. See element \\[define\\]");
107105
}
108106

109107
@Test
@@ -113,7 +111,7 @@ public void noClass() throws JoranException {
113111

114112
StatusPrinter.print(context);
115113
assertNull(inContextFoo);
116-
checker.assertContainsMatch(Status.ERROR, "Missing attribute \\[class\\] in element \\[define\\]");
114+
checker.assertContainsMatch(Status.ERROR, "Missing attribute \\[class\\]. See element \\[define\\]");
117115
}
118116

119117
@Test

0 commit comments

Comments
 (0)