Added many more functional tests.

Had to change the JDK level to JDK 6 because GroovyScriptEngine's caching fails of not detecting file changes with JDK 7
ehenson · Nov 2, 2013 · 03567bb · 03567bb
1 parent 493573c
commit 03567bb
Show file tree

Hide file tree

Showing 6 changed files with 301 additions and 20 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Grails Service Bus-grailsPlugins.iml b/Grails Service Bus-grailsPlugins.iml
@@ -12,10 +12,7 @@
     </facet>
     <facet type="hibernate" name="Hibernate">
       <configuration>
-        <datasource-map>
-          <unit-entry name="Gorm" />
-          <unit-entry name="sessionFactory" />
-        </datasource-map>
+        <datasource-map />
         <naming-strategy-map />
       </configuration>
     </facet>
@@ -65,10 +62,9 @@
       <sourceFolder url="file://$MODULE_DIR$/target/work/plugins/yammer-metrics-2.1.2-6/src/groovy" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/work/plugins/yammer-metrics-2.1.2-6/grails-app/i18n" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="grails-2.3.1" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="grails-2.3.1" level="application" />
     <orderEntry type="module-library" exported="">
       <library name="Grails User Library (Grails Service Bus-grailsPlugins)">
         <CLASSES>
@@ -105,7 +101,6 @@
           <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.5/jackson-mapper-asl-1.9.5.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-servlet/2.1.2/metrics-servlet-2.1.2.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/liquibase/liquibase-core/2.0.5/liquibase-core-2.0.5.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/modules/http-builder/http-builder/0.5.0/http-builder-0.5.0.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/gmock/gmock/0.8.1/gmock-0.8.1.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/geb/geb-core/0.6.0/geb-core-0.6.0.jar!/" />
@@ -114,12 +109,13 @@
           <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit-core-js/2.8/htmlunit-core-js-2.8.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.0.1/httpmime-4.0.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit/2.8/htmlunit-2.8.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/seleniumhq/selenium/selenium-common/2.0a7/selenium-common-2.0a7.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/seleniumhq/selenium/selenium-htmlunit-driver/2.0a7/selenium-htmlunit-driver-2.0a7.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.5/junit-4.5.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

diff --git a/Grails Service Bus.iml b/Grails Service Bus.iml
@@ -73,7 +73,7 @@
       <excludeFolder url="file://$MODULE_DIR$/target/work/tests" />
       <excludeFolder url="file://$MODULE_DIR$/target/work/tomcat" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" exported="">
       <library name="Grails User Library (grailsservicebus)">
@@ -112,7 +112,6 @@
           <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.5/jackson-mapper-asl-1.9.5.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/com/yammer/metrics/metrics-servlet/2.1.2/metrics-servlet-2.1.2.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/liquibase/liquibase-core/2.0.5/liquibase-core-2.0.5.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/modules/http-builder/http-builder/0.5.0/http-builder-0.5.0.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/gmock/gmock/0.8.1/gmock-0.8.1.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/geb/geb-core/0.6.0/geb-core-0.6.0.jar!/" />
@@ -121,21 +120,23 @@
           <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit-core-js/2.8/htmlunit-core-js-2.8.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.0.1/httpmime-4.0.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/htmlunit/htmlunit/2.8/htmlunit-2.8.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/seleniumhq/selenium/selenium-common/2.0a7/selenium-common-2.0a7.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/seleniumhq/selenium/selenium-htmlunit-driver/2.0a7/selenium-htmlunit-driver-2.0a7.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.5/junit-4.5.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$USER_HOME$/.ideaLibSources/htmlunit-2.8-sources.jar!/" />
+        </SOURCES>
         <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="library" name="grails-2.3.1" level="application" />
     <orderEntry type="module" module-name="Grails Service Bus-grailsPlugins" />
-    <orderEntry type="library" name="grails-2.3.1" level="application" />
   </component>
 </module>
 
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
@@ -41,9 +41,9 @@ grails.project.dependency.resolution = {
     repositories {
         inherits true // Whether to inherit repository definitions from plugins
 
+        mavenLocal()
         grailsPlugins()
         grailsHome()
-        mavenLocal()
         grailsCentral()
         mavenCentral()
         // uncomment these (or add new ones) to enable remote dependency resolution from public Maven repositories
@@ -60,10 +60,10 @@ grails.project.dependency.resolution = {
         test "org.codehaus.geb:geb-core:0.6.0",
                 "org.gmock:gmock:0.8.1"
         test    "org.codehaus.groovy.modules.http-builder:http-builder:0.5.0", {
-            excludes "commons-logging", "httpclient", "xml-apis", "groovy"
+            excludes "commons-logging", "xml-apis", "groovy", "httpclient"
         }
         test    "org.seleniumhq.selenium:selenium-htmlunit-driver:2.0a7", {
-            excludes "htmlunit", "xml-apis"
+            excludes "xml-apis", "htmlunit"
         }
         test    "net.sourceforge.htmlunit:htmlunit:2.8", {
             excludes "xml-apis", "commons-logging"

diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy
@@ -116,7 +116,7 @@ environments {
 // log4j configuration
 log4j = {
     root {
-        trace()
+//        trace()
 //        info()
     }