Skip to content

Commit ea060f7

Browse files
authored
Update version to 15.5.0-SNAPSHOT (#7)
* Update version to 15.5.0-SNAPSHOT * Migrate tests to JUnit 5 / utflute 2.5.0
1 parent 7b11a42 commit ea060f7

3 files changed

Lines changed: 119 additions & 8 deletions

File tree

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>fess-script-example</artifactId>
77
<packaging>jar</packaging>
88
<name>Example Script Plugin</name>
9-
<version>15.4.0-SNAPSHOT</version>
9+
<version>15.5.0-SNAPSHOT</version>
1010
<scm>
1111
<connection>scm:git:git@github.com:codelibs/fess-script-example.git</connection>
1212
<developerConnection>scm:git:git@github.com:codelibs/fess-script-example.git</developerConnection>
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.codelibs.fess</groupId>
1717
<artifactId>fess-parent</artifactId>
18-
<version>15.4.0</version>
18+
<version>15.5.0-SNAPSHOT</version>
1919
<relativePath />
2020
</parent>
2121
<build>

src/test/java/org/codelibs/fess/script/example/ExampleEngineTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
*/
1616
package org.codelibs.fess.script.example;
1717

18+
import org.junit.jupiter.api.TestInfo;
19+
1820
import java.util.HashMap;
1921
import java.util.Map;
2022

2123
import org.codelibs.fess.util.ComponentUtil;
22-
import org.dbflute.utflute.lastaflute.LastaFluteTestCase;
24+
import org.codelibs.fess.script.example.UnitScriptTestCase;
2325

24-
public class ExampleEngineTest extends LastaFluteTestCase {
26+
public class ExampleEngineTest extends UnitScriptTestCase {
2527
public ExampleEngine exampleEngine;
2628

2729
@Override
@@ -35,15 +37,15 @@ protected boolean isSuppressTestCaseTransaction() {
3537
}
3638

3739
@Override
38-
public void setUp() throws Exception {
39-
super.setUp();
40+
public void setUp(TestInfo testInfo) throws Exception {
41+
super.setUp(testInfo);
4042
exampleEngine = new ExampleEngine();
4143
}
4244

4345
@Override
44-
public void tearDown() throws Exception {
46+
public void tearDown(TestInfo testInfo) throws Exception {
4547
ComponentUtil.setFessConfig(null);
46-
super.tearDown();
48+
super.tearDown(testInfo);
4749
}
4850

4951
public void test_evaluate() {
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
/*
2+
* Copyright 2012-2025 CodeLibs Project and the Others.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13+
* either express or implied. See the License for the specific language
14+
* governing permissions and limitations under the License.
15+
*/
16+
package org.codelibs.fess.script.example;
17+
18+
import org.codelibs.fess.util.ComponentUtil;
19+
import org.dbflute.utflute.lastaflute.LastaFluteTestCase;
20+
import org.junit.jupiter.api.Assertions;
21+
import org.junit.jupiter.api.TestInfo;
22+
23+
public abstract class UnitScriptTestCase extends LastaFluteTestCase {
24+
private static final ThreadLocal<TestInfo> currentTestInfo = new ThreadLocal<>();
25+
26+
@Override
27+
protected String prepareConfigFile() {
28+
return "test_app.xml";
29+
}
30+
31+
@Override
32+
protected void setUp(TestInfo testInfo) throws Exception {
33+
currentTestInfo.set(testInfo);
34+
super.setUp(testInfo);
35+
}
36+
37+
@Override
38+
protected void tearDown(TestInfo testInfo) throws Exception {
39+
ComponentUtil.setFessConfig(null);
40+
super.tearDown(testInfo);
41+
}
42+
43+
protected String getName() {
44+
TestInfo info = currentTestInfo.get();
45+
return info != null ? info.getDisplayName() : "unknown";
46+
}
47+
48+
// ===== Assert methods for JUnit 4/5 compatibility =====
49+
50+
protected void fail(String message) {
51+
Assertions.fail(message);
52+
}
53+
54+
protected void assertTrue(String message, boolean condition) {
55+
Assertions.assertTrue(condition, message);
56+
}
57+
58+
protected void assertFalse(String message, boolean condition) {
59+
Assertions.assertFalse(condition, message);
60+
}
61+
62+
protected void assertEquals(String message, Object expected, Object actual) {
63+
Assertions.assertEquals(expected, actual, message);
64+
}
65+
66+
protected void assertEquals(String message, long expected, long actual) {
67+
Assertions.assertEquals(expected, actual, message);
68+
}
69+
70+
protected void assertEquals(String message, double expected, double actual, double delta) {
71+
Assertions.assertEquals(expected, actual, delta, message);
72+
}
73+
74+
protected void assertEquals(double expected, double actual, double delta) {
75+
Assertions.assertEquals(expected, actual, delta);
76+
}
77+
78+
protected void assertEquals(String message, float expected, float actual, float delta) {
79+
Assertions.assertEquals(expected, actual, delta, message);
80+
}
81+
82+
protected void assertEquals(float expected, float actual, float delta) {
83+
Assertions.assertEquals(expected, actual, delta);
84+
}
85+
86+
protected void assertNotNull(String message, Object object) {
87+
Assertions.assertNotNull(object, message);
88+
}
89+
90+
protected void assertNull(String message, Object object) {
91+
Assertions.assertNull(object, message);
92+
}
93+
94+
protected void assertSame(Object expected, Object actual) {
95+
Assertions.assertSame(expected, actual);
96+
}
97+
98+
protected void assertSame(String message, Object expected, Object actual) {
99+
Assertions.assertSame(expected, actual, message);
100+
}
101+
102+
protected void assertNotSame(Object expected, Object actual) {
103+
Assertions.assertNotSame(expected, actual);
104+
}
105+
106+
protected void assertNotSame(String message, Object expected, Object actual) {
107+
Assertions.assertNotSame(expected, actual, message);
108+
}
109+
}

0 commit comments

Comments
 (0)