Test
Test
. NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; @@ -550,7 +555,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"
. NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; @@ -575,7 +580,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"")]; [webView stringByEvaluatingJavaScript:@"passwordField.focus(); passwordField.select();"]; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityWord, 1)]; @@ -590,7 +595,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before after")]; // Word wraps "over" onto next line NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; EXPECT_EQ(1UL, textInputContexts.count); @@ -606,16 +611,16 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before after")]; // Word wraps "over" onto next line NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; EXPECT_EQ(1UL, textInputContexts.count); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x -= glyphWidth * 2; - documentRect.origin.y -= glyphWidth * 2; - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x -= DocumentEditingContextTestHelpers::glyphWidth * 2; + documentRect.origin.y -= DocumentEditingContextTestHelpers::glyphWidth * 2; + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NULL(context.contextBefore); @@ -628,16 +633,16 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before after")]; // Word wraps "over" onto next line NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; EXPECT_EQ(1UL, textInputContexts.count); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x += (documentRect.size.width / 2) - (glyphWidth * 2); - documentRect.origin.y += (documentRect.size.height / 2) - (glyphWidth * 2); - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x += (documentRect.size.width / 2) - (DocumentEditingContextTestHelpers::glyphWidth * 2); + documentRect.origin.y += (documentRect.size.height / 2) - (DocumentEditingContextTestHelpers::glyphWidth * 2); + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NSSTRING_EQ("The quick b", context.contextBefore); @@ -650,16 +655,16 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before after")]; // Word wraps "over" onto next line NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; EXPECT_EQ(1UL, textInputContexts.count); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x += documentRect.size.width + glyphWidth; - documentRect.origin.y += documentRect.size.height + glyphWidth; - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x += documentRect.size.width + DocumentEditingContextTestHelpers::glyphWidth; + documentRect.origin.y += documentRect.size.height + DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NSSTRING_EQ("The quick brown fox jumps over the lazy dog.", context.contextBefore); @@ -670,14 +675,14 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectBeforeRangeSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"The quick brown fox jumps over the dog.")]; + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 1)"]; // Hit testing below the last line is treated as if the line was hit. So, use height of 1 // to ensure we aren't even close to the line height. auto spatialBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"spatialBox.getBoundingClientRect().toJSON()"]); spatialBoxRect.size.height = 1; - EXPECT_EQ(CGRectMake(0, 0, 3 * glyphWidth, 1), spatialBoxRect); + EXPECT_EQ(CGRectMake(0, 0, 3 * DocumentEditingContextTestHelpers::glyphWidth, 1), spatialBoxRect); auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 2, spatialBoxRect)]; EXPECT_NOT_NULL(context); @@ -689,14 +694,14 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectAfterRangeSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"The quick brown fox jumps over the dog.")]; + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 1)"]; // Hit testing below the last line is treated as if the line was hit. So, use height of 1 // to ensure we aren't even close to the line height. auto spatialBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"spatialBox.getBoundingClientRect().toJSON()"]); spatialBoxRect.size.height = 1; - EXPECT_EQ(CGRectMake(39 * glyphWidth, 0, 0, 1), spatialBoxRect); + EXPECT_EQ(CGRectMake(39 * DocumentEditingContextTestHelpers::glyphWidth, 0, 0, 1), spatialBoxRect); auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 2, spatialBoxRect)]; EXPECT_NOT_NULL(context); @@ -708,14 +713,14 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectAroundRangeSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"The quick brown fox jumps over the dog.")]; + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 1)"]; // Hit testing below the last line is treated as if the line was hit. So, use height of 1 // to ensure we aren't even close to the line height. auto spatialBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"spatialBox.getBoundingClientRect().toJSON()"]); spatialBoxRect.size.height = 1; - EXPECT_EQ(CGRectMake(16 * glyphWidth, 0, 10 * glyphWidth, 1), spatialBoxRect); + EXPECT_EQ(CGRectMake(16 * DocumentEditingContextTestHelpers::glyphWidth, 0, 10 * DocumentEditingContextTestHelpers::glyphWidth, 1), spatialBoxRect); auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 2, spatialBoxRect)]; EXPECT_NOT_NULL(context); @@ -727,14 +732,14 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectBeforeCaretSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"
The quick brown fox jumps over the dog.")]; + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 0)"]; // Hit testing below the last line is treated as if the line was hit. So, use height of 1 // to ensure we aren't even close to the line height. auto spatialBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"spatialBox.getBoundingClientRect().toJSON()"]); spatialBoxRect.size.height = 1; - EXPECT_EQ(CGRectMake(0, 0, 3 * glyphWidth, 1), spatialBoxRect); + EXPECT_EQ(CGRectMake(0, 0, 3 * DocumentEditingContextTestHelpers::glyphWidth, 1), spatialBoxRect); auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 2, spatialBoxRect)]; EXPECT_NOT_NULL(context); @@ -746,14 +751,14 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectAfterCaretSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"The quick brown fox jumps over the dog.")]; + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 0)"]; // Hit testing below the last line is treated as if the line was hit. So, use height of 1 // to ensure we aren't even close to the line height. auto spatialBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"spatialBox.getBoundingClientRect().toJSON()"]); spatialBoxRect.size.height = 1; - EXPECT_EQ(CGRectMake(39 * glyphWidth, 0, 0, 1), spatialBoxRect); + EXPECT_EQ(CGRectMake(39 * DocumentEditingContextTestHelpers::glyphWidth, 0, 0, 1), spatialBoxRect); auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 2, spatialBoxRect)]; EXPECT_NOT_NULL(context); @@ -765,14 +770,14 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectAroundCaretSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"The quick brown fox jumps over the dog.")]; + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 0)"]; // Hit testing below the last line is treated as if the line was hit. So, use height of 1 // to ensure we aren't even close to the line height. auto spatialBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"spatialBox.getBoundingClientRect().toJSON()"]); spatialBoxRect.size.height = 1; - EXPECT_EQ(CGRectMake(16 * glyphWidth, 0, 10 * glyphWidth, 1), spatialBoxRect); + EXPECT_EQ(CGRectMake(16 * DocumentEditingContextTestHelpers::glyphWidth, 0, 10 * DocumentEditingContextTestHelpers::glyphWidth, 1), spatialBoxRect); auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 2, spatialBoxRect)]; EXPECT_NOT_NULL(context); @@ -786,7 +791,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"]; NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; @@ -803,17 +808,17 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"]; NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; EXPECT_EQ(1UL, textInputContexts.count); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x -= glyphWidth * 2; - documentRect.origin.y -= glyphWidth * 2; - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x -= DocumentEditingContextTestHelpers::glyphWidth * 2; + documentRect.origin.y -= DocumentEditingContextTestHelpers::glyphWidth * 2; + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore); @@ -826,7 +831,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"]; NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; @@ -835,10 +840,10 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto selectionBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"fox_jumps_over.getBoundingClientRect().toJSON()"]); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x = ((documentRect.origin.x + selectionBoxRect.origin.x) / 2) - (glyphWidth * 2); - documentRect.origin.y = ((documentRect.origin.y + selectionBoxRect.origin.y) / 2) - (glyphWidth * 2); - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x = ((documentRect.origin.x + selectionBoxRect.origin.x) / 2) - (DocumentEditingContextTestHelpers::glyphWidth * 2); + documentRect.origin.y = ((documentRect.origin.y + selectionBoxRect.origin.y) / 2) - (DocumentEditingContextTestHelpers::glyphWidth * 2); + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore); @@ -851,7 +856,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"]; NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; @@ -860,10 +865,10 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto selectionBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"fox_jumps_over.getBoundingClientRect().toJSON()"]); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x = ((documentRect.origin.x + documentRect.size.width + selectionBoxRect.origin.x + selectionBoxRect.size.width) / 2) + glyphWidth; - documentRect.origin.y = ((documentRect.origin.y + documentRect.size.height + selectionBoxRect.origin.y + selectionBoxRect.size.height) / 2) + glyphWidth; - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x = ((documentRect.origin.x + documentRect.size.width + selectionBoxRect.origin.x + selectionBoxRect.size.width) / 2) + DocumentEditingContextTestHelpers::glyphWidth; + documentRect.origin.y = ((documentRect.origin.y + documentRect.size.height + selectionBoxRect.origin.y + selectionBoxRect.size.height) / 2) + DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore); @@ -876,17 +881,17 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"before The quick brown fox jumps over the lazy dog. after")]; // Word wraps "over" onto next line [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"]; NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]]; EXPECT_EQ(1UL, textInputContexts.count); auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]); - documentRect.origin.x += documentRect.size.width + (glyphWidth * 2); - documentRect.origin.y += documentRect.size.height + (glyphWidth * 2); - documentRect.size.width = glyphWidth; - documentRect.size.height = glyphWidth; + documentRect.origin.x += documentRect.size.width + (DocumentEditingContextTestHelpers::glyphWidth * 2); + documentRect.origin.y += documentRect.size.height + (DocumentEditingContextTestHelpers::glyphWidth * 2); + documentRect.size.width = DocumentEditingContextTestHelpers::glyphWidth; + documentRect.size.height = DocumentEditingContextTestHelpers::glyphWidth; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])]; EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore); @@ -898,7 +903,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 980, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"hello world this is a test")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"hello world this is a test")]; [webView stringByEvaluatingJavaScript:@"document.querySelector('textarea').select()"]; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, CGRectMake(0, 0, 980, 600))]; @@ -911,7 +916,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping. - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"")]; // Word wraps "over" onto next line + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"")]; // Word wraps "over" onto next line [webView stringByEvaluatingJavaScript:@"test.focus(); test.setSelectionRange(25, 25)"]; // Place caret after 's' in "jumps". auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestRects, UITextGranularityWord, 2)]; @@ -931,26 +936,26 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) if (textRects.count >= 18) { CGFloat x = 401; - EXPECT_EQ(CGRectMake(x + 0 * glyphWidth, yPos, 25, height), textRects[0].CGRectValue); // f - EXPECT_EQ(CGRectMake(x + 1 * glyphWidth, yPos, 25, height), textRects[1].CGRectValue); // o - EXPECT_EQ(CGRectMake(x + 2 * glyphWidth, yPos, 25, height), textRects[2].CGRectValue); // x - EXPECT_EQ(CGRectMake(x + 3 * glyphWidth, yPos, 25, height), textRects[3].CGRectValue); // - EXPECT_EQ(CGRectMake(x + 4 * glyphWidth, yPos, 25, height), textRects[4].CGRectValue); // j - EXPECT_EQ(CGRectMake(x + 5 * glyphWidth, yPos, 25, height), textRects[5].CGRectValue); // u - EXPECT_EQ(CGRectMake(x + 6 * glyphWidth, yPos, 25, height), textRects[6].CGRectValue); // m - EXPECT_EQ(CGRectMake(x + 7 * glyphWidth, yPos, 25, height), textRects[7].CGRectValue); // p - EXPECT_EQ(CGRectMake(x + 8 * glyphWidth, yPos, 25, height), textRects[8].CGRectValue); // s - EXPECT_EQ(CGRectMake(x + 9 * glyphWidth, yPos, 25, height), textRects[9].CGRectValue); // + EXPECT_EQ(CGRectMake(x + 0 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[0].CGRectValue); // f + EXPECT_EQ(CGRectMake(x + 1 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[1].CGRectValue); // o + EXPECT_EQ(CGRectMake(x + 2 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[2].CGRectValue); // x + EXPECT_EQ(CGRectMake(x + 3 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[3].CGRectValue); // + EXPECT_EQ(CGRectMake(x + 4 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[4].CGRectValue); // j + EXPECT_EQ(CGRectMake(x + 5 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[5].CGRectValue); // u + EXPECT_EQ(CGRectMake(x + 6 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[6].CGRectValue); // m + EXPECT_EQ(CGRectMake(x + 7 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[7].CGRectValue); // p + EXPECT_EQ(CGRectMake(x + 8 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[8].CGRectValue); // s + EXPECT_EQ(CGRectMake(x + 9 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[9].CGRectValue); // x = 1; - EXPECT_EQ(CGRectMake(x + 0 * glyphWidth, 25 + yPos, 25, height), textRects[10].CGRectValue); // o - EXPECT_EQ(CGRectMake(x + 1 * glyphWidth, 25 + yPos, 25, height), textRects[11].CGRectValue); // v - EXPECT_EQ(CGRectMake(x + 2 * glyphWidth, 25 + yPos, 25, height), textRects[12].CGRectValue); // e - EXPECT_EQ(CGRectMake(x + 3 * glyphWidth, 25 + yPos, 25, height), textRects[13].CGRectValue); // r - EXPECT_EQ(CGRectMake(x + 4 * glyphWidth, 25 + yPos, 25, height), textRects[14].CGRectValue); // - EXPECT_EQ(CGRectMake(x + 5 * glyphWidth, 25 + yPos, 25, height), textRects[15].CGRectValue); // t - EXPECT_EQ(CGRectMake(x + 6 * glyphWidth, 25 + yPos, 25, height), textRects[16].CGRectValue); // h - EXPECT_EQ(CGRectMake(x + 7 * glyphWidth, 25 + yPos, 25, height), textRects[17].CGRectValue); // e + EXPECT_EQ(CGRectMake(x + 0 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[10].CGRectValue); // o + EXPECT_EQ(CGRectMake(x + 1 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[11].CGRectValue); // v + EXPECT_EQ(CGRectMake(x + 2 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[12].CGRectValue); // e + EXPECT_EQ(CGRectMake(x + 3 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[13].CGRectValue); // r + EXPECT_EQ(CGRectMake(x + 4 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[14].CGRectValue); // + EXPECT_EQ(CGRectMake(x + 5 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[15].CGRectValue); // t + EXPECT_EQ(CGRectMake(x + 6 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[16].CGRectValue); // h + EXPECT_EQ(CGRectMake(x + 7 * DocumentEditingContextTestHelpers::glyphWidth, 25 + yPos, 25, height), textRects[17].CGRectValue); // e } } @@ -958,7 +963,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); // Use "padding: 0" for the ")])]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle([NSString stringWithFormat:@"", DocumentEditingContextTestHelpers::applyAhemStyle(@"")])]; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestRects, UITextGranularityWord, 1)]; EXPECT_NOT_NULL(context); @@ -977,9 +982,9 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) if (textRects.count >= 3) { CGFloat x = 26; - EXPECT_EQ(CGRectMake(x + 0 * glyphWidth, yPos, 25, height), textRects[0].CGRectValue); // T - EXPECT_EQ(CGRectMake(x + 1 * glyphWidth, yPos, 25, height), textRects[1].CGRectValue); // h - EXPECT_EQ(CGRectMake(x + 2 * glyphWidth, yPos, 25, height), textRects[2].CGRectValue); // e + EXPECT_EQ(CGRectMake(x + 0 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[0].CGRectValue); // T + EXPECT_EQ(CGRectMake(x + 1 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[1].CGRectValue); // h + EXPECT_EQ(CGRectMake(x + 2 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[2].CGRectValue); // e } } @@ -988,8 +993,8 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); // Use "padding: 0" for the " + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle([NSString stringWithFormat:@"", + DocumentEditingContextTestHelpers::applyAhemStyle(@"" "")])]; @@ -1009,9 +1014,9 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) if (textRects.count >= 3) { CGFloat x = 26; - EXPECT_EQ(CGRectMake(x + 0 * glyphWidth, yPos, 25, height), textRects[0].CGRectValue); // T - EXPECT_EQ(CGRectMake(x + 1 * glyphWidth, yPos, 25, height), textRects[1].CGRectValue); // h - EXPECT_EQ(CGRectMake(x + 2 * glyphWidth, yPos, 25, height), textRects[2].CGRectValue); // e + EXPECT_EQ(CGRectMake(x + 0 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[0].CGRectValue); // T + EXPECT_EQ(CGRectMake(x + 1 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[1].CGRectValue); // h + EXPECT_EQ(CGRectMake(x + 2 * DocumentEditingContextTestHelpers::glyphWidth, yPos, 25, height), textRects[2].CGRectValue); // e } } @@ -1020,7 +1025,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstTwoWords) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"The quick brown fox jumps over the lazy dog.
")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the lazy dog.
")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestRects, UITextGranularityWord, 2)]; @@ -1057,7 +1062,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstTwoWordWithLeadingNonBreakableSpace) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"
The quick brown fox jumps over the lazy dog.
")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the lazy dog.
")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestRects, UITextGranularityWord, 1)]; @@ -1084,7 +1089,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastWord) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"
The quick brown fox jumps over the lazy dog.
")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the lazy dog.
")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestRects, UITextGranularityWord, 1)]; @@ -1111,7 +1116,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastWordWithTrailingNonBreakableSpace) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"
The quick brown fox jumps over the lazy dog.
")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the lazy dog.
")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestRects, UITextGranularityWord, 1)]; @@ -1140,7 +1145,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestTwoWordsAroundSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"The quick brown fox jumps over the lazy dog.")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"The quick brown fox jumps over the lazy dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 1)"]; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityWord, 2)]; @@ -1153,7 +1158,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestThreeWordsAroundSelection) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"The quick brown fox jumps over the lazy dog.")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"The quick brown fox jumps over the lazy dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 1)"]; auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityWord, 3)]; @@ -1166,7 +1171,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestBeforeInlinePlaceholder) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"hello world")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"hello world")]; [webView stringByEvaluatingJavaScript:@"getSelection().setPosition(wrapper.firstChild, 5)"]; // Place cursor after "hello". auto *placeholder = [webView synchronouslyInsertTextPlaceholderWithSize:CGSizeMake(5, 5)]; @@ -1183,7 +1188,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestAfterInlinePlaceholder) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"hello world")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"hello world")]; [webView stringByEvaluatingJavaScript:@"getSelection().setPosition(wrapper.firstChild, 6)"]; // Place cursor before "world". auto *placeholder = [webView synchronouslyInsertTextPlaceholderWithSize:CGSizeMake(5, 5)]; @@ -1200,7 +1205,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestBeforeBlockPlaceholder) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"hello world")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"hello world")]; [webView stringByEvaluatingJavaScript:@"getSelection().setPosition(wrapper.firstChild, 5)"]; // Place cursor after "hello". auto *placeholder = [webView synchronouslyInsertTextPlaceholderWithSize:CGSizeMake(0, 5)]; @@ -1217,7 +1222,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestAfterBlockPlaceholder) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"hello world")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"hello world")]; [webView stringByEvaluatingJavaScript:@"getSelection().setPosition(wrapper.firstChild, 6)"]; // Place cursor before "world". auto *placeholder = [webView synchronouslyInsertTextPlaceholderWithSize:CGSizeMake(0, 5)]; @@ -1238,7 +1243,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstTwoSentences) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeSentencesExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeSentencesExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularitySentence, 2)]; @@ -1251,7 +1256,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstTwoSentencesNoSpaces) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(@"
The first sentence.The second sentence.The third sentence.
")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(@"The first sentence.The second sentence.The third sentence.
")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularitySentence, 2)]; @@ -1264,7 +1269,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastSentence) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeSentencesExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeSentencesExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularitySentence, 1)]; @@ -1277,7 +1282,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastTwoSentences) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeSentencesExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeSentencesExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularitySentence, 2)]; @@ -1294,7 +1299,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstParagraph) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityParagraph, 1)]; @@ -1307,7 +1312,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstTwoParagraphs) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityParagraph, 2)]; @@ -1320,7 +1325,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastParagraph) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityParagraph, 1)]; @@ -1333,7 +1338,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastTwoParagraphs) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityParagraph, 2)]; @@ -1346,7 +1351,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastTwoParagraphsWithSelectiontWithinParagraph) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(@"The quick brown fox jumps over the lazy dog.")]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(@"The quick brown fox jumps over the lazy dog.")]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(jumps, 0, jumps, 1)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityParagraph, 2)]; @@ -1362,7 +1367,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstCharacter) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityCharacter, 1)]; @@ -1375,7 +1380,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstWordUsingCharacterGranularity) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityCharacter, 3)]; @@ -1388,7 +1393,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstWordPlusTrailingSpaceUsingCharacterGranularity) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityCharacter, 4)]; @@ -1403,7 +1408,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstLine) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityLine, 1)]; @@ -1416,7 +1421,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestFirstTwoLines) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, 0, text.firstChild, 0)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityLine, 2)]; @@ -1429,7 +1434,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastLine) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityLine, 1)]; @@ -1442,7 +1447,7 @@ static CGRect CGRectFromJSONEncodedDOMRectJSValue(id jsValue) TEST(DocumentEditingContext, RequestLastTwoLines) { auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLString:applyAhemStyle(threeParagraphsExample)]; + [webView synchronouslyLoadHTMLString:DocumentEditingContextTestHelpers::applyAhemStyle(threeParagraphsExample)]; [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(text.firstChild, text.firstChild.length, text.firstChild, text.firstChild.length)"]; // Will focus
. auto *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText, UITextGranularityLine, 2)]; diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm index 862618502ab8a..e8823e2484217 100644 --- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm +++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm @@ -432,11 +432,15 @@ static void checkContentViewHasTextWithFailureDescription(TestWKWebView *webView EXPECT_GT([[webView textInputContentView] selectedText].length, 0U); } +namespace EditorStateTests { + constexpr unsigned glyphWidth { 25 }; // pixels -static NSString *applyAhemStyle(NSString *htmlString) +NSString *applyAhemStyle(NSString *htmlString) { - return [NSString stringWithFormat:@"%@", glyphWidth, htmlString]; + return [NSString stringWithFormat:@"%@", EditorStateTests::glyphWidth, htmlString]; +} + } TEST(EditorStateTests, MarkedTextRange_HorizontalCaretSelection) @@ -444,7 +448,7 @@ static void checkContentViewHasTextWithFailureDescription(TestWKWebView *webView IPhoneUserInterfaceSwizzler userInterfaceSwizzler; auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); - [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:applyAhemStyle(@"
.")]; // . is dummy to force Ahem to load + [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:EditorStateTests::applyAhemStyle(@".")]; // . is dummy to force Ahem to load [webView stringByEvaluatingJavaScript:@"document.body.focus()"]; auto *contentView = [webView textInputContentView]; @@ -454,9 +458,9 @@ static void checkContentViewHasTextWithFailureDescription(TestWKWebView *webView UITextRange *markedTextRange = [contentView markedTextRange]; NSArray