From a946618d649cde478d8750bb6b84cb521b68c87c Mon Sep 17 00:00:00 2001
From: Leandro Silva Ferreira <leandrosilvaferreira@gmail.com>
Date: Wed, 15 Aug 2012 08:58:26 -0400
Subject: Corrections of wrong "git fetch upstream"

---
 .../traccar/protocol/ST210ProtocolDecoderTest.java | 53 ++--------------------
 1 file changed, 3 insertions(+), 50 deletions(-)

(limited to 'test/org')

diff --git a/test/org/traccar/protocol/ST210ProtocolDecoderTest.java b/test/org/traccar/protocol/ST210ProtocolDecoderTest.java
index 63234efd0..9fc6f9e28 100644
--- a/test/org/traccar/protocol/ST210ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/ST210ProtocolDecoderTest.java
@@ -1,58 +1,11 @@
 package org.traccar.protocol;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
-import java.sql.SQLException;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.traccar.Server;
-import org.traccar.helper.Log;
-//import org.traccar.server.SocketCliente;
 
 public class ST210ProtocolDecoderTest {
 
-	/*
-	@BeforeClass
-	public static void UpServer() {
-		final Server service = new Server();
-		String[] args = new String[1];
-		args[0] = "setup\\windows\\windows.cfg";
-		try {
-			service.init(args);
-
-			Log.info("starting server...");
-			service.start();
-
-			// Shutdown server properly
-			Runtime.getRuntime().addShutdownHook(new Thread() {
-				@Override
-				public void run() {
-					Log.info("shutting down server...");
-					service.stop();
-				}
-			});
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	@Test
-	public void testClienteMsg() throws Exception {
-
-		SocketCliente cliente = new SocketCliente();
-		cliente.SendMSG(
-				"localhost",
-				5010,
-				"SA200STT;317652;042;20120718;15:37:12;16d41;-15.618755;-056.083241;000.024;000.00;8;1;41548;12.17;100000;2;1979");
-	}
-
-*/
-	
 	@Test
 	public void testDecode() throws Exception {
 
@@ -70,7 +23,7 @@ public class ST210ProtocolDecoderTest {
 		assertNotNull(decoder
 				.decode(null,
 						null,
-						"SA200STT;317652;042;20120722;00:24:23;16d41;-15.618767;-056.083214;000.011;000.00;11;1;41557;12.21;000000;1;3205"));
+						"SA200STT;317652;042;20120722;00:24:23;4f310;-15.618767;-056.083214;000.011;000.00;11;1;41557;12.21;000000;1;3205"));
 		assertNotNull(decoder
 				.decode(null,
 						null,
@@ -78,7 +31,7 @@ public class ST210ProtocolDecoderTest {
 		assertNotNull(decoder
 				.decode(null,
 						null,
-						"SA200STT;315198;042;20120809;13:43:34;16d41;-15.618709;-056.083223;000.025;000.00;8;1;49;12.10;100000;2;0231"));
+						"SA200STT;315198;042;20120809;13:43:34;4f310;-15.618709;-056.083223;000.025;000.00;8;1;49;12.10;100000;2;0231"));
 		assertNotNull(decoder
 				.decode(null,
 						null,
-- 
cgit v1.2.3