diff --git a/integration-tests/run.sh b/integration-tests/run.sh index 358ee2cd75ce12e6daa446674e74e27e7970b35b..e75ec695b9c687b3cd5079ca1ff1b5cac2891928 100755 --- a/integration-tests/run.sh +++ b/integration-tests/run.sh @@ -571,7 +571,7 @@ function assert_correct_content_of_processing_dir { assert_same_content $TEST_DATA/3VCP1 $data_set assert_same_content $TEMPLATE/openBIS-client/testdata/register-experiments/processing-parameters.txt \ $DATA/processing-dir/processing-parameters-from-openbis - local bds_container=$DATA/main-store/Group_CISD/Project_NEMO/Experiment_EXP1/ObservableType_HCS_IMAGE/Barcode_3VCP1/1/microX_200801011213_3VCP1 + local bds_container=$DATA/main-store/Instance_integration-test/Group_CISD/Project_NEMO/Experiment_EXP1/ObservableType_HCS_IMAGE/Barcode_3VCP1/1/microX_200801011213_3VCP1 local data_set2=$bds_container/data/original/microX_200801011213_3VCP1 assert_same_inode $data_set/TIFF/blabla_3VCP1_K13_8_w460.tif $data_set2/TIFF/blabla_3VCP1_K13_8_w460.tif assert_same_inode $data_set/TIFF/blabla_3VCP1_M03_2_w530.tif $data_set2/TIFF/blabla_3VCP1_M03_2_w530.tif @@ -581,7 +581,7 @@ function assert_correct_content_of_plate_3VCP1_in_store { local cell_plate=3VCP1 echo ==== assert correct content of plate 3VCP1 in store ==== - local main_dir=$DATA/main-store/Group_CISD/Project_NEMO/Experiment_EXP1 + local main_dir=$DATA/main-store/Instance_integration-test/Group_CISD/Project_NEMO/Experiment_EXP1 local raw_data_dir=$main_dir/ObservableType_HCS_IMAGE/Barcode_3VCP1/1 assert_dir_exists $raw_data_dir local raw_data_set=$raw_data_dir/microX_200801011213_3VCP1 @@ -621,6 +621,7 @@ function assert_correct_content_of_plate_3VCP1_in_store { assert_equals_as_in_file microX $metadata_dir/data_set/producer_code assert_equals_as_in_file 3VCP1 $metadata_dir/sample/code assert_equals_as_in_file CELL_PLATE $metadata_dir/sample/type_code + assert_equals_as_in_file integration-test $metadata_dir/experiment_identifier/instance_code assert_equals_as_in_file CISD $metadata_dir/experiment_identifier/group_code assert_equals_as_in_file NEMO $metadata_dir/experiment_identifier/project_code assert_equals_as_in_file EXP1 $metadata_dir/experiment_identifier/experiment_code @@ -660,14 +661,14 @@ function assert_correct_content_of_invalid_plate_in_store { local data_set=$error_dir/microX_200801011213_$cell_plate assert_same_content $TEST_DATA/$cell_plate $data_set assert_file_exists $data_set.exception - assert_dir_empty $DATA/main-store/Group_CISD/Project_NEMO/Experiment_EXP1/ObservableType_HCS_IMAGE/Barcode_$cell_plate + assert_dir_empty $DATA/main-store/Instance_integration-test/Group_CISD/Project_NEMO/Experiment_EXP1/ObservableType_HCS_IMAGE/Barcode_$cell_plate } function assert_correct_content_of_image_analysis_data { local cell_plate=$1 echo ==== check image analysis data for cell plate $cell_plate ==== - local img_analysis=$DATA/main-store/Group_CISD/Project_NEMO/Experiment_EXP1/ObservableType_HCS_IMAGE_ANALYSIS_DATA/Barcode_$cell_plate/1 + local img_analysis=$DATA/main-store/Instance_integration-test/Group_CISD/Project_NEMO/Experiment_EXP1/ObservableType_HCS_IMAGE_ANALYSIS_DATA/Barcode_$cell_plate/1 assert_dir_exists $img_analysis assert_same_content $TEST_DATA/$cell_plate $img_analysis/microX_200801011213_$cell_plate }