Started working on an embeddable test version of the service for unit testing.

build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "groovy"
 apply plugin: "maven"
 apply plugin: "war"
+apply plugin: "jetty"
 
 group = "com.jdbernard"
 version = "2.0"
@@ -24,7 +25,9 @@ dependencies {
     runtime 'org.glassfish.jersey.media:jersey-media-json-jackson:2.16'
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
 
+    testCompile 'com.jdbernard:jdb-util:3.4'
     testCompile 'junit:junit:4.12'
+    testRuntime 'com.h2database:h2:1.4.186'
 
     /*
     compile 'org.hibernate:hibernate-core:4.3.8.Final'
@@ -37,9 +40,15 @@ dependencies {
     */
 }
 
-war {
-    from "resources/webapp"
-}
+war { from "resources/webapp" }
+
+test { testLogging { events 'passed', 'failed' } }
+
+task testWar(type: War) {
+    from 'resources/webapp'
+    webInf { from 'src/test/webapp/WEB-INF' }
+    webXml = file('src/test/webapp/WEB-INF/web.xml')
+    classifier 'test' }
 
 // ## Custom tasks for local deployment
 

src/main/webapp/WEB-INF/web.xml

@@ -4,7 +4,7 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
     <context-param>
         <param-name>context.config.file</param-name>
-        <param-value>/newlifesongs.properties</param-value>
+        <param-value>/datasource.properties</param-value>
     </context-param>
 
     <listener>

src/test/groovy/com/jdbernard/nlsongs/rest/SongsResourceTest.groovy

@@ -0,0 +1,12 @@
+package com.jdbernard.nlsongs.rest
+
+import com.jdbernard.net.HttpContext
+import org.junit.Test
+import org.junit.AfterClass
+import org.junit.BeforeClass
+
+import static org.junit.Assert.*
+
+public class SongsResourceTest {
+
+}

src/test/groovy/com/jdbernard/nlsongs/service/NLSongsDBTest.groovy

@@ -0,0 +1,11 @@
+package com.jdbernard.nlsongs.service
+
+import org.junit.Test
+import org.junit.AfterClass
+import org.junit.BeforeClass
+
+import static org.junit.Assert.*
+
+public class NLSongsDBTest {
+
+}

src/test/webapp/WEB-INF/classes/datasource.test.properties

@@ -0,0 +1,3 @@
+dataSource.jdbcUrl=jdbc:h2:resources/test/testdb
+dataSource.user=sa
+dataSource.password=

src/test/webapp/WEB-INF/web.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This web.xml file is not required when using Servlet 3.0 container,
+     see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+    <context-param>
+        <param-name>context.config.file</param-name>
+        <param-value>/datasource.test.properties</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>com.jdbernard.nlsongs.servlet.NLSongsContextListener</listener-class>
+    </listener>
+
+    <servlet>
+
+        <servlet-name>New Life Songs REST API</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+
+        <init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>com.jdbernard.nlsongs.rest</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature</param-value>
+        </init-param>
+
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>GroovyTemplate</servlet-name>
+        <servlet-class>groovy.servlet.TemplateServlet</servlet-class>    
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>New Life Songs REST API</servlet-name>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>GroovyTemplate</servlet-name>
+        <url-pattern>*.gsp</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>index.gsp</welcome-file>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+</web-app>