From b984bf2d74605b12ec750d0721d4ade27169d7b2 Mon Sep 17 00:00:00 2001 From: y00314596 Date: Wed, 22 Feb 2023 16:00:19 +0800 Subject: [PATCH] fixed 1f4e0e7 from https://gitee.com/yangqing3/xts_acts/pulls/7699 add by yangqing3@huawei.com Signed-off-by: y00314596 --- .../intljs/src/main/js/test/I18n.test.js | 14 +++++++------- global/perf/perfjs/src/main/js/test/Perf.test.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/global/i18n_standard/intljs/src/main/js/test/I18n.test.js b/global/i18n_standard/intljs/src/main/js/test/I18n.test.js index c53c8641f..e1f1d7af0 100644 --- a/global/i18n_standard/intljs/src/main/js/test/I18n.test.js +++ b/global/i18n_standard/intljs/src/main/js/test/I18n.test.js @@ -761,7 +761,7 @@ describe('I18nTest', function () { console.log('i18n_test_7810 ' + ran); let value = phonenumber.getLocationName('1351057467' + ran, 'zh-CN'); console.log('i18n_test_7810 ' + value); - expect(value).assertEqual('中国'); + expect(value == '中国' || value == '广东省深圳市').assertTrue(); }) /** @@ -776,10 +776,10 @@ describe('I18nTest', function () { console.log('i18n_test_7820 ' + ran); let value = phonenumber.getLocationName('+861351057467' + ran, 'en-US'); console.log('i18n_test_7820 ' + value); - expect(value).assertEqual('China'); + expect(value == 'China' || value == 'Shenzhen, Guangdong').assertTrue(); let value2 = phonenumber.getLocationName('+86 1351057467' + ran, 'en-US'); console.log('i18n_test_7820 ' + value2); - expect(value2).assertEqual('China'); + expect(value2 == 'China' || value2 == 'Shenzhen, Guangdong').assertTrue(); }) /** @@ -794,10 +794,10 @@ describe('I18nTest', function () { console.log('i18n_test_7830 ' + ran); let value1 = phonenumber.getLocationName('+861586661737' + ran, 'en-US'); console.log('i18n_test_7830 ' + value1); - expect(value1).assertEqual('China'); + expect(value1 == 'China' || value1 == 'Jinan, Shandong').assertTrue(); let value2 = phonenumber.getLocationName('+86 1586661737' + ran, 'en-US'); console.log('i18n_test_7830 ' + value2); - expect(value2).assertEqual('China'); + expect(value2 == 'China' || value2 == 'Jinan, Shandong').assertTrue(); }) /** @@ -812,7 +812,7 @@ describe('I18nTest', function () { console.log('i18n_test_7840 ' + ran); let value = phonenumber.getLocationName('027-5937411' + ran, 'zh-CN'); console.log('i18n_test_7840 ' + value); - expect(value).assertEqual('中国'); + expect(value == '中国' || value == '湖北省武汉市').assertTrue(); }) /** @@ -827,7 +827,7 @@ describe('I18nTest', function () { console.log('i18n_test_7850 ' + ran); let value = phonenumber.getLocationName('0728-623797' + ran, 'zh-CN'); console.log('i18n_test_7850 ' + value); - expect(value).assertEqual('中国'); + expect(value == '中国' || value == '湖北省仙桃市').assertTrue(); }) /** diff --git a/global/perf/perfjs/src/main/js/test/Perf.test.js b/global/perf/perfjs/src/main/js/test/Perf.test.js index 0b03c6a60..b8d0fb5e8 100644 --- a/global/perf/perfjs/src/main/js/test/Perf.test.js +++ b/global/perf/perfjs/src/main/js/test/Perf.test.js @@ -2217,7 +2217,7 @@ describe('PerfTest', function () { + ' value: ' + value + ' exeTime: ' + exeTime + ' avgTime: ' + avgTime); - expect(value).assertEqual('中国'); + expect(value == '中国' || value == '广东省深圳市').assertTrue(); if(avgTime < 10){ expect(true).assertTrue(); } -- GitLab