From c9af527146a9c8d858fed834e5b16a98f7aa5d08 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 13 May 2009 14:39:14 +0000
Subject: [PATCH] Nested StorageProcessorWithDropBox tested in integration test
SVN: 11037
---
integration-tests/run.sh | 1 +
integration-tests/templates/data/drop-box2/.gitignore | 0
.../templates/datastore_server2/etc/service.properties | 4 +++-
3 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 integration-tests/templates/data/drop-box2/.gitignore
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index e1728c5a675..1eb9b20af46 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -762,6 +762,7 @@ function assert_correct_content {
assert_correct_dataset_content_in_database 14 "14;EXP1;DSS1;20[0-9]*-13;f;7;U;;"
assert_correct_dataset_content_in_database 16 "16;EXP1;DSS2;20[0-9]*-15;f;;U;;"
assert_equals "Content of file in drop box1" "hello world" "`cat $DATA/drop-box1/3VCP1_*-15.txt`"
+ assert_equals "Content of file in drop box2" "hello world" "`cat $DATA/drop-box2/3VCP1.*-15.txt`"
}
function integration_tests {
diff --git a/integration-tests/templates/data/drop-box2/.gitignore b/integration-tests/templates/data/drop-box2/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/integration-tests/templates/datastore_server2/etc/service.properties b/integration-tests/templates/datastore_server2/etc/service.properties
index 8f13c85dd38..54906525057 100644
--- a/integration-tests/templates/datastore_server2/etc/service.properties
+++ b/integration-tests/templates/datastore_server2/etc/service.properties
@@ -84,7 +84,9 @@ a.type-extractor.locator-type = RELATIVE_LOCATION
a.type-extractor.data-set-type = HCS_IMAGE
a.storage-processor = ch.systemsx.cisd.etlserver.imsb.StorageProcessorWithDropbox
-a.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+a.storage-processor.processor = ch.systemsx.cisd.etlserver.imsb.StorageProcessorWithDropbox
a.storage-processor.entity-separator = ${data-set-file-name-entity-separator}
a.storage-processor.dropbox-dir = ../data/drop-box1
+a.storage-processor.processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+a.storage-processor.processor.dropbox-dir = ../data/drop-box2
--
GitLab