aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/org/traccar/handler/FilterHandlerTest.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2023-03-06 10:56:23 -0800
committerAnton Tananaev <anton@traccar.org>2023-03-06 10:56:23 -0800
commit5505721ed5327eb65cfbbf64ad95bc956d588ba4 (patch)
tree60efdb732849e2f798f0cbc90290f6e227dbfa80 /src/test/java/org/traccar/handler/FilterHandlerTest.java
parent240fa0061368d27d950443ebf571aa2b6bf9dae3 (diff)
downloadtrackermap-server-5505721ed5327eb65cfbbf64ad95bc956d588ba4.tar.gz
trackermap-server-5505721ed5327eb65cfbbf64ad95bc956d588ba4.tar.bz2
trackermap-server-5505721ed5327eb65cfbbf64ad95bc956d588ba4.zip
Upgrade junit framework
Diffstat (limited to 'src/test/java/org/traccar/handler/FilterHandlerTest.java')
-rw-r--r--src/test/java/org/traccar/handler/FilterHandlerTest.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/java/org/traccar/handler/FilterHandlerTest.java b/src/test/java/org/traccar/handler/FilterHandlerTest.java
index a1102da88..9cb4a3bf2 100644
--- a/src/test/java/org/traccar/handler/FilterHandlerTest.java
+++ b/src/test/java/org/traccar/handler/FilterHandlerTest.java
@@ -1,7 +1,7 @@
package org.traccar.handler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.traccar.BaseTest;
import org.traccar.config.Config;
import org.traccar.config.Keys;
@@ -11,8 +11,8 @@ import org.traccar.session.cache.CacheManager;
import java.util.Date;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
@@ -23,7 +23,7 @@ public class FilterHandlerTest extends BaseTest {
private FilterHandler passingHandler;
private FilterHandler filteringHandler;
- @Before
+ @BeforeEach
public void passingHandler() {
var config = mock(Config.class);
when(config.getBoolean(Keys.FILTER_ENABLE)).thenReturn(true);
@@ -32,7 +32,7 @@ public class FilterHandlerTest extends BaseTest {
passingHandler = new FilterHandler(config, cacheManager, null);
}
- @Before
+ @BeforeEach
public void filteringHandler() {
var config = mock(Config.class);
when(config.getBoolean(Keys.FILTER_ENABLE)).thenReturn(true);