Update names of files for "lang_names" to be consistent across phases of testing

schema/collation/test_schema.json

@@ -111,7 +111,11 @@
           "warning": {
             "description": "Present when data has a problem",
             "type": "string"
-          }
+          },
+          "hash_id": {
+            "description": "Has value of the JSON string omtting label value",
+            "type": "integer"
+         }
         },
         "required": [
           "label",

schema/lang_names/test_schema.json

@@ -55,6 +55,10 @@
          "locale_label": {
            "description": "locale tag of the language being described ",
            "type": "string"
+         },
+         "hash_id": {
+           "description": "Has value of the JSON string omtting label value",
+           "type": "integer"
          }
        },
        "additionalProperties": false

schema/likely_subtags/test_schema.json

@@ -84,7 +84,13 @@
          },
          "option": {
            "description": "Type of processing requested",
-           "enum": ["maximize", "minimize", "minimizeFavorScript", "minimizeFavorRegion"]
+           "enum": ["maximize", "minimize",
+                    "minimizeFavorScript",
+                    "minimizeFavorRegion"]
+         },
+         "hash_id": {
+           "description": "Has value of the JSON string omtting label value",
+           "type": "integer"
          }
        }
      },

schema/number_format/test_schema.json

@@ -182,6 +182,10 @@
                "default": "auto"
              }
            }
+         },
+         "hash_id": {
+           "description": "Has value of the JSON string omtting label value",
+           "type": "integer"
          }
        },
        "required": [

schema/schema_files.py

@@ -15,7 +15,6 @@
     'collation_test': 'collation',
     'datetime_fmt_test_file': 'datetime_fmt',
     'datetime_fmt_test': 'datetime_fmt',
-    'lang_name_test_file': 'lang_names',
     'lang_names_test_file': 'lang_names',
     'likely_subtags_test': 'likely_subtags',
     'list_fmt_test_file': 'list_fmt',
@@ -96,15 +95,15 @@
     "lang_names": {
         "test_data": {
             "schema_file": "lang_names/test_schema.json",
-            'prod_file': 'lang_name_test_file.json'
+            'prod_file': 'lang_names_test_file.json'
         },
         "verify_data": {
             "schema_file": "lang_names/verify_schema.json",
-            'prod_file': 'lang_name_verify_file.json'
+            'prod_file': 'lang_names_verify_file.json'
         },
         "result_data": {
             "schema_file": "lang_names/result_schema.json",
-            "prod_file": "lang_name_test_file.json"
+            "prod_file": "lang_names_test_file.json"
         }
     },
     "likely_subtags": {

testdriver/datasets.py

@@ -143,14 +143,14 @@ def def_value():
 
 testName = 'display_names'
 testDatasets[testName] = DataSet(testType.display_names.value,
-                                 'lang_name_test_file.json',
-                                 'lang_name_verify_file.json',
+                                 'lang_names_test_file.json',
+                                 'lang_names_verify_file.json',
                                  CLDRVersion.CLDR41, ICUVersion.ICU71)
 
 testName = 'lang_names'
 testDatasets[testName] = DataSet(testType.lang_names.value,
-                                 'lang_name_test_file.json',
-                                 'lang_name_verify_file.json',
+                                 'lang_names_test_file.json',
+                                 'lang_names_verify_file.json',
                                  CLDRVersion.CLDR41, ICUVersion.ICU71)
 
 testName = 'likely_subtags'

testgen/generators/lang_names.py

@@ -24,15 +24,15 @@ def process_test_data(self):
         # TODO: add standard vs. dialect vs. alternate names
         self.generateLanguageNameTestDataObjects(rawlangnametestdata)
         self.generateTestHashValues(self.json_test)
-        output_path = os.path.join(self.icu_version, "lang_name_test_file.json")
-        lang_name_test_file = open(output_path, "w", encoding="UTF-8")
-        json.dump(self.json_test, lang_name_test_file, indent=1)
-        lang_name_test_file.close()
-
-        output_path = os.path.join(self.icu_version, "lang_name_verify_file.json")
-        lang_name_verify_file = open(output_path, "w", encoding="UTF-8")
-        json.dump(self.json_verify, lang_name_verify_file, indent=1)
-        lang_name_verify_file.close()
+        output_path = os.path.join(self.icu_version, "lang_names_test_file.json")
+        lang_names_test_file = open(output_path, "w", encoding="UTF-8")
+        json.dump(self.json_test, lang_names_test_file, indent=1)
+        lang_names_test_file.close()
+
+        output_path = os.path.join(self.icu_version, "lang_names_verify_file.json")
+        lang_names_verify_file = open(output_path, "w", encoding="UTF-8")
+        json.dump(self.json_verify, lang_names_verify_file, indent=1)
+        lang_names_verify_file.close()
 
         return True
 

testgen/generators/localeDisplayNames.py

@@ -26,15 +26,15 @@ def process_test_data(self):
         # TODO: add standard vs. dialect vs. alternate names
         self.generateLanguageNameTestDataObjects(raw_locale_display_names_testdata)
         self.generateTestHashValues(self.json_test)
-        output_path = os.path.join(self.icu_version, "lang_name_test_file.json")
-        lang_name_test_file = open(output_path, "w", encoding="UTF-8")
-        json.dump(self.json_test, lang_name_test_file, indent=1)
-        lang_name_test_file.close()
-
-        output_path = os.path.join(self.icu_version, "lang_name_verify_file.json")
-        lang_name_verify_file = open(output_path, "w", encoding="UTF-8")
-        json.dump(self.json_verify, lang_name_verify_file, indent=1)
-        lang_name_verify_file.close()
+        output_path = os.path.join(self.icu_version, "lang_names_test_file.json")
+        lang_names_test_file = open(output_path, "w", encoding="UTF-8")
+        json.dump(self.json_test, lang_names_test_file, indent=1)
+        lang_names_test_file.close()
+
+        output_path = os.path.join(self.icu_version, "lang_names_verify_file.json")
+        lang_names_verify_file = open(output_path, "w", encoding="UTF-8")
+        json.dump(self.json_verify, lang_names_verify_file, indent=1)
+        lang_names_verify_file.close()
 
         return True