From 3723bb60c7d9d76c43b3d7c29b4807cce347aaaa Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Fri, 20 Dec 2019 10:19:01 -0800
Subject: [PATCH] select is not a valid bind type

---
 pyxform/question.py                              |  2 +-
 pyxform/question_type_dictionary.py              | 12 ++++++------
 .../example_xls/spec_test_expected_output.xml    |  2 +-
 pyxform/tests/example_xls/widgets.xml            | 16 ++++++++--------
 pyxform/tests/fixtures/strings.ini               |  2 +-
 .../attribute_columns_test.xml                   |  2 +-
 .../test_expected_output/flat_xlsform_test.xml   |  2 +-
 .../tests/test_expected_output/table-list.xml    |  6 +++---
 pyxform/tests/test_expected_output/widgets.xml   | 16 ++++++++--------
 .../test_expected_output/xlsform_spec_test.xml   |  2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pyxform/question.py b/pyxform/question.py
index c25eff794..7a852f0c5 100644
--- a/pyxform/question.py
+++ b/pyxform/question.py
@@ -134,7 +134,7 @@ def validate(self):
             choice.validate()
 
     def xml_control(self):
-        assert self.bind["type"] in ["select", "string", "odk:rank"]
+        assert self.bind["type"] in ["string", "odk:rank"]
         survey = self.get_root()
         control_dict = self.control.copy()
         # Resolve field references in attributes
