core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1397: Added test

This commit is contained in:
Shahram Najm 2022-06-06 16:48:51 +01:00
parent 2c0b84633d
commit 08abd94ada
3 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/CMakeLists.txt
View File

@ -185,6 +185,7 @@ if( HAVE_BUILD_TOOLS )
grib_ecc-1000
grib_ecc-1001
grib_ecc-1030
grib_ecc-1397
grib_set_bytes
grib_set_force
bufr_ecc-556

63
tests/grib_ecc-1397.sh Executable file
View File

@ -0,0 +1,63 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.ctest.sh
# ---------------------------------------------------------
# This is the test for the JIRA issue ECC-1397
# grib_ls -j -l command (JSON for nearest)
# ---------------------------------------------------------
label="grib_ecc-1397_test"
tempOut1=temp.${label}.1.out
tempOut2=temp.${label}.2.out
# Decide if we have the JSON verifier commandline utility
JSON_VERIF="json_xs"
JSON_CHECK=""
if command -v $JSON_VERIF >/dev/null 2>&1; then
JSON_CHECK=$JSON_VERIF
fi
# Check the json_xs command actually works!
set +e
echo '[]' | json_xs > /dev/null 2>&1
if [ $? -ne 0 ]; then JSON_CHECK=""; fi
set -e
echo "Using $JSON_CHECK ..."
# Check number of lines printed
input=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
${tools_dir}/grib_ls -j -l 51.0,1.0,1 $input > $tempOut1
numlines1=`wc -l $tempOut1 | awk '{print $1}'`
[ $numlines1 -eq 10 ]
${tools_dir}/grib_ls -j -l 51.0,1.0,4 $input > $tempOut2
numlines2=`wc -l $tempOut2 | awk '{print $1}'`
[ $numlines2 -eq 13 ]
# When mode=1, do not print "selected"
set +e
grep -q "selected" $tempOut1
status=$?
set -e
[ $status -ne 0 ]
# It should be there when mode=4
grep -q "selected" $tempOut2
# Verify validity of JSON
if test "x$JSON_CHECK" != "x"; then
$JSON_VERIF < $tempOut1
$JSON_VERIF < $tempOut2
fi
# Clean up
rm -f $tempOut1 $tempOut2

6
tools/grib_ls.c
View File

@ -331,7 +331,11 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
printf("%s", new_handle);
printf("{\n");
print_key_values(options, h);
printf("\n, \"selected\" : %d", options->latlon_idx);
if (options->latlon_mode == 4) {
printf("\n, \"selected\" : %d", options->latlon_idx);
} else {
printf("\n");
}
printf(", \"method\" : ");
if (options->latlon_mask)
printf("\"nearest_land\"");