test data moved to sub directory in histream-import resources

histream-import/src/test/java/de/sekmi/histream/etl/TestETLSupplier.java

@@ -21,7 +21,7 @@ public class TestETLSupplier {
 	
 	@Before
 	public void loadConfiguration() throws IOException, ParseException{
-		os = ETLObservationSupplier.load(getClass().getResource("/test-1-datasource.xml"));
+		os = ETLObservationSupplier.load(getClass().getResource("/data/test-1-datasource.xml"));
 	}
 
 	@After

histream-import/src/test/java/de/sekmi/histream/etl/TestRowSupplier.java

@@ -9,7 +9,7 @@ public class TestRowSupplier {
 	
 	@Test
 	public void testLoadRows() throws IOException{
-		try( FileRowSupplier r = new FileRowSupplier(getClass().getResource("/test-1-patients.txt"), "\t") ){
+		try( FileRowSupplier r = new FileRowSupplier(getClass().getResource("/data/test-1-patients.txt"), "\t") ){
 			String[] h = r.getHeaders();
 			Assert.assertEquals("patid", h[0]);
 			Assert.assertEquals("nachname", h[2]);

histream-import/src/test/java/de/sekmi/histream/etl/config/TestMarshall.java

@@ -17,7 +17,7 @@ public class TestMarshall {
 
 	@Test
 	public void testUnmarshall() throws IOException{
-		try( InputStream in = getClass().getResourceAsStream("/test-1-datasource.xml") ){
+		try( InputStream in = getClass().getResourceAsStream("/data/test-1-datasource.xml") ){
 			DataSource ds = JAXB.unmarshal(in, DataSource.class);
 			Assert.assertNotNull(ds.meta);
 			Assert.assertEquals("replace-source",ds.meta.etlStrategy);

histream-import/src/test/java/de/sekmi/histream/etl/config/TestReadTables.java

@@ -29,7 +29,7 @@ public class TestReadTables {
 	
 	@Before
 	public void loadConfiguration() throws IOException{
-		URL url = getClass().getResource("/test-1-datasource.xml");
+		URL url = getClass().getResource("/data/test-1-datasource.xml");
 		ds = JAXB.unmarshal(url, DataSource.class);
 		ds.getMeta().setLocation(url);
 		of = new ObservationFactoryImpl();

i2b2-integration-tests/src/test/java/de/sekmi/histream/i2b2/ITImportData.java

@@ -30,7 +30,7 @@ public class ITImportData {
 		factory.registerExtension(patients);
 		factory.registerExtension(visits);
 
-		ObservationSupplier data = ETLObservationSupplier.load(ETLObservationSupplier.class.getResource("/test-1-datasource.xml"), factory);
+		ObservationSupplier data = ETLObservationSupplier.load(ETLObservationSupplier.class.getResource("/data/test-1-datasource.xml"), factory);
 		inserter.setMeta(ObservationSupplier.META_ETL_STRATEGY, data.getMeta(ObservationSupplier.META_ETL_STRATEGY));
 		Supplier<Observation> source = data;
 		// XXX test transformation later