aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-27 23:11:55 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-27 23:11:55 +1200
commit09a99e1e3971612fe7effea976e0cd1e669f4320 (patch)
tree61419894fb84db1bcafdbb3891bcfe8898a508c0
parent2e9842ebfa6d8b4d053d66c437a11190a0f49e6e (diff)
parentcde27ba6fa8f5b2966d3b60e611f575198fee85c (diff)
downloadtraccar-server-09a99e1e3971612fe7effea976e0cd1e669f4320.tar.gz
traccar-server-09a99e1e3971612fe7effea976e0cd1e669f4320.tar.bz2
traccar-server-09a99e1e3971612fe7effea976e0cd1e669f4320.zip
Merge pull request #1379 from vitalidze/master
Added smoke test for JNDI context
-rw-r--r--pom.xml12
-rw-r--r--test/org/traccar/web/WebServerInitialContextTest.java27
2 files changed, 35 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 86c703bec..31ba5609f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,10 @@
<name>traccar</name>
<url>https://www.traccar.org</url>
+ <properties>
+ <jetty.version>9.2.13.v20150730</jetty.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -71,22 +75,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.2.13.v20150730</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>9.2.13.v20150730</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.2.13.v20150730</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
- <version>9.2.13.v20150730</version>
+ <version>${jetty.version}</version>
</dependency>
</dependencies>
diff --git a/test/org/traccar/web/WebServerInitialContextTest.java b/test/org/traccar/web/WebServerInitialContextTest.java
new file mode 100644
index 000000000..dd072863c
--- /dev/null
+++ b/test/org/traccar/web/WebServerInitialContextTest.java
@@ -0,0 +1,27 @@
+package org.traccar.web;
+
+import org.junit.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+public class WebServerInitialContextTest {
+ @Test
+ public void smokeTest() throws NamingException {
+ DataSource mockDataSource = (DataSource) Proxy.newProxyInstance(getClass().getClassLoader(),
+ new Class[]{DataSource.class}, new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ return null;
+ }
+ });
+
+ Context context = new InitialContext();
+ context.bind("java:/DefaultDS", mockDataSource);
+ }
+}