未验证 提交 4dc5b9c3 编写于 作者: O openharmony_ci 提交者: Gitee

!9223 修改indexer xts失败用例

Merge pull request !9223 from sunjiakun/master
...@@ -166,7 +166,7 @@ struct AlphabetIndexerTest { ...@@ -166,7 +166,7 @@ struct AlphabetIndexerTest {
.selectedFont({ size: 28, weight: FontWeight.Bold }) .selectedFont({ size: 28, weight: FontWeight.Bold })
.color(0x000000) .color(0x000000)
.selectedColor(0xFF1493) .selectedColor(0xFF1493)
.backgroundColor(0xF8F8FF) .backgroundColor($r("sys.color.ohos_id_color_primary"))
.selectedBackgroundColor(0xBEBEBE) .selectedBackgroundColor(0xBEBEBE)
.itemSize(26) .itemSize(26)
.onSelect((index: number) => { .onSelect((index: number) => {
...@@ -203,7 +203,7 @@ struct AlphabetIndexerTest { ...@@ -203,7 +203,7 @@ struct AlphabetIndexerTest {
.selectedFont({ size: 28, weight: FontWeight.Bold }) .selectedFont({ size: 28, weight: FontWeight.Bold })
.color(0x000000) .color(0x000000)
.selectedColor(0xFF1493) .selectedColor(0xFF1493)
.backgroundColor(0xF8F8FF) .backgroundColor($r("sys.color.ohos_id_color_primary"))
.selectedBackgroundColor(0xBEBEBE) .selectedBackgroundColor(0xBEBEBE)
.itemSize(26) .itemSize(26)
.onSelect((index: number) => { .onSelect((index: number) => {
...@@ -244,7 +244,7 @@ struct AlphabetIndexerTest { ...@@ -244,7 +244,7 @@ struct AlphabetIndexerTest {
.selectedFont({ size: 28, weight: FontWeight.Bold }) .selectedFont({ size: 28, weight: FontWeight.Bold })
.color(0x000000) .color(0x000000)
.selectedColor(0xFF1493) .selectedColor(0xFF1493)
.backgroundColor(0xF8F8FF) .backgroundColor($r("sys.color.ohos_id_color_primary"))
.selectedBackgroundColor(0xBEBEBE) .selectedBackgroundColor(0xBEBEBE)
.itemSize(26) .itemSize(26)
.onSelect((index: number) => { .onSelect((index: number) => {
...@@ -285,7 +285,7 @@ struct AlphabetIndexerTest { ...@@ -285,7 +285,7 @@ struct AlphabetIndexerTest {
.selectedFont({ size: 28, weight: FontWeight.Bold }) .selectedFont({ size: 28, weight: FontWeight.Bold })
.color(0x000000) .color(0x000000)
.selectedColor(0xFF1493) .selectedColor(0xFF1493)
.backgroundColor(0xF8F8FF) .backgroundColor($r("sys.color.ohos_id_color_primary"))
.selectedBackgroundColor(0xBEBEBE) .selectedBackgroundColor(0xBEBEBE)
.itemSize(26) .itemSize(26)
.onSelect((index: number) => { .onSelect((index: number) => {
......
...@@ -77,8 +77,8 @@ export default function AlphabetIndexer() { ...@@ -77,8 +77,8 @@ export default function AlphabetIndexer() {
console.info("ArkUI_AlphabetIndexer_0100 start"); console.info("ArkUI_AlphabetIndexer_0100 start");
let strJson = getInspectorByKey('alphabetIndexerTest1'); let strJson = getInspectorByKey('alphabetIndexerTest1');
let obj = JSON.parse(strJson); let obj = JSON.parse(strJson);
expect(obj.$attrs.popupSelectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupSelectedColor).assertEqual(obj.$attrs.backgroundColor);
expect(obj.$attrs.popupUnselectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupUnselectedColor).assertEqual(obj.$attrs.backgroundColor);
expect(obj.$attrs.popupItemBackground).assertEqual("#FFFFFFFF"); expect(obj.$attrs.popupItemBackground).assertEqual("#FFFFFFFF");
expect(obj.$attrs.popupItemFontSize).assertEqual("24.00vp"); expect(obj.$attrs.popupItemFontSize).assertEqual("24.00vp");
expect(obj.$attrs.popupItemFontWeight).assertEqual("FontWeight.Medium"); expect(obj.$attrs.popupItemFontWeight).assertEqual("FontWeight.Medium");
...@@ -90,7 +90,8 @@ export default function AlphabetIndexer() { ...@@ -90,7 +90,8 @@ export default function AlphabetIndexer() {
console.info("ArkUI_AlphabetIndexer_0600 start"); console.info("ArkUI_AlphabetIndexer_0600 start");
let strJson = getInspectorByKey('alphabetIndexerTest6'); let strJson = getInspectorByKey('alphabetIndexerTest6');
let obj = JSON.parse(strJson); let obj = JSON.parse(strJson);
expect(obj.$attrs.popupItemFontSize).assertEqual("30.00vp"); let popupItemFontSize = obj.$attrs.popupItemFontSize;
expect(parseFloat(popupItemFontSize)).assertEqual(30)
done(); done();
}); });
...@@ -123,7 +124,7 @@ export default function AlphabetIndexer() { ...@@ -123,7 +124,7 @@ export default function AlphabetIndexer() {
await Utils.sleep(2000); await Utils.sleep(2000);
let newJson = getInspectorByKey('alphabetIndexerTest2'); let newJson = getInspectorByKey('alphabetIndexerTest2');
let obj = JSON.parse(newJson); let obj = JSON.parse(newJson);
expect(obj.$attrs.popupSelectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupSelectedColor).assertEqual(obj.$attrs.backgroundColor);
done(); done();
}); });
...@@ -148,7 +149,7 @@ export default function AlphabetIndexer() { ...@@ -148,7 +149,7 @@ export default function AlphabetIndexer() {
await Utils.sleep(2000); await Utils.sleep(2000);
let newJson = getInspectorByKey('alphabetIndexerTest2'); let newJson = getInspectorByKey('alphabetIndexerTest2');
let obj = JSON.parse(newJson); let obj = JSON.parse(newJson);
expect(obj.$attrs.popupUnselectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupUnselectedColor).assertEqual(obj.$attrs.backgroundColor);
done(); done();
}); });
...@@ -273,7 +274,7 @@ export default function AlphabetIndexer() { ...@@ -273,7 +274,7 @@ export default function AlphabetIndexer() {
await Utils.sleep(2000); await Utils.sleep(2000);
let newJson = getInspectorByKey('alphabetIndexerTest3'); let newJson = getInspectorByKey('alphabetIndexerTest3');
let obj = JSON.parse(newJson); let obj = JSON.parse(newJson);
expect(obj.$attrs.popupSelectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupSelectedColor).assertEqual(obj.$attrs.backgroundColor);
done(); done();
}); });
...@@ -298,7 +299,7 @@ export default function AlphabetIndexer() { ...@@ -298,7 +299,7 @@ export default function AlphabetIndexer() {
await Utils.sleep(2000); await Utils.sleep(2000);
let newJson = getInspectorByKey('alphabetIndexerTest3'); let newJson = getInspectorByKey('alphabetIndexerTest3');
let obj = JSON.parse(newJson); let obj = JSON.parse(newJson);
expect(obj.$attrs.popupUnselectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupUnselectedColor).assertEqual(obj.$attrs.backgroundColor);
done(); done();
}); });
...@@ -423,7 +424,7 @@ export default function AlphabetIndexer() { ...@@ -423,7 +424,7 @@ export default function AlphabetIndexer() {
await Utils.sleep(2000); await Utils.sleep(2000);
let newJson = getInspectorByKey('alphabetIndexerTest4'); let newJson = getInspectorByKey('alphabetIndexerTest4');
let obj = JSON.parse(newJson); let obj = JSON.parse(newJson);
expect(obj.$attrs.popupSelectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupSelectedColor).assertEqual(obj.$attrs.backgroundColor);
done(); done();
}); });
...@@ -448,7 +449,7 @@ export default function AlphabetIndexer() { ...@@ -448,7 +449,7 @@ export default function AlphabetIndexer() {
await Utils.sleep(2000); await Utils.sleep(2000);
let newJson = getInspectorByKey('alphabetIndexerTest4'); let newJson = getInspectorByKey('alphabetIndexerTest4');
let obj = JSON.parse(newJson); let obj = JSON.parse(newJson);
expect(obj.$attrs.popupUnselectedColor).assertEqual("#FF182431"); expect(obj.$attrs.popupUnselectedColor).assertEqual(obj.$attrs.backgroundColor);
done(); done();
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册