[LMS-400]

fix: - If we change the data set location after registration, the location in the database will no longer be up-to-date.
- Partially the integration-tests (processing directory missing).

SVN: 5857

integration-tests/run.sh

@@ -588,7 +588,9 @@ 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/Instance_integration-test/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/
+    bds_container=$bds_container`ls -1 $bds_container | head -1`/microX_200801011213_3VCP1
+    assert_dir_exists $bds_container
     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
@@ -599,7 +601,10 @@ function assert_correct_content_of_plate_3VCP1_in_store {
     echo ==== assert correct content of plate 3VCP1 in store ====
     
     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
+    local raw_data_dir=$main_dir/ObservableType_HCS_IMAGE/Barcode_3VCP1/
+    assert_dir_exists $raw_data_dir
+    # Picks up the first directory found
+    raw_data_dir=$raw_data_dir`ls -1 $raw_data_dir | head -1`
     assert_dir_exists $raw_data_dir
     local raw_data_set=$raw_data_dir/microX_200801011213_3VCP1
     assert_dir_exists $raw_data_set
@@ -685,7 +690,10 @@ 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/Instance_integration-test/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/
+    assert_dir_exists $img_analysis
+    # Picks up the first directory found
+    img_analysis=$img_analysis`ls -1 $img_analysis | head -1`
     assert_dir_exists $img_analysis
     assert_same_content $TEST_DATA/$cell_plate $img_analysis/microX_200801011213_$cell_plate
 }