From 225d1b1209a9100af3a8ba7f2647c4836cec9996 Mon Sep 17 00:00:00 2001 From: cramakri <cramakri> Date: Wed, 22 Dec 2010 16:56:49 +0000 Subject: [PATCH] LMS-1947 More tests. SVN: 19213 --- .../test-data/empty-lines/control.tsv | 14 ++++++++++++++ .../test-data/empty-lines/ds1/.gitignore | 0 .../test-data/empty-lines/ds2/.gitignore | 0 .../test-data/empty-lines/ds3/.gitignore | 0 .../missing-sample-identifier/control.tsv | 11 +++++++++++ .../missing-sample-identifier/ds1/.gitignore | 0 .../missing-sample-identifier/ds2/.gitignore | 0 .../missing-sample-identifier/ds3/.gitignore | 0 .../not-all-subfolders-mentioned/control.tsv | 11 +++++++++++ .../not-all-subfolders-mentioned/ds1/.gitignore | 0 .../not-all-subfolders-mentioned/ds2/.gitignore | 0 .../not-all-subfolders-mentioned/ds3/.gitignore | 0 12 files changed, 36 insertions(+) create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore create mode 100644 datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv new file mode 100644 index 00000000000..e7427b6162e --- /dev/null +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv @@ -0,0 +1,14 @@ +# Control Parameters +#! GLOBAL_PROPERTIES_START +#! SAMPLE_TYPE = MY_SAMPLE_TYPE +#! DATA_SET_TYPE = MY_DATA_SET_TYPE +#! USERID = test@test.test +#! GLOBAL_PROPERTIES_END +# Data +S_identifier S_experiment S_PROP1 S_PROP2 S_PROP3 D_file_type D_PROP1 D_PROP2 FOLDER +/MYSPACE/S1 /MYSPACE/MYPROJ/EXP1 VAL10 VAL20 VAL30 FILE_TYPE VAL40 VAL50 ds1/ +/MYSPACE/S2 /MYSPACE/MYPROJ/EXP2 VAL11 VAL21 VAL31 FILE_TYPE VAL41 VAL51 ds2/ +/MYSPACE/S3 /MYSPACE/MYPROJ/EXP3 VAL12 VAL22 VAL32 FILE_TYPE VAL42 VAL52 ds3/ + + + diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv new file mode 100644 index 00000000000..ecdd39dda7c --- /dev/null +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv @@ -0,0 +1,11 @@ +# Control Parameters +#! GLOBAL_PROPERTIES_START +#! SAMPLE_TYPE = MY_SAMPLE_TYPE +#! DATA_SET_TYPE = MY_DATA_SET_TYPE +#! USERID = test@test.test +#! GLOBAL_PROPERTIES_END +# Data +S_identifier S_experiment S_PROP1 S_PROP2 S_PROP3 D_file_type D_PROP1 D_PROP2 FOLDER +/MYSPACE/S1 /MYSPACE/MYPROJ/EXP1 VAL10 VAL20 VAL30 FILE_TYPE VAL40 VAL50 ds1/ + /MYSPACE/MYPROJ/EXP2 VAL11 VAL21 VAL31 FILE_TYPE VAL41 VAL51 ds2/ +/MYSPACE/S3 /MYSPACE/MYPROJ/EXP3 VAL12 VAL22 VAL32 FILE_TYPE VAL42 VAL52 ds3/ diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv new file mode 100644 index 00000000000..a8d70ccf592 --- /dev/null +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv @@ -0,0 +1,11 @@ +# Control Parameters +#! GLOBAL_PROPERTIES_START +#! SAMPLE_TYPE = MY_SAMPLE_TYPE +#! DATA_SET_TYPE = MY_DATA_SET_TYPE +#! USERID = test@test.test +#! GLOBAL_PROPERTIES_END +# Data +S_identifier S_experiment S_PROP1 S_PROP2 S_PROP3 D_file_type D_PROP1 D_PROP2 FOLDER +/MYSPACE/S1 /MYSPACE/MYPROJ/EXP1 VAL10 VAL20 VAL30 FILE_TYPE VAL40 VAL50 ds1/ +/MYSPACE/S2 /MYSPACE/MYPROJ/EXP2 VAL11 VAL21 VAL31 FILE_TYPE VAL41 VAL51 ds2/ +/MYSPACE/S3 /MYSPACE/MYPROJ/EXP3 VAL12 VAL22 VAL32 FILE_TYPE VAL42 VAL52 ds3/ diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore new file mode 100644 index 00000000000..e69de29bb2d -- GitLab