From 1e2c06694e787201209b1d8953cf498a72c335d8 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 23 Feb 2019 11:04:08 -0800 Subject: Refactor configuration --- test/org/traccar/ConfigTest.java | 19 ------------------- test/org/traccar/WebDataHandlerTest.java | 4 +++- test/org/traccar/config/ConfigTest.java | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 test/org/traccar/ConfigTest.java create mode 100644 test/org/traccar/config/ConfigTest.java (limited to 'test') diff --git a/test/org/traccar/ConfigTest.java b/test/org/traccar/ConfigTest.java deleted file mode 100644 index fa404b827..000000000 --- a/test/org/traccar/ConfigTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.traccar; - -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import org.traccar.Config; - -public class ConfigTest { - - @Test - public void testFormat() { - assertEquals("DATABASE_URL", Config.getEnvironmentVariableName("database.url")); - assertEquals("DATABASE_CHECK_CONNECTION", Config.getEnvironmentVariableName("database.checkConnection")); - assertEquals("DATABASE_MAX_POOL_SIZE", Config.getEnvironmentVariableName("database.maxPoolSize")); - assertEquals("DEVICE_MANAGER_LOOKUP_GROUPS_ATTRIBUTE", Config.getEnvironmentVariableName("deviceManager.lookupGroupsAttribute")); - assertEquals("COMMAND_FALLBACK_TO_SMS", Config.getEnvironmentVariableName("command.fallbackToSms")); - assertEquals("STATUS_TIMEOUT", Config.getEnvironmentVariableName("status.timeout")); - } - -} diff --git a/test/org/traccar/WebDataHandlerTest.java b/test/org/traccar/WebDataHandlerTest.java index 1cdb08440..cfbd71f23 100644 --- a/test/org/traccar/WebDataHandlerTest.java +++ b/test/org/traccar/WebDataHandlerTest.java @@ -1,6 +1,8 @@ package org.traccar; import org.junit.Test; +import org.traccar.config.Config; +import org.traccar.config.Keys; import org.traccar.model.Position; import static org.junit.Assert.assertEquals; @@ -11,7 +13,7 @@ public class WebDataHandlerTest extends ProtocolTest { public void testFormatRequest() throws Exception { Config config = new Config(); - config.setString("forward.url", "http://localhost/?fixTime={fixTime}&gprmc={gprmc}&name={name}"); + config.setString(Keys.FORWARD_URL, "http://localhost/?fixTime={fixTime}&gprmc={gprmc}&name={name}"); Position position = position("2016-01-01 01:02:03.000", true, 20, 30); diff --git a/test/org/traccar/config/ConfigTest.java b/test/org/traccar/config/ConfigTest.java new file mode 100644 index 000000000..13d0ffb04 --- /dev/null +++ b/test/org/traccar/config/ConfigTest.java @@ -0,0 +1,19 @@ +package org.traccar.config; + +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import org.traccar.config.Config; + +public class ConfigTest { + + @Test + public void testFormat() { + assertEquals("DATABASE_URL", Config.getEnvironmentVariableName("database.url")); + assertEquals("DATABASE_CHECK_CONNECTION", Config.getEnvironmentVariableName("database.checkConnection")); + assertEquals("DATABASE_MAX_POOL_SIZE", Config.getEnvironmentVariableName("database.maxPoolSize")); + assertEquals("DEVICE_MANAGER_LOOKUP_GROUPS_ATTRIBUTE", Config.getEnvironmentVariableName("deviceManager.lookupGroupsAttribute")); + assertEquals("COMMAND_FALLBACK_TO_SMS", Config.getEnvironmentVariableName("command.fallbackToSms")); + assertEquals("STATUS_TIMEOUT", Config.getEnvironmentVariableName("status.timeout")); + } + +} -- cgit v1.2.3