aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-23 14:56:25 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-23 14:56:25 +1300
commite98b651676eb7a2cd893ac996433365ac5b38ac9 (patch)
treebf6aba4f50a69738eb49a956c15cfd3fbff227dd
parent0f1fa7f6f88435fc3fb526fe9e732f2f32172071 (diff)
downloadtraccar-server-e98b651676eb7a2cd893ac996433365ac5b38ac9.tar.gz
traccar-server-e98b651676eb7a2cd893ac996433365ac5b38ac9.tar.bz2
traccar-server-e98b651676eb7a2cd893ac996433365ac5b38ac9.zip
Remove channel closing test
-rw-r--r--test/org/traccar/ChannelClosingTest.java122
-rw-r--r--test/org/traccar/helper/DateBuilderTest.java2
2 files changed, 1 insertions, 123 deletions
diff --git a/test/org/traccar/ChannelClosingTest.java b/test/org/traccar/ChannelClosingTest.java
deleted file mode 100644
index 0b138235f..000000000
--- a/test/org/traccar/ChannelClosingTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.traccar;
-
-import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.*;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.traccar.database.IdentityManager;
-import org.traccar.helper.ChannelBufferTools;
-import org.traccar.model.Device;
-import org.traccar.protocol.GatorProtocol;
-import org.traccar.protocol.GatorProtocolDecoder;
-
-import java.net.*;
-import java.util.concurrent.CyclicBarrier;
-
-public class ChannelClosingTest {
-
- @BeforeClass
- public static void init() {
- Context.init(new IdentityManager() {
-
- private Device createDevice() {
- return null;
- }
-
- @Override
- public Device getDeviceById(long id) {
- return createDevice();
- }
-
- @Override
- public Device getDeviceByUniqueId(String imei) {
- return createDevice();
- }
-
- });
- }
-
- static class ExceptionWaiter implements ChannelUpstreamHandler {
- final CyclicBarrier barrier = new CyclicBarrier(2);
- Channel channel;
-
- @Override
- public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception {
- ctx.sendUpstream(e);
- if (e instanceof ExceptionEvent) {
- channel = e.getChannel();
- barrier.await();
- }
- }
-
- void waitFor() throws Exception {
- barrier.await();
- }
-
- Channel channel() {
- return channel;
- }
- }
-
- @Test
- public void testUDP() throws Exception {
- final ExceptionWaiter exception = new ExceptionWaiter();
-
- TrackerServer udpServer = new TrackerServer(new ConnectionlessBootstrap(), "gator") {
- @Override
- protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("objectDecoder", new GatorProtocolDecoder(new GatorProtocol()));
- pipeline.addLast("exceptionWaiter", exception);
- }
- };
- final int PORT = 50522;
- udpServer.setPort(PORT);
- try {
- udpServer.start();
- Assert.assertFalse(udpServer.getChannelGroup().isEmpty());
- try (DatagramSocket socket = new DatagramSocket()) {
- socket.connect(InetAddress.getLocalHost(), PORT);
- byte[] data = ChannelBufferTools.convertHexString("242400");
- socket.send(new DatagramPacket(data, data.length));
- }
- exception.waitFor();
- Assert.assertFalse(udpServer.getChannelGroup().isEmpty());
- Assert.assertTrue(exception.channel().isBound());
- Assert.assertTrue(exception.channel().isOpen());
- } finally {
- udpServer.stop();
- }
- }
-
- @Test
- public void testTCP() throws Exception {
- final ExceptionWaiter exception = new ExceptionWaiter();
- TrackerServer tcpServer = new TrackerServer(new ServerBootstrap(), "gator") {
- @Override
- protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("objectDecoder", new GatorProtocolDecoder(new GatorProtocol()));
- pipeline.addLast("exceptionWaiter", exception);
- }
- };
- final int PORT = 50522;
- tcpServer.setPort(PORT);
- try {
- tcpServer.start();
- try (Socket socket = new Socket()) {
- socket.connect(new InetSocketAddress(InetAddress.getLocalHost(), PORT));
-
- byte[] data = ChannelBufferTools.convertHexString("242400");
- socket.getOutputStream().write(data);
-
- exception.waitFor();
- Assert.assertFalse(exception.channel().isBound());
- Assert.assertFalse(exception.channel().isOpen());
- Assert.assertFalse(exception.channel().isConnected());
- }
- } finally {
- tcpServer.stop();
- }
- }
-}
diff --git a/test/org/traccar/helper/DateBuilderTest.java b/test/org/traccar/helper/DateBuilderTest.java
index 8e474e059..74936208b 100644
--- a/test/org/traccar/helper/DateBuilderTest.java
+++ b/test/org/traccar/helper/DateBuilderTest.java
@@ -17,7 +17,7 @@ public class DateBuilderTest {
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
DateBuilder dateBuilder = new DateBuilder()
- .setDate(2015, 10, 20).setTime(01, 21, 11);
+ .setDate(2015, 10, 20).setTime(1, 21, 11);
Assert.assertEquals(dateFormat.parse("2015-10-20 01:21:11"), dateBuilder.getDate());