aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGábor Somogyi <gabor.g.somogyi@gmail.com>2016-04-23 15:26:38 +0200
committerGábor Somogyi <gabor.g.somogyi@gmail.com>2016-04-23 15:26:38 +0200
commit45f1471fc612834128d4ce3751905060fda04042 (patch)
treed4963a866bcd6133ee33946d160bd48d3a504d94
parent40620ab3f10c686499ae2b25c8019280b1c82c1f (diff)
downloadtraccar-server-45f1471fc612834128d4ce3751905060fda04042.tar.gz
traccar-server-45f1471fc612834128d4ce3751905060fda04042.tar.bz2
traccar-server-45f1471fc612834128d4ce3751905060fda04042.zip
Throw away mockito
-rw-r--r--pom.xml6
-rw-r--r--src/org/traccar/protocol/H02ProtocolEncoder.java26
-rw-r--r--test/org/traccar/protocol/H02ProtocolEncoderTest.java20
3 files changed, 17 insertions, 35 deletions
diff --git a/pom.xml b/pom.xml
index 281828630..0b0d7c19b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
diff --git a/src/org/traccar/protocol/H02ProtocolEncoder.java b/src/org/traccar/protocol/H02ProtocolEncoder.java
index 302773eaa..0b41b9c93 100644
--- a/src/org/traccar/protocol/H02ProtocolEncoder.java
+++ b/src/org/traccar/protocol/H02ProtocolEncoder.java
@@ -23,20 +23,15 @@ import org.traccar.model.Command;
public class H02ProtocolEncoder extends StringProtocolEncoder {
- DateTime getActualDateTime() {
- return new DateTime(DateTimeZone.UTC);
- }
-
- private Object formatCommand(String uniqueId, String cmd, String... params) {
+ private Object formatCommand(DateTime dt, String uniqueId, String cmd, String... params) {
- DateTime now = getActualDateTime();
String result = String.format(
"*HQ,%s,%s,%02d%02d%02d",
uniqueId,
cmd,
- now.getHourOfDay(),
- now.getMinuteOfHour(),
- now.getSecondOfMinute()
+ dt.getHourOfDay(),
+ dt.getMinuteOfHour(),
+ dt.getSecondOfMinute()
);
for(String param : params) {
@@ -48,15 +43,14 @@ public class H02ProtocolEncoder extends StringProtocolEncoder {
return result;
}
- @Override
- protected Object encodeCommand(Command command) {
+ protected Object encodeCommand(Command command, DateTime dt) {
String uniqueId = getUniqueId(command.getDeviceId());
switch (command.getType()) {
case Command.TYPE_ALARM_ARM:
- return formatCommand(uniqueId, "SCF", "0", "0");
+ return formatCommand(dt, uniqueId, "SCF", "0", "0");
case Command.TYPE_ALARM_DISARM:
- return formatCommand(uniqueId, "SCF", "1", "1");
+ return formatCommand(dt, uniqueId, "SCF", "1", "1");
default:
Log.warning(new UnsupportedOperationException(command.getType()));
break;
@@ -64,4 +58,10 @@ public class H02ProtocolEncoder extends StringProtocolEncoder {
return null;
}
+
+ @Override
+ protected Object encodeCommand(Command command) {
+ DateTime dt = new DateTime(DateTimeZone.UTC);
+ return encodeCommand(command, dt);
+ }
}
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));
}
}