diff --git a/pyxform/question_type_dictionary.py b/pyxform/question_type_dictionary.py
index d3e739e1d..000ecf505 100644
--- a/pyxform/question_type_dictionary.py
+++ b/pyxform/question_type_dictionary.py
@@ -49,7 +49,7 @@ def generate_new_dict():
     },
     "add select multiple prompt using": {
         "control": {"tag": "select"},
-        "bind": {"type": "select"},
+        "bind": {"type": "string"},
     },
     "add note prompt": {
         "control": {"tag": "input"},
@@ -61,7 +61,7 @@ def generate_new_dict():
     "text": {"control": {"tag": "input"}, "bind": {"type": "string"}},
     "select all that apply from": {
         "control": {"tag": "select"},
-        "bind": {"type": "select"},
+        "bind": {"type": "string"},
     },
     "simserial": {
         "bind": {
@@ -136,7 +136,7 @@ def generate_new_dict():
         "control": {"tag": "upload", "mediatype": "image/*"},
         "bind": {"type": "binary"},
     },
-    "select all that apply": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "select all that apply": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "get end time": {
         "bind": {
             "jr:preload": "timestamp",
@@ -152,7 +152,7 @@ def generate_new_dict():
     "geopoint": {"control": {"tag": "input"}, "bind": {"type": "geopoint"}},
     "geoshape": {"control": {"tag": "input"}, "bind": {"type": "geoshape"}},
     "geotrace": {"control": {"tag": "input"}, "bind": {"type": "geotrace"}},
-    "select multiple from": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "select multiple from": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "end time": {
         "bind": {
             "jr:preload": "timestamp",
@@ -175,7 +175,7 @@ def generate_new_dict():
         }
     },
     "q barcode": {"control": {"tag": "input"}, "bind": {"type": "barcode"}},
-    "q select": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "q select": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "select one using": {"control": {"tag": "select1"}, "bind": {"type": "string"}},
     "rank": {"control": {"tag": "odk:rank"}, "bind": {"type": "odk:rank"}},
     "image": {
@@ -236,7 +236,7 @@ def generate_new_dict():
     },
     "int": {"control": {"tag": "input"}, "bind": {"type": "int"}},
     "add barcode prompt": {"control": {"tag": "input"}, "bind": {"type": "barcode"}},
-    "select multiple using": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "select multiple using": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "q decimal": {"control": {"tag": "input"}, "bind": {"type": "decimal"}},
     "end": {
         "bind": {
diff --git a/pyxform/tests/example_xls/spec_test_expected_output.xml b/pyxform/tests/example_xls/spec_test_expected_output.xml
index 33dddd9ea..c8dfe612a 100644
--- a/pyxform/tests/example_xls/spec_test_expected_output.xml
+++ b/pyxform/tests/example_xls/spec_test_expected_output.xml
@@ -636,7 +636,7 @@
       <bind constraint=". &lt;= /xlsform_spec_test/everything/a_integer" nodeset="/xlsform_spec_test/everything/a_decimal" type="decimal"/>
       <bind nodeset="/xlsform_spec_test/everything/num_repeat_times" relevant="false()" type="int"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="you can't select yes and no" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="you can't select yes and no" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_23" type="string"/>
diff --git a/pyxform/tests/example_xls/widgets.xml b/pyxform/tests/example_xls/widgets.xml
index eddbec7a8..ed039194f 100644
--- a/pyxform/tests/example_xls/widgets.xml
+++ b/pyxform/tests/example_xls/widgets.xml
@@ -115,7 +115,7 @@
       <bind constraint=". &gt; 10.51 and . &lt; 18.39" jr:constraintMsg="number must be between 10.51 and 18.39" nodeset="/widgets/my_decimal" type="decimal"/>
       <bind constraint=". &gt;= today()" jr:constraintMsg="only future dates allowed" nodeset="/widgets/my_date" type="date"/>
       <bind nodeset="/widgets/my_time" type="time"/>
-      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="select"/>
+      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="string"/>
       <bind nodeset="/widgets/my_select1" type="string"/>
       <bind nodeset="/widgets/my_output" readonly="true()" type="string"/>
       <bind nodeset="/widgets/my_geopoint" type="geopoint"/>
@@ -127,7 +127,7 @@
       <bind nodeset="/widgets/locationMap" type="geopoint"/>
       <bind nodeset="/widgets/dateTime" type="dateTime"/>
       <bind nodeset="/widgets/spinner" type="string"/>
-      <bind nodeset="/widgets/spinner_all" type="select"/>
+      <bind nodeset="/widgets/spinner_all" type="string"/>
       <bind nodeset="/widgets/selectadvance" type="string"/>
       <bind nodeset="/widgets/grid_test" type="string"/>
       <bind nodeset="/widgets/grid_test_audio" type="string"/>
@@ -138,13 +138,13 @@
       <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_3" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_4" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="string"/>
       <bind nodeset="/widgets/happy_sad_table/generated_table_list_label_38" readonly="true()" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="string"/>
       <bind jr:preload="uid" nodeset="/widgets/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/fixtures/strings.ini b/pyxform/tests/fixtures/strings.ini
index 75c32b7ad..a46e9cded 100644
--- a/pyxform/tests/fixtures/strings.ini
+++ b/pyxform/tests/fixtures/strings.ini
@@ -14,7 +14,7 @@ test_simple_date_question_type_multilingual_binding = <bind nodeset="/test/date_
 test_simple_phone_number_question_type_multilingual_control = <input ref="/test/phone_number_q"><label ref="jr:itext('/test/phone_number_q:label')"/><hint>Enter numbers only.</hint></input>
 test_simple_phone_number_question_type_multilingual_binding = <bind constraint="regex(., '^\d*$')" nodeset="/test/phone_number_q" type="string"/>
 test_simple_select_all_question_multilingual_control = <select ref="/test/select_all_q"><label ref="jr:itext('/test/select_all_q:label')"/><item><label ref="jr:itext('/test/select_all_q/f:label')"/><value>f</value></item><item><label ref="jr:itext('/test/select_all_q/g:label')"/><value>g</value></item><item><label ref="jr:itext('/test/select_all_q/h:label')"/><value>h</value></item></select>
-test_simple_select_all_question_multilingual_binding = <bind nodeset="/test/select_all_q" type="select"/>
+test_simple_select_all_question_multilingual_binding = <bind nodeset="/test/select_all_q" type="string"/>
 test_simple_decimal_question_multilingual_control = <input ref="/test/decimal_q"><label ref="jr:itext('/test/decimal_q:label')"/></input>
 test_simple_decimal_question_multilingual_binding = <bind nodeset="/test/decimal_q" type="decimal"/>
 
diff --git a/pyxform/tests/test_expected_output/attribute_columns_test.xml b/pyxform/tests/test_expected_output/attribute_columns_test.xml
index 515600a00..87cd6d7ec 100644
--- a/pyxform/tests/test_expected_output/attribute_columns_test.xml
+++ b/pyxform/tests/test_expected_output/attribute_columns_test.xml
@@ -691,7 +691,7 @@
       <bind calculate="2" nodeset="/attribute_columns_test/everything/repeat_test_count" readonly="true()" type="string"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/repeat_test"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/attribute_columns_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="string"/>
diff --git a/pyxform/tests/test_expected_output/flat_xlsform_test.xml b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
index 444901de4..0d3dd5ec3 100644
--- a/pyxform/tests/test_expected_output/flat_xlsform_test.xml
+++ b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
@@ -644,7 +644,7 @@
       <bind nodeset="/flat_xlsform_test/a_integer" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="int"/>
       <bind constraint=". &lt;=  /flat_xlsform_test/a_integer " nodeset="/flat_xlsform_test/a_decimal" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="decimal"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/flat_xlsform_test/required_text" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/flat_xlsform_test/select_multiple_test:jr:constraintMsg')" nodeset="/flat_xlsform_test/select_multiple_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/flat_xlsform_test/select_multiple_test:jr:constraintMsg')" nodeset="/flat_xlsform_test/select_multiple_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="false()" type="string"/>
       <bind nodeset="/flat_xlsform_test/label-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/list-nolabel-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="string"/>
       <bind nodeset="/flat_xlsform_test/reserved_name_for_field_list_labels_25" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
diff --git a/pyxform/tests/test_expected_output/table-list.xml b/pyxform/tests/test_expected_output/table-list.xml
index 25ac6a45a..a2232c02b 100644
--- a/pyxform/tests/test_expected_output/table-list.xml
+++ b/pyxform/tests/test_expected_output/table-list.xml
@@ -51,9 +51,9 @@
       <bind nodeset="/table-list/table_list_test2/table_list_3" type="string"/>
       <bind nodeset="/table-list/table_list_test2/table_list_4" type="string"/>
       <bind nodeset="/table-list/happy_sad_table/generated_table_list_label_7" readonly="true()" type="string"/>
-      <bind nodeset="/table-list/happy_sad_table/reserved_name_for_field_list_labels_8" type="select"/>
-      <bind nodeset="/table-list/happy_sad_table/happy_sad_brian" type="select"/>
-      <bind nodeset="/table-list/happy_sad_table/happy_sad_michael" type="select"/>
+      <bind nodeset="/table-list/happy_sad_table/reserved_name_for_field_list_labels_8" type="string"/>
+      <bind nodeset="/table-list/happy_sad_table/happy_sad_brian" type="string"/>
+      <bind nodeset="/table-list/happy_sad_table/happy_sad_michael" type="string"/>
       <bind jr:preload="uid" nodeset="/table-list/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/widgets.xml b/pyxform/tests/test_expected_output/widgets.xml
index 2fea79781..833263931 100644
--- a/pyxform/tests/test_expected_output/widgets.xml
+++ b/pyxform/tests/test_expected_output/widgets.xml
@@ -115,7 +115,7 @@
       <bind constraint=". &gt; 10.51 and . &lt; 18.39" jr:constraintMsg="number must be between 10.51 and 18.39" nodeset="/widgets/my_decimal" type="decimal"/>
       <bind constraint=". &gt;= today()" jr:constraintMsg="only future dates allowed" nodeset="/widgets/my_date" type="date"/>
       <bind nodeset="/widgets/my_time" type="time"/>
-      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="select"/>
+      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="string"/>
       <bind nodeset="/widgets/my_select1" type="string"/>
       <bind nodeset="/widgets/my_output" readonly="true()" type="string"/>
       <bind nodeset="/widgets/my_geopoint" type="geopoint"/>
@@ -127,7 +127,7 @@
       <bind nodeset="/widgets/locationMap" type="geopoint"/>
       <bind nodeset="/widgets/dateTime" type="dateTime"/>
       <bind nodeset="/widgets/spinner" type="string"/>
-      <bind nodeset="/widgets/spinner_all" type="select"/>
+      <bind nodeset="/widgets/spinner_all" type="string"/>
       <bind nodeset="/widgets/selectadvance" type="string"/>
       <bind nodeset="/widgets/grid_test" type="string"/>
       <bind nodeset="/widgets/grid_test_audio" type="string"/>
@@ -138,13 +138,13 @@
       <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_3" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_4" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="string"/>
       <bind nodeset="/widgets/happy_sad_table/generated_table_list_label_38" readonly="true()" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="string"/>
       <bind jr:preload="uid" nodeset="/widgets/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/xlsform_spec_test.xml b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
index 27d9a589b..6ff582cf9 100644
--- a/pyxform/tests/test_expected_output/xlsform_spec_test.xml
+++ b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
@@ -682,7 +682,7 @@
       <bind constraint=". &lt;=  /xlsform_spec_test/everything/a_integer " nodeset="/xlsform_spec_test/everything/a_decimal" type="decimal"/>
       <bind calculate="2" nodeset="/xlsform_spec_test/everything/repeat_test_count" readonly="true()" type="string"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/xlsform_spec_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="string"/>