Fix config issue and clean up (fix #3136)

2 files changed, 19 insertions, 18 deletions

diff --git a/test/org/traccar/ConfigTest.java b/test/org/traccar/ConfigTest.java
new file mode 100644
index 000000000..fa404b827
--- /dev/null
+++ b/test/org/traccar/ConfigTest.java
@@ -0,0 +1,19 @@
+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/config/EnvVarTest.java b/test/org/traccar/config/EnvVarTest.java
deleted file mode 100644
index b90fd485c..000000000
--- a/test/org/traccar/config/EnvVarTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.traccar.config;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import org.traccar.Config;
-
-public class EnvVarTest {
-
-    @Test
-    public void testFormat() {
-        assertEquals("DATABASE_URL", Config.getEnvVarName("database.url"));
-        assertEquals("DATABASE_CHECK_CONNECTION", Config.getEnvVarName("database.checkConnection"));
-        assertEquals("DATABASE_MAX_POOL_SIZE", Config.getEnvVarName("database.maxPoolSize"));
-        assertEquals("DEVICE_MANAGER_LOOKUP_GROUPS_ATTRIBUTE", Config.getEnvVarName("deviceManager.lookupGroupsAttribute"));
-        assertEquals("COMMAND_FALLBACK_TO_SMS", Config.getEnvVarName("command.fallbackToSms"));
-        assertEquals("STATUS_TIMEOUT", Config.getEnvVarName("status.timeout"));
-    }
-}