Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit dff2e07

Browse files
author
Zdravko
authored
Merge pull request #274 from NativeScript/zbranzov/default-tolerance
chore: move the default tolerance and toleranceType to ImageHelper
2 parents 81a5e4f + 0c260b2 commit dff2e07

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎lib/appium-driver.d.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ export declare class AppiumDriver {
2323
private _isAlive;
2424
private _locators;
2525
private _storageByPlatform;
26-
private _defaultToleranceType;
27-
private _defaultTolerance;
2826
private constructor();
2927
readonly imageHelper: ImageHelper;
3028
defaultWaitTime: number;
@@ -38,8 +36,6 @@ export declare class AppiumDriver {
3836
readonly isAndroid: boolean;
3937
readonly isIOS: boolean;
4038
readonly driver: any;
41-
defaultToleranceType: ImageOptions;
42-
defaultTolerance: number;
4339
/**
4440
* Get the storage where test results from image comparison is logged. The path should be reports/app nam/device name
4541
*/

‎lib/appium-driver.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ export class AppiumDriver {
5757
private _isAlive: boolean = false;
5858
private _locators: Locator;
5959
private _storageByPlatform: string;
60-
private _defaultToleranceType: ImageOptions = ImageOptions.percent;
61-
private _defaultTolerance: number = 0;
6260

6361
private constructor(private _driver: any, private _wd, private _webio: any, private _driverConfig, private _args: INsCapabilities) {
6462
this._elementHelper = new ElementHelper(this._args);
@@ -120,22 +118,6 @@ export class AppiumDriver {
120118
return this._driver;
121119
}
122120

123-
get defaultToleranceType(): ImageOptions {
124-
return this._defaultToleranceType;
125-
}
126-
127-
set defaultToleranceType(toleranceType: ImageOptions) {
128-
this._defaultToleranceType = toleranceType;
129-
}
130-
131-
get defaultTolerance(): number {
132-
return this._defaultTolerance;
133-
}
134-
135-
set defaultTolerance(tolerance: number) {
136-
this._defaultTolerance = tolerance;
137-
}
138-
139121
/**
140122
* Get the storage where test results from image comparison is logged. The path should be reports/app nam/device name
141123
*/
@@ -619,11 +601,11 @@ export class AppiumDriver {
619601
return await this.driver.getSessionId();
620602
}
621603

622-
public async compareElement(element: UIElement, imageName?: string, tolerance: number = this._defaultTolerance, timeOutSeconds: number = 3, toleranceType: ImageOptions = this._defaultToleranceType) {
604+
public async compareElement(element: UIElement, imageName?: string, tolerance: number = this.imageHelper.defaultTolerance, timeOutSeconds: number = 3, toleranceType: ImageOptions = this.imageHelper.defaultToleranceType) {
623605
return await this.compareRectangle(await element.getActualRectangle(), imageName, timeOutSeconds, tolerance, toleranceType);
624606
}
625607

626-
public async compareRectangle(rect: IRectangle, imageName?: string, timeOutSeconds: number = 3, tolerance: number = this._defaultTolerance, toleranceType: ImageOptions = this._defaultToleranceType) {
608+
public async compareRectangle(rect: IRectangle, imageName?: string, timeOutSeconds: number = 3, tolerance: number = this.imageHelper.defaultTolerance, toleranceType: ImageOptions = this.imageHelper.defaultToleranceType) {
627609
imageName = imageName || this.imageHelper.testName;
628610
const options = this.imageHelper.extendOptions({
629611
imageName: imageName,
@@ -637,7 +619,7 @@ export class AppiumDriver {
637619
return await this.imageHelper.compare(options);
638620
}
639621

640-
public async compareScreen(imageName?: string, timeOutSeconds: number = 3, tolerance: number = this._defaultTolerance, toleranceType: ImageOptions = this._defaultToleranceType) {
622+
public async compareScreen(imageName?: string, timeOutSeconds: number = 3, tolerance: number = this.imageHelper.defaultTolerance, toleranceType: ImageOptions = this.imageHelper.defaultToleranceType) {
641623
imageName = imageName || this.imageHelper.testName;
642624
const options = this.imageHelper.extendOptions({
643625
imageName: imageName,

‎lib/image-helper.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ export declare class ImageHelper {
6464
private _blockOutAreas;
6565
private _imagesResults;
6666
private _options;
67+
private _defaultToleranceType;
68+
private _defaultTolerance;
6769
private _defaultOptions;
6870
constructor(_args: INsCapabilities, _driver: AppiumDriver);
6971
static readonly pngFileExt = ".png";
@@ -80,6 +82,8 @@ export declare class ImageHelper {
8082
delta: number;
8183
options: IImageCompareOptions;
8284
blockOutAreas: IRectangle[];
85+
defaultToleranceType: ImageOptions;
86+
defaultTolerance: number;
8387
compareScreen(options?: IImageCompareOptions): Promise<boolean>;
8488
compareElement(element: UIElement, options?: IImageCompareOptions): Promise<boolean>;
8589
compareRectangle(cropRectangle: IRectangle, options?: IImageCompareOptions): Promise<boolean>;

‎lib/image-helper.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ export class ImageHelper {
8383
private _blockOutAreas: IRectangle[];
8484
private _imagesResults = new Map<string, boolean>();
8585
private _options: IImageCompareOptions = {};
86+
private _defaultToleranceType: ImageOptions = ImageOptions.percent;
87+
private _defaultTolerance: number = 0;
8688
private _defaultOptions: IImageCompareOptions = {
8789
timeOutSeconds: 2,
8890
tolerance: 0,
@@ -148,6 +150,22 @@ export class ImageHelper {
148150
this._blockOutAreas = rectangles;
149151
}
150152

153+
get defaultToleranceType(): ImageOptions {
154+
return this._defaultToleranceType;
155+
}
156+
157+
set defaultToleranceType(toleranceType: ImageOptions) {
158+
this._defaultToleranceType = toleranceType;
159+
}
160+
161+
get defaultTolerance(): number {
162+
return this._defaultTolerance;
163+
}
164+
165+
set defaultTolerance(tolerance: number) {
166+
this._defaultTolerance = tolerance;
167+
}
168+
151169
public async compareScreen(options?: IImageCompareOptions) {
152170
options = this.extendOptions(options);
153171
options.imageName = this.increaseImageName(options.imageName || this.testName, options);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /