diff --git a/integration-tests/templates/data-screening.zip b/integration-tests/templates/data-screening.zip index 1ce60fbb2f2c241e82be8ce088488028987e0ea0..583f1d0ca05b269fe6e8c005e3eb793b92613ca0 100644 Binary files a/integration-tests/templates/data-screening.zip and b/integration-tests/templates/data-screening.zip differ diff --git a/integration-tests/test-screening.sh b/integration-tests/test-screening.sh index ffdd215fbce8ae976eba569db7fa802efe0daa53..33eb27916d1fd694e518293cc01f217d4da4f7c8 100755 --- a/integration-tests/test-screening.sh +++ b/integration-tests/test-screening.sh @@ -143,6 +143,8 @@ function integration_tests_screening { assert_equals "Wrong number of registered datasets" 5 $datasets assertSpotSizes "24x16,24x16,24x16" + assertFeatureVectorDef HITRATE "Hit Rate" + assertFeatureVectorDef CELLNUMBER cellNumber # TODO: add a check if the results are correct test_screening_api @@ -158,6 +160,14 @@ function assertSpotSizes { assert_equals "spot sizes" "$1" $answer } +function assertFeatureVectorDef { + local psql=`run_psql` + local result=`$psql -t -U postgres -d $IMAGING_DB \ + -c "select label from feature_defs where code = '$1'" \ + | awk '{gsub(/\|/,";");print}'` + assert_equals "Feature code and label" " $2" "$result" +} + # can be called after integration tests are done just to check the API results function quick_api_test { startup_openbis_server $OPENBIS_SERVER_HCS