Throw away mockito

1 files changed, 4 insertions, 16 deletions

diff --git a/test/org/traccar/protocol/H02ProtocolEncoderTest.java b/test/org/traccar/protocol/H02ProtocolEncoderTest.java
index d50e66d72..50f36c12d 100644
--- a/test/org/traccar/protocol/H02ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/H02ProtocolEncoderTest.java
@@ -2,26 +2,14 @@ package org.traccar.protocol;
 
 import org.joda.time.DateTime;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.traccar.ProtocolTest;
 import org.traccar.model.Command;
 
-import static org.mockito.Mockito.when;
-
 public class H02ProtocolEncoderTest extends ProtocolTest {
 
-    @Spy
-    H02ProtocolEncoder encoder;
-
-    @Before
-    public void before() {
-        MockitoAnnotations.initMocks(this);
-        DateTime dt = new DateTime().withHourOfDay(1).withMinuteOfHour(2).withSecondOfMinute(3);
-        when(encoder.getActualDateTime()).thenReturn(dt);
-    }
+    H02ProtocolEncoder encoder = new H02ProtocolEncoder();
+    DateTime dt = new DateTime().withHourOfDay(1).withMinuteOfHour(2).withSecondOfMinute(3);;
 
     @Test
     public void testAlarmArmEncode() throws Exception {
@@ -30,7 +18,7 @@ public class H02ProtocolEncoderTest extends ProtocolTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ALARM_ARM);
 
-        Assert.assertEquals("*HQ,123456789012345,SCF,010203,0,0#", encoder.encodeCommand(command));
+        Assert.assertEquals("*HQ,123456789012345,SCF,010203,0,0#", encoder.encodeCommand(command, dt));
     }
 
     @Test
@@ -40,6 +28,6 @@ public class H02ProtocolEncoderTest extends ProtocolTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ALARM_DISARM);
 
-        Assert.assertEquals("*HQ,123456789012345,SCF,010203,1,1#", encoder.encodeCommand(command));
+        Assert.assertEquals("*HQ,123456789012345,SCF,010203,1,1#", encoder.encodeCommand(command, dt));
     }
 }