Add tree dump utility to E2E test framework and fix Image border issue #3754
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "TreeDump for E2E test and fix for image border issue", | ||
| "packageName": "react-native-windows", | ||
| "email": "dida@ntdev.microsoft.com", | ||
| "commit": "88f9b0eaecfe88e2243b66d969420131224f1c56", | ||
| "date": "2019-12-10T20:31:33.939Z" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,70 @@ | ||||||||
| /** | ||||||||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||||||||
| * Licensed under the MIT License. | ||||||||
| */ | ||||||||
|
|
||||||||
| import {StyleSheet, View, Image, Button, requireNativeComponent} from 'react-native' | ||||||||
| import React, { useState } from 'react'; | ||||||||
| import { TREE_DUMP_RESULT, SHOW_IMAGE_BORDER, IMAGE_CONTAINER } from './Consts'; | ||||||||
| const TreeDumpControl = requireNativeComponent('TreeDumpControl'); | ||||||||
|
|
||||||||
| const styles = StyleSheet.create({ | ||||||||
| container: { | ||||||||
| height:300, | ||||||||
| width:500, | ||||||||
| backgroundColor: 'yellow', | ||||||||
| alignItems:'center', | ||||||||
| }, | ||||||||
| containerWithBorder: { | ||||||||
| height:300, | ||||||||
| width:500, | ||||||||
| borderRadius: 10.0, | ||||||||
| borderWidth:10, | ||||||||
| borderColor: '#00ff0055', | ||||||||
| backgroundColor: 'yellow', | ||||||||
| alignItems:'center', | ||||||||
| }, | ||||||||
| imageWithBorder: { | ||||||||
| height: '100%', | ||||||||
| width: '100%', | ||||||||
| borderRadius: 10.0, | ||||||||
| borderWidth:10, | ||||||||
| borderColor: '#0000ff55', | ||||||||
| backgroundColor: 'red', | ||||||||
| }, | ||||||||
| image: { | ||||||||
| height: '100%', | ||||||||
| width: '100%', | ||||||||
| backgroundColor: 'red', | ||||||||
| }, | ||||||||
| treeDumpControl: { | ||||||||
| height: 150, | ||||||||
| width: 500, | ||||||||
| margin: 10, | ||||||||
| }, | ||||||||
| }); | ||||||||
|
|
||||||||
| export function ImageTestPage() { | ||||||||
| const [imageWithBorder, setImageBorder] = useState(false); | ||||||||
| const [clickCount, setClickCount] = useState(0); | ||||||||
| const onOressBorder = () => { | ||||||||
| var previousImageBorderState = imageWithBorder; | ||||||||
| setImageBorder(!previousImageBorderState); | ||||||||
| var previousClickCount = clickCount; | ||||||||
| setClickCount(previousClickCount+1); | ||||||||
| } | ||||||||
| return( | ||||||||
| <View> | ||||||||
| <View testID={IMAGE_CONTAINER} style={imageWithBorder?styles.containerWithBorder:styles.container}> | ||||||||
| <Image | ||||||||
| style={imageWithBorder?styles.imageWithBorder:styles.image} | ||||||||
| resizeMode={'center'} | ||||||||
| source={{uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADMAAAAzCAYAAAA6oTAqAAAAEXRFWHRTb2Z0d2FyZQBwbmdjcnVzaEB1SfMAAABQSURBVGje7dSxCQBACARB+2/ab8BEeQNhFi6WSYzYLYudDQYGBgYGBgYGBgYGBgYGBgZmcvDqYGBgmhivGQYGBgYGBgYGBgYGBgYGBgbmQw+P/eMrC5UTVAAAAABJRU5ErkJggg=='}} | ||||||||
| /> | ||||||||
| </View > | ||||||||
| <Button title= {imageWithBorder?"Hide Border":"Show Border"} | ||||||||
| onPress={onOressBorder} | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| testID={SHOW_IMAGE_BORDER}/> | ||||||||
| <TreeDumpControl style={styles.treeDumpControl} dumpID={imageWithBorder?'ImageWithBorder':'ImageWithoutBorder'+clickCount} uiaID={IMAGE_CONTAINER} testID={TREE_DUMP_RESULT} /> | ||||||||
|
There was a problem hiding this comment.
ImageWithoutBorder0.txt and ImageWithoutBorder2.txt is not readable, also you created a hard binding between ImageTestPage and Image.spec.ts. If you refactor the test case like changing the order or inserting a new click, it doesn't work anymore. #Resolved There was a problem hiding this comment. I am going to refactor the dumpID to "ImageWithoutBorder" and "ImageWithoutBorder-Subsequent", so it would work for click count > 2. The dump file is different if you initially don't have a border, or had a border then removed the border. In reply to: 358381794 [](ancestors = 358381794) |
||||||||
| </View>); | ||||||||
| } | ||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -2,12 +2,22 @@ | |||||||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||||||||
| * Licensed under the MIT License. | ||||||||
| */ | ||||||||
| import { | ||||||||
| REACT_CONTROL_ERROR_TEST_ID, | ||||||||
| HOME_BUTTON, | ||||||||
| TREE_DUMP_RESULT, | ||||||||
| } from '../../app/Consts'; | ||||||||
|
|
||||||||
| export function By(testId: string): WebdriverIO.Element { | ||||||||
| return $('~' + testId); | ||||||||
| } | ||||||||
|
|
||||||||
| export function wait(timeout: number) { | ||||||||
| return new Promise(resolve => { | ||||||||
| setTimeout(resolve, timeout); | ||||||||
| }); | ||||||||
| } | ||||||||
|
|
||||||||
| export class BasePage { | ||||||||
| isPageLoaded(): boolean { | ||||||||
| return this.homeButton.isDisplayed(); | ||||||||
|
|
@@ -23,6 +33,28 @@ export class BasePage { | |||||||
| ); | ||||||||
| } | ||||||||
|
|
||||||||
| getTreeDumpResult() { | ||||||||
| var testResult = false; | ||||||||
| const maxWait = 20; | ||||||||
| var waitCount = 1; | ||||||||
| do { | ||||||||
| testResult = this.treeDumpResult.getText() == 'TreeDump:Passed'; | ||||||||
| if (!testResult) { | ||||||||
| console.log( | ||||||||
| '####Waiting for treedump comparison result ' + | ||||||||
| waitCount + | ||||||||
| '/' + | ||||||||
| maxWait + | ||||||||
| '...####' | ||||||||
| ); | ||||||||
| wait(100); | ||||||||
|
There was a problem hiding this comment. Is there no event you can wait for? #Resolved There was a problem hiding this comment. Was going to add event and wait for that, but we have issues with the optimized constructor with Context parameter on release build issue, so I decided to do polling for now. Will open a issue to revisit later after Jon fixes the Custom ViewManager bug. In reply to: 357846482 [](ancestors = 357846482) There was a problem hiding this comment. Feel free to open an issue to add a WaitForIdle or similar. In reply to: 357870760 [](ancestors = 357870760,357846482) |
||||||||
| waitCount += 1; | ||||||||
| } | ||||||||
| } while (waitCount <= maxWait && testResult == false); | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
|
|
||||||||
| return testResult; | ||||||||
| } | ||||||||
|
|
||||||||
| protected timeoutForPageLoaded(currentTimeout?: number) { | ||||||||
| if (currentTimeout) return currentTimeout; | ||||||||
| return this.waitforPageTimeout; | ||||||||
|
|
@@ -44,6 +76,10 @@ export class BasePage { | |||||||
| return this.isPageLoaded(); | ||||||||
| } | ||||||||
|
|
||||||||
| private get treeDumpResult() { | ||||||||
| return By(TREE_DUMP_RESULT); | ||||||||
| } | ||||||||
|
|
||||||||
| // Default timeout for waitForPageLoaded command in PageObject | ||||||||
| private waitforPageTimeout: number = 10000; | ||||||||
| } | ||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /** | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. | ||
| */ | ||
|
|
||
| import { BasePage, By } from './BasePage'; | ||
| import { SHOW_IMAGE_BORDER } from '../../app/Consts'; | ||
|
|
||
| class ImageTestPage extends BasePage { | ||
| backToHomePage() { | ||
| this.homeButton.click(); | ||
| this.waitForPageLoaded(); | ||
| } | ||
|
|
||
| isPageLoaded() { | ||
| return super.isPageLoaded(); | ||
| } | ||
|
|
||
| toggleImageBorder() { | ||
| this._imageBorder.click(); | ||
| } | ||
|
|
||
| private get _imageBorder() { | ||
| return By(SHOW_IMAGE_BORDER); | ||
| } | ||
| } | ||
|
|
||
| export default new ImageTestPage(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /** | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. | ||
| */ | ||
|
|
||
| import HomePage from '../pages/HomePage'; | ||
| import ImageTestPage from '../pages/ImageTestPage'; | ||
| import assert from 'assert'; | ||
|
|
||
| beforeAll(() => { | ||
| HomePage.backToHomePage(); | ||
| HomePage.clickAndGotoImagePage(); | ||
| }); | ||
|
|
||
| describe('ImageWithoutBorderTest', () => { | ||
| it('ImageWithoutBorderTest', () => { | ||
| const result = ImageTestPage.getTreeDumpResult(); | ||
| assert(result, '#1. Dump comparison for image without border!'); | ||
| }); | ||
|
|
||
| it('ImageWithBorderTest', () => { | ||
| ImageTestPage.toggleImageBorder(); | ||
| const result = ImageTestPage.getTreeDumpResult(); | ||
| assert(result, '#2. Dump comparison for image with border!'); | ||
| }); | ||
|
|
||
| // toggle back to no border and verify border properties are reset | ||
| it('ImageWithoutBorderTest', () => { | ||
| ImageTestPage.toggleImageBorder(); | ||
| const result = ImageTestPage.getTreeDumpResult(); | ||
| assert(result, '#3. Second dump comparison for image without border!'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| [Windows.UI.Xaml.Controls.Border] | ||
| ActualOffset=<0, 0, 0> | ||
| Background=#FFFFFF00 | ||
| BorderBrush=#5500FF00 | ||
| BorderThickness=10,10,10,10 | ||
| Clip=[NULL] | ||
| CornerRadius=10,10,10,10 | ||
| Height=300 | ||
| HorizontalAlignment=Stretch | ||
| Margin=0,0,0,0 | ||
| Padding=0,0,0,0 | ||
| RenderSize=500,300 | ||
| VerticalAlignment=Stretch | ||
| Visibility=Visible | ||
| Width=500 | ||
| [react.uwp.ViewPanel] | ||
| ActualOffset=<10, 10, 0> | ||
| Background=[NULL] | ||
| BorderBrush=#5500FF00 | ||
| BorderThickness=10,10,10,10 | ||
| Clip=[NULL] | ||
| CornerRadius=10,10,10,10 | ||
| HorizontalAlignment=Stretch | ||
| Margin=0,0,0,0 | ||
| RenderSize=480,280 | ||
| VerticalAlignment=Stretch | ||
| Visibility=Visible | ||
| [Windows.UI.Xaml.DependencyObject] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.