From e5677baf07d059ae7bcb2b84fde850ece5b678a2 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 29 Jan 2026 10:45:21 +0900 Subject: [PATCH 1/2] Update version to 15.5.0-SNAPSHOT --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9b63304..58ff7e8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fess-script-example jar Example Script Plugin - 15.4.0-SNAPSHOT + 15.5.0-SNAPSHOT scm:git:git@github.com:codelibs/fess-script-example.git scm:git:git@github.com:codelibs/fess-script-example.git @@ -15,7 +15,7 @@ org.codelibs.fess fess-parent - 15.4.0 + 15.5.0-SNAPSHOT From d09ddfe712c058b655f4a3474122a78e8199de6c Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 29 Jan 2026 14:18:09 +0900 Subject: [PATCH 2/2] Migrate tests to JUnit 5 / utflute 2.5.0 --- .../script/example/ExampleEngineTest.java | 14 ++- .../script/example/UnitScriptTestCase.java | 109 ++++++++++++++++++ 2 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 src/test/java/org/codelibs/fess/script/example/UnitScriptTestCase.java diff --git a/src/test/java/org/codelibs/fess/script/example/ExampleEngineTest.java b/src/test/java/org/codelibs/fess/script/example/ExampleEngineTest.java index 2c101b3..dfb2e1d 100644 --- a/src/test/java/org/codelibs/fess/script/example/ExampleEngineTest.java +++ b/src/test/java/org/codelibs/fess/script/example/ExampleEngineTest.java @@ -15,13 +15,15 @@ */ package org.codelibs.fess.script.example; +import org.junit.jupiter.api.TestInfo; + import java.util.HashMap; import java.util.Map; import org.codelibs.fess.util.ComponentUtil; -import org.dbflute.utflute.lastaflute.LastaFluteTestCase; +import org.codelibs.fess.script.example.UnitScriptTestCase; -public class ExampleEngineTest extends LastaFluteTestCase { +public class ExampleEngineTest extends UnitScriptTestCase { public ExampleEngine exampleEngine; @Override @@ -35,15 +37,15 @@ protected boolean isSuppressTestCaseTransaction() { } @Override - public void setUp() throws Exception { - super.setUp(); + public void setUp(TestInfo testInfo) throws Exception { + super.setUp(testInfo); exampleEngine = new ExampleEngine(); } @Override - public void tearDown() throws Exception { + public void tearDown(TestInfo testInfo) throws Exception { ComponentUtil.setFessConfig(null); - super.tearDown(); + super.tearDown(testInfo); } public void test_evaluate() { diff --git a/src/test/java/org/codelibs/fess/script/example/UnitScriptTestCase.java b/src/test/java/org/codelibs/fess/script/example/UnitScriptTestCase.java new file mode 100644 index 0000000..f8b2518 --- /dev/null +++ b/src/test/java/org/codelibs/fess/script/example/UnitScriptTestCase.java @@ -0,0 +1,109 @@ +/* + * Copyright 2012-2025 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.script.example; + +import org.codelibs.fess.util.ComponentUtil; +import org.dbflute.utflute.lastaflute.LastaFluteTestCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.TestInfo; + +public abstract class UnitScriptTestCase extends LastaFluteTestCase { + private static final ThreadLocal currentTestInfo = new ThreadLocal<>(); + + @Override + protected String prepareConfigFile() { + return "test_app.xml"; + } + + @Override + protected void setUp(TestInfo testInfo) throws Exception { + currentTestInfo.set(testInfo); + super.setUp(testInfo); + } + + @Override + protected void tearDown(TestInfo testInfo) throws Exception { + ComponentUtil.setFessConfig(null); + super.tearDown(testInfo); + } + + protected String getName() { + TestInfo info = currentTestInfo.get(); + return info != null ? info.getDisplayName() : "unknown"; + } + + // ===== Assert methods for JUnit 4/5 compatibility ===== + + protected void fail(String message) { + Assertions.fail(message); + } + + protected void assertTrue(String message, boolean condition) { + Assertions.assertTrue(condition, message); + } + + protected void assertFalse(String message, boolean condition) { + Assertions.assertFalse(condition, message); + } + + protected void assertEquals(String message, Object expected, Object actual) { + Assertions.assertEquals(expected, actual, message); + } + + protected void assertEquals(String message, long expected, long actual) { + Assertions.assertEquals(expected, actual, message); + } + + protected void assertEquals(String message, double expected, double actual, double delta) { + Assertions.assertEquals(expected, actual, delta, message); + } + + protected void assertEquals(double expected, double actual, double delta) { + Assertions.assertEquals(expected, actual, delta); + } + + protected void assertEquals(String message, float expected, float actual, float delta) { + Assertions.assertEquals(expected, actual, delta, message); + } + + protected void assertEquals(float expected, float actual, float delta) { + Assertions.assertEquals(expected, actual, delta); + } + + protected void assertNotNull(String message, Object object) { + Assertions.assertNotNull(object, message); + } + + protected void assertNull(String message, Object object) { + Assertions.assertNull(object, message); + } + + protected void assertSame(Object expected, Object actual) { + Assertions.assertSame(expected, actual); + } + + protected void assertSame(String message, Object expected, Object actual) { + Assertions.assertSame(expected, actual, message); + } + + protected void assertNotSame(Object expected, Object actual) { + Assertions.assertNotSame(expected, actual); + } + + protected void assertNotSame(String message, Object expected, Object actual) { + Assertions.assertNotSame(expected, actual, message); + } +}