From 199a9c9a9f272dcc984f1f4e9c611143f2bbae10 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 23 Apr 2017 22:40:48 -0700 Subject: [PATCH] test: Really fix mirax-slidedat-* errors on glib >= 2.51.0 Using Unicode characters in the regex produces a regex which fails to match the output. --- test/cases/mirax-slidedat-bad-image-concat-factor/config.yaml | 2 +- test/cases/mirax-slidedat-bad-image-fill-color/config.yaml | 2 +- test/cases/mirax-slidedat-bad-image-height/config.yaml | 2 +- test/cases/mirax-slidedat-bad-image-width/config.yaml | 2 +- test/cases/mirax-slidedat-bad-imagenumber-x/config.yaml | 2 +- test/cases/mirax-slidedat-bad-imagenumber-y/config.yaml | 2 +- test/cases/mirax-slidedat-no-datafile-count/config.yaml | 2 +- test/cases/mirax-slidedat-no-datafile-name/config.yaml | 2 +- test/cases/mirax-slidedat-no-hier-count/config.yaml | 2 +- test/cases/mirax-slidedat-no-hier-name/config.yaml | 2 +- test/cases/mirax-slidedat-no-hier-val-section/config.yaml | 2 +- test/cases/mirax-slidedat-no-image-format/config.yaml | 2 +- test/cases/mirax-slidedat-no-index-filename/config.yaml | 2 +- test/cases/mirax-slidedat-no-nonhier-count/config.yaml | 2 +- test/cases/mirax-slidedat-no-nonhier-key/config.yaml | 2 +- test/cases/mirax-slidedat-no-nonhier-name/config.yaml | 2 +- test/cases/mirax-slidedat-no-nonhier-val-count/config.yaml | 2 +- test/cases/mirax-slidedat-no-overlap-x/config.yaml | 2 +- test/cases/mirax-slidedat-no-overlap-y/config.yaml | 2 +- test/cases/mirax-slidedat-no-slide-id/config.yaml | 2 +- test/cases/mirax-slidedat-no-slide-version/config.yaml | 2 +- test/cases/mirax-slidedat-no-zoom-level-count/config.yaml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/cases/mirax-slidedat-bad-image-concat-factor/config.yaml b/test/cases/mirax-slidedat-bad-image-concat-factor/config.yaml index 13ba4b33b..1d320f2f0 100644 --- a/test/cases/mirax-slidedat-bad-image-concat-factor/config.yaml +++ b/test/cases/mirax-slidedat-bad-image-concat-factor/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file contains key ('|“)IMAGE_CONCAT_FACTOR('|”) in group ('|“)LAYER_0_LEVEL_2_SECTION('|”) which has (a )?value that cannot be interpreted.$ +error: ^Key file contains key ('|\xe2\x80\x9c)IMAGE_CONCAT_FACTOR('|\xe2\x80\x9d) in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_2_SECTION('|\xe2\x80\x9d) which has (a )?value that cannot be interpreted.$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-bad-image-fill-color/config.yaml b/test/cases/mirax-slidedat-bad-image-fill-color/config.yaml index 754b626a8..dd75bf79d 100644 --- a/test/cases/mirax-slidedat-bad-image-fill-color/config.yaml +++ b/test/cases/mirax-slidedat-bad-image-fill-color/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file contains key ('|“)IMAGE_FILL_COLOR_BGR('|”) in group ('|“)LAYER_0_LEVEL_3_SECTION('|”) which has (a )?value that cannot be interpreted.$ +error: ^Key file contains key ('|\xe2\x80\x9c)IMAGE_FILL_COLOR_BGR('|\xe2\x80\x9d) in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_3_SECTION('|\xe2\x80\x9d) which has (a )?value that cannot be interpreted.$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-bad-image-height/config.yaml b/test/cases/mirax-slidedat-bad-image-height/config.yaml index b25fce791..4ac0f2edb 100644 --- a/test/cases/mirax-slidedat-bad-image-height/config.yaml +++ b/test/cases/mirax-slidedat-bad-image-height/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file contains key ('|“)DIGITIZER_HEIGHT('|”) in group ('|“)LAYER_0_LEVEL_1_SECTION('|”) which has (a )?value that cannot be interpreted.$ +error: ^Key file contains key ('|\xe2\x80\x9c)DIGITIZER_HEIGHT('|\xe2\x80\x9d) in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_1_SECTION('|\xe2\x80\x9d) which has (a )?value that cannot be interpreted.$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-bad-image-width/config.yaml b/test/cases/mirax-slidedat-bad-image-width/config.yaml index 8653a70b9..8c88dd800 100644 --- a/test/cases/mirax-slidedat-bad-image-width/config.yaml +++ b/test/cases/mirax-slidedat-bad-image-width/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file contains key ('|“)DIGITIZER_WIDTH('|”) in group ('|“)LAYER_0_LEVEL_1_SECTION('|”) which has (a )?value that cannot be interpreted.$ +error: ^Key file contains key ('|\xe2\x80\x9c)DIGITIZER_WIDTH('|\xe2\x80\x9d) in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_1_SECTION('|\xe2\x80\x9d) which has (a )?value that cannot be interpreted.$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-bad-imagenumber-x/config.yaml b/test/cases/mirax-slidedat-bad-imagenumber-x/config.yaml index 0aea095f4..b424b6f26 100644 --- a/test/cases/mirax-slidedat-bad-imagenumber-x/config.yaml +++ b/test/cases/mirax-slidedat-bad-imagenumber-x/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file contains key ('|“)IMAGENUMBER_X('|”) in group ('|“)GENERAL('|”) which has (a )?value that cannot be interpreted.$ +error: ^Key file contains key ('|\xe2\x80\x9c)IMAGENUMBER_X('|\xe2\x80\x9d) in group ('|\xe2\x80\x9c)GENERAL('|\xe2\x80\x9d) which has (a )?value that cannot be interpreted.$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-bad-imagenumber-y/config.yaml b/test/cases/mirax-slidedat-bad-imagenumber-y/config.yaml index 5abae0a6e..66c2be6f2 100644 --- a/test/cases/mirax-slidedat-bad-imagenumber-y/config.yaml +++ b/test/cases/mirax-slidedat-bad-imagenumber-y/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file contains key ('|“)IMAGENUMBER_Y('|”) in group ('|“)GENERAL('|”) which has (a )?value that cannot be interpreted.$ +error: ^Key file contains key ('|\xe2\x80\x9c)IMAGENUMBER_Y('|\xe2\x80\x9d) in group ('|\xe2\x80\x9c)GENERAL('|\xe2\x80\x9d) which has (a )?value that cannot be interpreted.$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-datafile-count/config.yaml b/test/cases/mirax-slidedat-no-datafile-count/config.yaml index 103fe3578..3e1ff6064 100644 --- a/test/cases/mirax-slidedat-no-datafile-count/config.yaml +++ b/test/cases/mirax-slidedat-no-datafile-count/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)FILE_COUNT('|”)( in group ('|“)DATAFILE('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)FILE_COUNT('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)DATAFILE('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-datafile-name/config.yaml b/test/cases/mirax-slidedat-no-datafile-name/config.yaml index 390fc7eaf..b110acb23 100644 --- a/test/cases/mirax-slidedat-no-datafile-name/config.yaml +++ b/test/cases/mirax-slidedat-no-datafile-name/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)FILE_3('|”)( in group ('|“)DATAFILE('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)FILE_3('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)DATAFILE('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-hier-count/config.yaml b/test/cases/mirax-slidedat-no-hier-count/config.yaml index a1104b125..1d83ada8c 100644 --- a/test/cases/mirax-slidedat-no-hier-count/config.yaml +++ b/test/cases/mirax-slidedat-no-hier-count/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)HIER_COUNT('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)HIER_COUNT('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-hier-name/config.yaml b/test/cases/mirax-slidedat-no-hier-name/config.yaml index 540a67b32..b169cb6ce 100644 --- a/test/cases/mirax-slidedat-no-hier-name/config.yaml +++ b/test/cases/mirax-slidedat-no-hier-name/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)HIER_0_NAME('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)HIER_0_NAME('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-hier-val-section/config.yaml b/test/cases/mirax-slidedat-no-hier-val-section/config.yaml index a3fc20ce6..1eaa14811 100644 --- a/test/cases/mirax-slidedat-no-hier-val-section/config.yaml +++ b/test/cases/mirax-slidedat-no-hier-val-section/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)HIER_0_VAL_2_SECTION('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)HIER_0_VAL_2_SECTION('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-image-format/config.yaml b/test/cases/mirax-slidedat-no-image-format/config.yaml index 98c1ed0ab..eb82eb87e 100644 --- a/test/cases/mirax-slidedat-no-image-format/config.yaml +++ b/test/cases/mirax-slidedat-no-image-format/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)IMAGE_FORMAT('|”)( in group ('|“)LAYER_0_LEVEL_3_SECTION('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)IMAGE_FORMAT('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_3_SECTION('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-index-filename/config.yaml b/test/cases/mirax-slidedat-no-index-filename/config.yaml index 541fe433e..48dcbff7b 100644 --- a/test/cases/mirax-slidedat-no-index-filename/config.yaml +++ b/test/cases/mirax-slidedat-no-index-filename/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)INDEXFILE('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)INDEXFILE('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-nonhier-count/config.yaml b/test/cases/mirax-slidedat-no-nonhier-count/config.yaml index 1ef1b6450..76c83a186 100644 --- a/test/cases/mirax-slidedat-no-nonhier-count/config.yaml +++ b/test/cases/mirax-slidedat-no-nonhier-count/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)NONHIER_COUNT('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)NONHIER_COUNT('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-nonhier-key/config.yaml b/test/cases/mirax-slidedat-no-nonhier-key/config.yaml index 3660456be..2c8a01c79 100644 --- a/test/cases/mirax-slidedat-no-nonhier-key/config.yaml +++ b/test/cases/mirax-slidedat-no-nonhier-key/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)NONHIER_0_VAL_2('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)NONHIER_0_VAL_2('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-nonhier-name/config.yaml b/test/cases/mirax-slidedat-no-nonhier-name/config.yaml index 75667af15..69b4b201d 100644 --- a/test/cases/mirax-slidedat-no-nonhier-name/config.yaml +++ b/test/cases/mirax-slidedat-no-nonhier-name/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)NONHIER_0_NAME('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)NONHIER_0_NAME('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-nonhier-val-count/config.yaml b/test/cases/mirax-slidedat-no-nonhier-val-count/config.yaml index 686f2b855..4e07ac966 100644 --- a/test/cases/mirax-slidedat-no-nonhier-val-count/config.yaml +++ b/test/cases/mirax-slidedat-no-nonhier-val-count/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)NONHIER_0_COUNT('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)NONHIER_0_COUNT('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-overlap-x/config.yaml b/test/cases/mirax-slidedat-no-overlap-x/config.yaml index 83e693f17..4721d684a 100644 --- a/test/cases/mirax-slidedat-no-overlap-x/config.yaml +++ b/test/cases/mirax-slidedat-no-overlap-x/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)OVERLAP_X('|”)( in group ('|“)LAYER_0_LEVEL_1_SECTION('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)OVERLAP_X('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_1_SECTION('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-overlap-y/config.yaml b/test/cases/mirax-slidedat-no-overlap-y/config.yaml index fbef0429e..08d99129e 100644 --- a/test/cases/mirax-slidedat-no-overlap-y/config.yaml +++ b/test/cases/mirax-slidedat-no-overlap-y/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)OVERLAP_Y('|”)( in group ('|“)LAYER_0_LEVEL_1_SECTION('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)OVERLAP_Y('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)LAYER_0_LEVEL_1_SECTION('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-slide-id/config.yaml b/test/cases/mirax-slidedat-no-slide-id/config.yaml index 3a1359046..8663e3293 100644 --- a/test/cases/mirax-slidedat-no-slide-id/config.yaml +++ b/test/cases/mirax-slidedat-no-slide-id/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)SLIDE_ID('|”)( in group ('|“)GENERAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)SLIDE_ID('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)GENERAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-slide-version/config.yaml b/test/cases/mirax-slidedat-no-slide-version/config.yaml index 17a60f192..c08c8650d 100644 --- a/test/cases/mirax-slidedat-no-slide-version/config.yaml +++ b/test/cases/mirax-slidedat-no-slide-version/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)SLIDE_VERSION('|”)( in group ('|“)GENERAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)SLIDE_VERSION('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)GENERAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax diff --git a/test/cases/mirax-slidedat-no-zoom-level-count/config.yaml b/test/cases/mirax-slidedat-no-zoom-level-count/config.yaml index 105004019..759317f24 100644 --- a/test/cases/mirax-slidedat-no-zoom-level-count/config.yaml +++ b/test/cases/mirax-slidedat-no-zoom-level-count/config.yaml @@ -1,5 +1,5 @@ base: Mirax/CMU-1.zip -error: ^Key file does not have key ('|“)HIER_0_COUNT('|”)( in group ('|“)HIERARCHICAL('|”))?$ +error: ^Key file does not have key ('|\xe2\x80\x9c)HIER_0_COUNT('|\xe2\x80\x9d)( in group ('|\xe2\x80\x9c)HIERARCHICAL('|\xe2\x80\x9d))?$ slide: CMU-1.mrxs success: false vendor: mirax