fixed bug on singleJobLauncher and acceptance tests

.gradle/2.11/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Fri Mar 10 00:24:12 GMT 2017

.gradle/2.3/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Mon Mar 13 17:13:14 GMT 2017

README.md

@@ -207,6 +207,27 @@ gradlew  -DsqlServerIntegTest.single=TikaWithoutScheduling -i sqlServerIntegTest
 
 Applications that require GATE generally need to be configured to point to the GATE installation directory (or they would need to include a rather large amount of plugins on their classpath). To do this in cogstack, set the appropriate properties as detailed in gate.* .
 
+
+## Acceptance Tests
+
+The accompanying manuscript for this piece describes some artifically generated pseudo-documents containing misspellings and
+ other string mutations in order to validate the de-identification algorithm without requiring access to real world
+ data. These results can be replicated (subject to RNG) by using the acceptance test package.
+
+To reproduce the results described in the manuscript, simply run the following command:
+```
+gradlew  -DacceptTest.single=ElasticGazetteerAcceptanceTest -i acceptTest
+```
+
+to reconfigure this test class for the different conditions described in the manuscript, you will need to alter the parameters inside the
+
+ ```
+ elasticgazetteer_test.properties
+ ```
+
+file, which describes the potential options. For efficiency, it is recommended to do this from inside an IDE.
+
+
 ## Example usage in real world deployments
 
 The entire process is run through the command line, taking a path to a directory as a single argument. This directory should contain configuration files, (one complete one per spring batch job that you want to run simultaneously). These config files selectively activate Spring profiles as required to perform required data selection, processing and output writing steps.

build.gradle

@@ -127,8 +127,29 @@ task sqlServerIntegTest(type: Test) {
 }
 
 task acceptTest(type: Test) {
-    testClassesDir = sourceSets.acceptTest.output.classesDir
+    testClassesDir = new File(sourceSets.acceptTest.output.classesDir.absolutePath
+            +'/uk/ac/kcl/at')
+    print testClassesDir.absolutePath
     classpath = sourceSets.acceptTest.runtimeClasspath
+    print classpath
+
+    beforeTest { descriptor ->
+        logger.lifecycle("Running test: " + descriptor)
+    }
+
+    // listen to standard out and standard error of the test JVM(s)
+    onOutput { descriptor, event ->
+        logger.lifecycle("Test: " + descriptor + " produced standard out/err: " + event.message)
+    }
+
+    beforeTest { descriptor ->
+        logger.lifecycle("Running test: " + descriptor)
+    }
+
+    // listen to standard out and standard error of the test JVM(s)
+    onOutput { descriptor, event ->
+        logger.lifecycle("Test: " + descriptor + " produced standard out/err: " + event.message)
+    }
 }
 
 

src/acceptance-test/java/uk/ac/kcl/at/ElasticGazetteerAcceptanceTest.java

@@ -28,7 +28,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import uk.ac.kcl.utils.DbmsTestUtils;
-import uk.ac.kcl.it.PostGresTestUtils;
+import uk.ac.kcl.utils.PostGresTestUtils;
 import uk.ac.kcl.utils.SqlServerTestUtils;
 import uk.ac.kcl.utils.TestUtils;
 import uk.ac.kcl.mutators.Mutant;
@@ -59,8 +59,6 @@
 @TestPropertySource({
         "classpath:postgres_test.properties",
         "classpath:postgres_db.properties",
-//        "classpath:sql_server_test.properties",
-//        "classpath:sql_server_db.properties",
         "classpath:jms.properties",
         "classpath:noScheduling.properties",
         "classpath:gate.properties",
@@ -71,10 +69,9 @@
 @ContextConfiguration(classes = {
         SingleJobLauncher.class,
         PostGresTestUtils.class,
-        SqlServerTestUtils.class,
         TestUtils.class},
         loader = AnnotationConfigContextLoader.class)
-@ActiveProfiles({"deid","basic","localPartitioning","jdbc","elasticsearch","primaryKeyPartition","postgres"})
+@ActiveProfiles({"deid","localPartitioning","jdbc_in","elasticsearchRest","primaryKeyPartition","postgres"})
 //@ActiveProfiles({"deid","basic","localPartitioning","jdbc","primaryKeyPartition","sqlserver"})
 public class ElasticGazetteerAcceptanceTest {
 

src/main/java/uk/ac/kcl/scheduling/ScheduledJobLauncher.java

@@ -17,6 +17,7 @@
 
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -28,7 +29,7 @@
  *
  * @author King's College London, Richard Jackson <[email protected]>
  */
-@Import(JobConfiguration.class)
+@ComponentScan({"uk.ac.kcl.scheduling"})
 @EnableScheduling
 public class ScheduledJobLauncher  {