From 164d0b4fca59956c6d8006b4966f7eef611ab852 Mon Sep 17 00:00:00 2001 From: Mohammad Yazdanpanah Date: Sat, 23 Dec 2023 18:27:33 +0330 Subject: [PATCH] Integrate junit version in ClientTpcConfigTest and HazelcastOSGiIT test classes #26193 --- .../java/com/hazelcast/client/config/ClientTpcConfigTest.java | 2 +- .../src/test/java/com/hazelcast/osgi/HazelcastOSGiIT.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hazelcast/src/test/java/com/hazelcast/client/config/ClientTpcConfigTest.java b/hazelcast/src/test/java/com/hazelcast/client/config/ClientTpcConfigTest.java index f2138a38b3b8..283894fdbc75 100644 --- a/hazelcast/src/test/java/com/hazelcast/client/config/ClientTpcConfigTest.java +++ b/hazelcast/src/test/java/com/hazelcast/client/config/ClientTpcConfigTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.Assert.assertTrue; /** * Needs to run serially because it messes with system properties. diff --git a/hazelcast/src/test/java/com/hazelcast/osgi/HazelcastOSGiIT.java b/hazelcast/src/test/java/com/hazelcast/osgi/HazelcastOSGiIT.java index 60259fbfee39..01a95ae2f7b7 100644 --- a/hazelcast/src/test/java/com/hazelcast/osgi/HazelcastOSGiIT.java +++ b/hazelcast/src/test/java/com/hazelcast/osgi/HazelcastOSGiIT.java @@ -18,8 +18,8 @@ import com.hazelcast.instance.BuildInfoProvider; import com.hazelcast.test.annotation.QuickTest; +import org.junit.After; import org.junit.experimental.categories.Category; -import org.junit.jupiter.api.AfterEach; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.ExamReactorStrategy; @@ -65,7 +65,7 @@ public Option[] config() { return options(hzBundle, junitBundles); } - @AfterEach + @After public void tearDown() throws Exception { for (Bundle bundle : bundleContext.getBundles()) { if ("com.hazelcast".equals(bundle.getSymbolicName())) {