Convert project to Kotlin
Этот коммит содержится в:
@@ -1,43 +1,35 @@
|
||||
package org.traccar.client
|
||||
|
||||
package org.traccar.client;
|
||||
|
||||
import android.location.Location;
|
||||
import android.os.Build;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
|
||||
@Config(sdk = Build.VERSION_CODES.P)
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class DatabaseHelperTest {
|
||||
import android.location.Location
|
||||
import android.os.Build
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import org.junit.Assert
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@Config(sdk = [Build.VERSION_CODES.P])
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
class DatabaseHelperTest {
|
||||
@Test
|
||||
public void test() throws Exception {
|
||||
fun test() {
|
||||
|
||||
DatabaseHelper databaseHelper = new DatabaseHelper(RuntimeEnvironment.application);
|
||||
val databaseHelper = DatabaseHelper(ApplicationProvider.getApplicationContext())
|
||||
|
||||
Position position = new Position("123456789012345", new Location("gps"), 0);
|
||||
position.setTime(new Date(0));
|
||||
var position: Position? = Position("123456789012345", Location("gps"), 0.0)
|
||||
|
||||
assertNull(databaseHelper.selectPosition());
|
||||
Assert.assertNull(databaseHelper.selectPosition())
|
||||
|
||||
databaseHelper.insertPosition(position);
|
||||
databaseHelper.insertPosition(position!!)
|
||||
|
||||
position = databaseHelper.selectPosition();
|
||||
position = databaseHelper.selectPosition()
|
||||
|
||||
assertNotNull(position);
|
||||
Assert.assertNotNull(position)
|
||||
|
||||
databaseHelper.deletePosition(position.getId());
|
||||
databaseHelper.deletePosition(position!!.id)
|
||||
|
||||
assertNull(databaseHelper.selectPosition());
|
||||
Assert.assertNull(databaseHelper.selectPosition())
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,49 +1,37 @@
|
||||
package org.traccar.client
|
||||
|
||||
package org.traccar.client;
|
||||
import android.location.Location
|
||||
import android.os.Build
|
||||
import org.junit.Assert
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.traccar.client.ProtocolFormatter.formatRequest
|
||||
|
||||
import android.location.Location;
|
||||
import android.os.Build;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
@Config(sdk = Build.VERSION_CODES.P)
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ProtocolFormatterTest {
|
||||
@Config(sdk = [Build.VERSION_CODES.P])
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
class ProtocolFormatterTest {
|
||||
|
||||
@Test
|
||||
public void testFormatRequest() throws Exception {
|
||||
|
||||
Position position = new Position("123456789012345", new Location("gps"), 0);
|
||||
position.setTime(new Date(0));
|
||||
|
||||
String url = ProtocolFormatter.formatRequest("http://localhost:5055", position);
|
||||
assertEquals("http://localhost:5055?id=123456789012345×tamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&accuracy=0.0&batt=0.0", url);
|
||||
fun testFormatRequest() {
|
||||
val position = Position("123456789012345", Location("gps"), 0.0)
|
||||
val url = formatRequest("http://localhost:5055", position)
|
||||
Assert.assertEquals("http://localhost:5055?id=123456789012345×tamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&accuracy=0.0&batt=0.0", url)
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFormatPathPortRequest() throws Exception {
|
||||
|
||||
Position position = new Position("123456789012345", new Location("gps"), 0);
|
||||
position.setTime(new Date(0));
|
||||
|
||||
String url = ProtocolFormatter.formatRequest("http://localhost:8888/path", position);
|
||||
assertEquals("http://localhost:8888/path?id=123456789012345×tamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&accuracy=0.0&batt=0.0", url);
|
||||
fun testFormatPathPortRequest() {
|
||||
val position = Position("123456789012345", Location("gps"), 0.0)
|
||||
val url = formatRequest("http://localhost:8888/path", position)
|
||||
Assert.assertEquals("http://localhost:8888/path?id=123456789012345×tamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&accuracy=0.0&batt=0.0", url)
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFormatAlarmRequest() throws Exception {
|
||||
|
||||
Position position = new Position("123456789012345", new Location("gps"), 0);
|
||||
position.setTime(new Date(0));
|
||||
|
||||
String url = ProtocolFormatter.formatRequest("http://localhost:5055/path", position, "alert message");
|
||||
assertEquals("http://localhost:5055/path?id=123456789012345×tamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&accuracy=0.0&batt=0.0&alarm=alert%20message", url);
|
||||
fun testFormatAlarmRequest() {
|
||||
val position = Position("123456789012345", Location("gps"), 0.0)
|
||||
val url = formatRequest("http://localhost:5055/path", position, "alert message")
|
||||
Assert.assertEquals("http://localhost:5055/path?id=123456789012345×tamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&accuracy=0.0&batt=0.0&alarm=alert%20message", url)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,26 +1,22 @@
|
||||
package org.traccar.client
|
||||
|
||||
package org.traccar.client;
|
||||
import android.os.Build
|
||||
import org.junit.Assert
|
||||
import org.junit.Ignore
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.traccar.client.RequestManager.sendRequest
|
||||
|
||||
import android.os.Build;
|
||||
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
@Config(sdk = Build.VERSION_CODES.P)
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class RequestManagerTest {
|
||||
@Config(sdk = [Build.VERSION_CODES.P])
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
class RequestManagerTest {
|
||||
|
||||
@Ignore("Not a real unit test")
|
||||
@Test
|
||||
public void testSendRequest() throws Exception {
|
||||
|
||||
assertTrue(RequestManager.sendRequest("http://www.google.com"));
|
||||
|
||||
fun testSendRequest() {
|
||||
Assert.assertTrue(sendRequest("http://www.google.com"))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user