Add tree dump utility to E2E test framework and fix Image border issue #3754
There are no files selected for viewing
This file contains hidden or 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": "[email protected]", | ||
| "commit": "88f9b0eaecfe88e2243b66d969420131224f1c56", | ||
| "date": "2019-12-10T20:31:33.939Z" | ||
| } |
This file contains hidden or 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 hidden or 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,64 @@ | ||
| /** | ||
| * 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_ELEMENT } from './Consts'; | ||
| const TreeDumpControl = requireNativeComponent('TreeDumpControl'); | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| container: { | ||
| height:220, | ||
| width:450, | ||
| }, | ||
| imageWithBorder: { | ||
| height: '100%', | ||
| width: '100%', | ||
| borderRadius: 10.0, | ||
| borderWidth:10, | ||
| borderColor: 'green', | ||
| backgroundColor: 'red', | ||
| }, | ||
| image: { | ||
| height: '100%', | ||
| width: '100%', | ||
| backgroundColor: 'red', | ||
| }, | ||
| buttonContainer: { | ||
| backgroundColor: '#2980b6', | ||
| paddingVertical: 15 | ||
| }, | ||
| buttonText: { | ||
| color: '#fff', | ||
| textAlign: 'center', | ||
| fontWeight: '700' | ||
| }, | ||
| treeDumpControl: { | ||
| height: 150, | ||
| width: 450, | ||
| margin: 10, | ||
| }, | ||
| }); | ||
|
|
||
| export function ImageTestPage() { | ||
| const [imageWithBorder, setImageBorder] = useState(false); | ||
| const onOressBorder = () => { | ||
| var previousImageBorderState = imageWithBorder; | ||
| setImageBorder(!previousImageBorderState); | ||
| } | ||
| return( | ||
| <View style={styles.container}> | ||
| <Image | ||
| testID={IMAGE_ELEMENT} | ||
| style={imageWithBorder?styles.imageWithBorder:styles.image} | ||
| resizeMode={'center'} | ||
| source={{uri: 'http://facebook.github.io/react-native/img/header_logo.png'}} | ||
|
||
| /> | ||
| <Button title= {imageWithBorder?"Hide Border":"Show Border"} | ||
| onPress={onOressBorder} | ||
| testID={SHOW_IMAGE_BORDER}/> | ||
| <TreeDumpControl style={styles.treeDumpControl} dumpID={imageWithBorder?'ImageWithBorder':'ImageWithoutBorder'} uiaID={IMAGE_ELEMENT} testID={TREE_DUMP_RESULT} /> | ||
| </View >); | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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,36 @@ | ||
| /** | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. | ||
| */ | ||
|
|
||
| import { BasePage, By } from './BasePage'; | ||
| import { TREE_DUMP_RESULT, SHOW_IMAGE_BORDER } from '../../app/Consts'; | ||
|
|
||
| class ImageTestPage extends BasePage { | ||
| backToHomePage() { | ||
| this.homeButton.click(); | ||
| this.waitForPageLoaded(); | ||
| } | ||
|
|
||
| isPageLoaded() { | ||
| return super.isPageLoaded() && this.treeDumpResult.isDisplayed(); | ||
| } | ||
|
|
||
| getTreeDumpResult() { | ||
| return this.treeDumpResult.getText(); | ||
| } | ||
|
|
||
| toggleImageBorder() { | ||
| this._imageBorder.click(); | ||
| } | ||
|
|
||
| private get treeDumpResult() { | ||
| return By(TREE_DUMP_RESULT); | ||
| } | ||
|
|
||
| private get _imageBorder() { | ||
| return By(SHOW_IMAGE_BORDER); | ||
| } | ||
| } | ||
|
|
||
| export default new ImageTestPage(); |
This file contains hidden or 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,41 @@ | ||
| /** | ||
| * 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 Success', () => { | ||
| const result = ImageTestPage.getTreeDumpResult(); | ||
| assert.ok( | ||
| result.includes('TreeDump:Passed'), | ||
| 'Dump comparison passed for image without border!' | ||
| ); | ||
|
||
| }); | ||
|
|
||
| it('ImageWithBorderTest', () => { | ||
| ImageTestPage.toggleImageBorder(); | ||
| const result = ImageTestPage.getTreeDumpResult(); | ||
| assert.ok( | ||
| result.includes('TreeDump:Passed'), | ||
| 'Dump comparison passed for image with border!' | ||
| ); | ||
| }); | ||
|
|
||
| // toggle back to no border and verify border properties are reset | ||
| it('ImageWithoutBorderTest Success', () => { | ||
| const result = ImageTestPage.getTreeDumpResult(); | ||
| assert.ok( | ||
| result.includes('TreeDump:Passed'), | ||
| 'Second dump comparison passed for image without border!' | ||
| ); | ||
| }); | ||
| }); | ||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -9,6 +9,8 @@ | |
| using Windows.UI.Xaml.Navigation; | ||
| using Microsoft.ReactNative; | ||
| using Windows.UI.Core; | ||
| using Windows.UI.ViewManagement; | ||
| using Windows.Foundation; | ||
|
|
||
| namespace ReactUWPTestApp | ||
| { | ||
|
|
@@ -42,6 +44,8 @@ public App() | |
| #endif | ||
|
|
||
| PackageProviders.Add(new Microsoft.ReactNative.Managed.ReactPackageProvider()); // Includes any modules in this project | ||
| PackageProviders.Add(new TreeDumpLibrary.ReactPackageProvider()); | ||
|
|
||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
|
|
@@ -54,6 +58,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e) | |
| { | ||
| base.OnLaunched(e); | ||
| SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = AppViewBackButtonVisibility.Collapsed; | ||
| ApplicationView.GetForCurrentView().TryResizeView(new Size(1024, 768)); | ||
|
||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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,16 @@ | ||
| [Windows.UI.Xaml.Controls.Border] | ||
| Padding=0,0,0,0 | ||
|
||
| CornerRadius=10,10,10,10 | ||
| BorderThickness=10,10,10,10 | ||
| BorderBrush=#FF008000 | ||
| Background=#FFFF0000 | ||
| Width=450 | ||
| VerticalAlignment=Stretch | ||
| Margin=0,0,0,0 | ||
| HorizontalAlignment=Stretch | ||
| Height=220 | ||
| Clip=[NULL] | ||
| Visibility=Visible | ||
| RenderSize=450,220 | ||
| ActualOffset=<0, 0, 0> | ||
| [Windows.UI.Xaml.DependencyObject] | ||
This file contains hidden or 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,16 @@ | ||
| [Windows.UI.Xaml.Controls.Border] | ||
| Padding=0,0,0,0 | ||
| CornerRadius=0,0,0,0 | ||
| BorderThickness=0,0,0,0 | ||
| BorderBrush=[NULL] | ||
| Background=#FFFF0000 | ||
| Width=450 | ||
| VerticalAlignment=Stretch | ||
| Margin=0,0,0,0 | ||
| HorizontalAlignment=Stretch | ||
| Height=220 | ||
| Clip=[NULL] | ||
| Visibility=Visible | ||
| RenderSize=450,220 | ||
| ActualOffset=<0, 0, 0> | ||
| [Windows.UI.Xaml.DependencyObject] |
This file contains hidden or 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 hidden or 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 @@ | ||
| copy %LocalAppData%\Packages\ReactUWPTestApp_kc2bncckyf4ap\LocalState\TreeDump\*.out Assets\TreeDump\*.treedump |
This file contains hidden or 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,16 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| using Microsoft.ReactNative.Bridge; | ||
| using Microsoft.ReactNative.Managed; | ||
|
|
||
| namespace TreeDumpLibrary | ||
| { | ||
| public sealed class ReactPackageProvider : IReactPackageProvider | ||
| { | ||
| public void CreatePackage(IReactPackageBuilder packageBuilder) | ||
| { | ||
| packageBuilder.AddViewManagers(); | ||
| } | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.
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.