aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/org/traccar/reports
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/reports
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/reports')
-rw-r--r--src/test/java/org/traccar/reports/ReportUtilsTest.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/java/org/traccar/reports/ReportUtilsTest.java b/src/test/java/org/traccar/reports/ReportUtilsTest.java
index aa166dc25..09e5b3e27 100644
--- a/src/test/java/org/traccar/reports/ReportUtilsTest.java
+++ b/src/test/java/org/traccar/reports/ReportUtilsTest.java
@@ -1,8 +1,8 @@
package org.traccar.reports;
import org.apache.velocity.app.VelocityEngine;
-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.api.security.PermissionsService;
import org.traccar.config.Config;
@@ -26,10 +26,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -38,7 +38,7 @@ public class ReportUtilsTest extends BaseTest {
private Storage storage;
- @Before
+ @BeforeEach
public void init() throws StorageException {
storage = mock(Storage.class);
when(storage.getObject(any(), any())).thenReturn(mock(Device.class));