diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets index 3042655e423d451db84d2c8e5c66a39d60e434d6..3349af8811f2778070d391c43b04001824cd0759 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets @@ -1,3 +1,17 @@ +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import { MessageManager, Callback } from '../../../common/MessageManager'; @Entry diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets index 938f5d40f032a9fd56eb166a8d7ae84b583e01ce..34fc56687a919e808233369fcd4c1c3aeb9c9e51 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets @@ -1,3 +1,17 @@ +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import { MessageManager, Callback } from '../../../common/MessageManager'; @Entry diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets index 668c2a49b665d65d1bb0b973ec3789658233d53b..9aabfdd9a8d962c4708e1200ccd65c73df9d826c 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets @@ -1,3 +1,17 @@ +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import { MessageManager, Callback } from '../../../common/MessageManager'; @Entry diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets index afc7b40e16f1ec4254393631a11108484388ba70..e96b852a3d2384dca1ca86391a3a76dd4d734fc7 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets @@ -1,6 +1,17 @@ -// WaterFlowDataSource.ets - -// 实现IDataSource接口的对象，用于瀑布流组件加载数据 +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ export class WaterFlowDataSource implements IDataSource { private dataArray: number[] = [] diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets index e9ded199ec466323444e49bf980930b8c1bc012f..915eb418b5ab586824321b04a7c1892bc2652b1a 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets @@ -1,3 +1,17 @@ +/** + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import { MessageManager, Callback } from '../../../common/MessageManager'; import { WaterFlowDataSource } from './WaterFlowDataSource'; diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets index 04025ad894b8d19c59eb76312aa68c7cc0cf9617..3f2e211bbc01bfc448c2086e12e86ff9ac23a931 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets @@ -52,10 +52,10 @@ export default function Grid_GridFrictionTest() { it('testGridFriction', 0, async function (done) { console.info('[testGridFriction] START'); globalThis.value.message.notify({name:'friction', value:-1}) - let listContainerStrJson = getInspectorByKey('Grid_GridFriction'); - let listContainerObj = JSON.parse(listContainerStrJson); - expect(listContainerObj.$type).assertEqual('Grid'); - expect(listContainerObj.$friction).assertEqual(0.6); + let gridContainerStrJson = getInspectorByKey('Grid_GridFriction'); + let gridContainerObj = JSON.parse(gridContainerStrJson); + expect(gridContainerObj.$type).assertEqual('Grid'); + expect(gridContainerObj.$friction).assertEqual(0.6); console.info('[testGridFriction] END'); done(); }); @@ -63,15 +63,15 @@ export default function Grid_GridFrictionTest() { /** * @tc.number SUB_ACE_GRID_GRIDFRICTION_002 * @tc.name testGridFriction - * @tc.desc set friction to 100 + * @tc.desc set friction to 10 */ it('testGridFriction', 0, async function (done) { console.info('[testGridFriction] START'); globalThis.value.message.notify({name:'friction', value:10}) - let listContainerStrJson = getInspectorByKey('Grid_GridFriction'); - let listContainerObj = JSON.parse(listContainerStrJson); - expect(listContainerObj.$type).assertEqual('Grid'); - expect(listContainerObj.$friction).assertEqual(10); + let gridContainerStrJson = getInspectorByKey('Grid_GridFriction'); + let gridContainerObj = JSON.parse(gridContainerStrJson); + expect(gridContainerObj.$type).assertEqual('Grid'); + expect(gridContainerObj.$friction).assertEqual(10); console.info('[testGridFriction] END'); done(); }); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets index 57e66693e513552ee9ea70dd9ffe069ee78bb477..7234788057ab863adb4f236bedd33ca895e752e0 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets @@ -368,9 +368,9 @@ import Row_Padding from './Row/parentComponentChanged/Row_Padding.test'; import Row_Size from './Row/parentComponentChanged/Row_Size.test'; import Row_VerticalAlign from './Row/parentComponentChanged/Row_VerticalAlign.test'; import list_ListFrictionTest from './List/List_attribute/List_ListFriction.test'; -import grid_GridFrictionTest from './List/List_attribute/Grid_GridFriction.test'; -import waterflow_WaterFlowFrictionTest from './List/List_attribute/Waterflow_WaterFlowFriction.test'; -import scroll_ScrollFrictionTest from './List/List_attribute/Scroll_ScrollFriction.test'; +import grid_GridFrictionTest from './Grid/Grid_attribute/Grid_GridFriction.test'; +import waterflow_WaterFlowFrictionTest from './WaterFlow/WaterFlow_attribute/Waterflow_WaterFlowFriction.test'; +import scroll_ScrollFrictionTest from './Scroll/Scroll_attribute/Scroll_ScrollFriction.test'; import AlignContentFlex_Start from './Flex/alignContent/Start/AlignContentFlex_Start.test.ets'; import AlignContent_FlexAlign_Start_Margin from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets'; diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets index 0f129cae8d719af5ecc7906a6567c578bd0a2840..27d1319eeecfea130b563e6b3c7f9187480bb83e 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets @@ -63,7 +63,7 @@ export default function list_ListFrictionTest() { /** * @tc.number SUB_ACE_LIST_LISTFRICTION_002 * @tc.name testListFriction - * @tc.desc set friction to 100 + * @tc.desc set friction to 10 */ it('testListFriction', 0, async function (done) { console.info('[testListFriction] START'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets index 439152d67d6c02a9707f36b21c376a80e4bd8182..54799acd7523a3c004c167f10554c1c9dd4b0d4a 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets @@ -52,10 +52,10 @@ export default function Scroll_ScrollFrictionTest() { it('testScrollFriction', 0, async function (done) { console.info('[testScrollFriction] START'); globalThis.value.message.notify({name:'friction', value:-1}) - let listContainerStrJson = getInspectorByKey('Scroll_ScrollFriction'); - let listContainerObj = JSON.parse(listContainerStrJson); - expect(listContainerObj.$type).assertEqual('Scroll'); - expect(listContainerObj.$friction).assertEqual(0.6); + let scrollContainerStrJson = getInspectorByKey('Scroll_ScrollFriction'); + let scrollContainerObj = JSON.parse(scrollContainerStrJson); + expect(scrollContainerObj.$type).assertEqual('Scroll'); + expect(scrollContainerObj.$friction).assertEqual(0.6); console.info('[testScrollFriction] END'); done(); }); @@ -63,15 +63,15 @@ export default function Scroll_ScrollFrictionTest() { /** * @tc.number SUB_ACE_SCROLL_SCROLLFRICTION_002 * @tc.name testScrollFriction - * @tc.desc set friction to 100 + * @tc.desc set friction to 10 */ it('testScrollFriction', 0, async function (done) { console.info('[testScrollFriction] START'); globalThis.value.message.notify({name:'friction', value:10}) - let listContainerStrJson = getInspectorByKey('Scroll_ScrollFriction'); - let listContainerObj = JSON.parse(listContainerStrJson); - expect(listContainerObj.$type).assertEqual('Scroll'); - expect(listContainerObj.$friction).assertEqual(10); + let scrollContainerStrJson = getInspectorByKey('Scroll_ScrollFriction'); + let scrollContainerObj = JSON.parse(scrollContainerStrJson); + expect(scrollContainerObj.$type).assertEqual('Scroll'); + expect(scrollContainerObj.$friction).assertEqual(10); console.info('[testScrollFriction] END'); done(); }); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets index 34c44c1314947d9551ef4e27eb3aa6c379440fb8..8edb9b85089ebebd457395606fe2f2985ef416ca 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets @@ -52,10 +52,10 @@ export default function Waterflow_WaterflowFrictionTest() { it('testWaterflowFriction', 0, async function (done) { console.info('[testWaterflowFriction] START'); globalThis.value.message.notify({name:'friction', value:-1}) - let listContainerStrJson = getInspectorByKey('Waterflow_WaterflowFriction'); - let listContainerObj = JSON.parse(listContainerStrJson); - expect(listContainerObj.$type).assertEqual('Waterflow'); - expect(listContainerObj.$friction).assertEqual(0.6); + let scrollContainerStrJson = getInspectorByKey('Waterflow_WaterflowFriction'); + let scrollContainerObj = JSON.parse(scrollContainerStrJson); + expect(scrollContainerObj.$type).assertEqual('Waterflow'); + expect(scrollContainerObj.$friction).assertEqual(0.6); console.info('[testWaterflowFriction] END'); done(); }); @@ -63,15 +63,15 @@ export default function Waterflow_WaterflowFrictionTest() { /** * @tc.number SUB_ACE_WATERFLOW_WATERFLOWFRICTION_002 * @tc.name testWaterflowFriction - * @tc.desc set friction to 100 + * @tc.desc set friction to 10 */ it('testWaterflowFriction', 0, async function (done) { console.info('[testWaterflowFriction] START'); globalThis.value.message.notify({name:'friction', value:10}) - let listContainerStrJson = getInspectorByKey('Waterflow_WaterflowFriction'); - let listContainerObj = JSON.parse(listContainerStrJson); - expect(listContainerObj.$type).assertEqual('Waterflow'); - expect(listContainerObj.$friction).assertEqual(10); + let scrollContainerStrJson = getInspectorByKey('Waterflow_WaterflowFriction'); + let scrollContainerObj = JSON.parse(scrollContainerStrJson); + expect(scrollContainerObj.$type).assertEqual('Waterflow'); + expect(scrollContainerObj.$friction).assertEqual(10); console.info('[testWaterflowFriction] END'); done(); });