Squeak-dev May 2023

squeak-dev@lists.squeakfoundation.org

16 participants
109 discussions

The Trunk: CollectionsTests-ct.391.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ct.391.mcz ==================== Summary ==================== Name: CollectionsTests-ct.391 Author: ct Time: 20 May 2023, 5:55:49.042861 pm UUID: 631fb9de-4e28-0249-a275-07acdcde0f1a Ancestors: CollectionsTests-ct.390 Complements Collections-ct.1037 (adds <blockquote> tag to HtmlReadWriter). =============== Diff against CollectionsTests-ct.390 =============== Item was added: + ----- Method: HtmlReadWriterTest>>test18Blockquote (in category 'tests') ----- + test18Blockquote + + self testReadAndWrite: { + '<blockquote>When in doubt, try it out!!</blockquote>'. + 'When in doubt, try it out!!' asText addAttribute: (TextIndent tabs: 1). + + 'And they said:<br> + <blockquote>You break it, you fix it.</blockquote><br> + And I broke it, so I fixed it.'. + 'And they said: + You break it, you fix it. + And I broke it, so I fixed it.' asText addAttribute: (TextIndent tabs: 1) from: 16 to: 40. + + '<blockquote><blockquote><blockquote>Nein!!</blockquote><br> + Doch!!</blockquote><br> + Ohh!!</blockquote><br> + lol'. + 'Nein!! + Doch!! + Ohh!! + lol' asText runs: (RunArray runs: #(5 6 5 4) values: {{TextIndent tabs: 1 . TextIndent tabs: 2 . TextIndent tabs: 3} . {TextIndent tabs: 1 . TextIndent tabs: 2} . {TextIndent tabs: 1} . #()}) + "addAttribute: (TextIndent tabs: 3) from: 1 to: 5; + addAttribute: (TextIndent tabs: 2) from: 7 to: 11; + addAttribute: (TextIndent tabs: 1) from: 13 to: 16;" + yourself. + }. + + self testRead: { + '<bLoCkQuOtE>When in doubt, try it out!!</BlOcKqUoTe>'. + 'When in doubt, try it out!!' asText addAttribute: (TextIndent tabs: 1). + }!

1 0

The Trunk: CollectionsTests-ct.357.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ct.357.mcz ==================== Summary ==================== Name: CollectionsTests-ct.357 Author: ct Time: 6 May 2021, 10:10:49.328835 pm UUID: 4127e94a-ff43-c34b-937d-0760d63c4226 Ancestors: CollectionsTests-nice.354 Adds test for Collections-ct.945 (empty end tag </img>). =============== Diff against CollectionsTests-nice.354 =============== Item was added: + ----- Method: HtmlReadWriterTest>>test17EmptyEndImgTag (in category 'tests') ----- + test17EmptyEndImgTag + "Empty end tags are disallowed in XHTML but required in HTML5." + + self convertHtml: 'a<img></img>z'. + self assert: ({$a. Character value: 1. $z} as: String) equals: text string. + self assert: (RunArray new: 3 withAll: #()) equals: text runs!

1 0

The Trunk: CollectionsTests-ct.356.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ct.356.mcz ==================== Summary ==================== Name: CollectionsTests-ct.356 Author: ct Time: 6 May 2021, 7:20:08.135252 pm UUID: 90971275-bb93-b244-b0a2-bf8e0d682308 Ancestors: CollectionsTests-nice.354 Adjusts test for Collections-ct.944 (empty CSS value). =============== Diff against CollectionsTests-nice.354 =============== Item was changed: ----- Method: HtmlReadWriterTest>>test13SpanTag (in category 'tests') ----- test13SpanTag { + '<span style="width: 100px;color:#FFFF00; incorrectly-empty-tag:; font-style: bold; font-size: 10px">Hello, World!!</span>'. - '<span style="width: 100px;color:#FFFF00; font-style: bold; font-size: 10px">Hello, World!!</span>'. 'Hello, World!!' asText addAttribute: (TextColor color: Color yellow); + addAttribute: TextEmphasis bold} pairsDo: [:expectedHtml :expectedText | - addAttribute: (TextEmphasis bold). - } pairsDo: [:expectedHtml :expectedText | - self convertHtml: expectedHtml. self assert: expectedText string equals: text string. self assert: expectedText runs equals: text runs]!

1 0

The Trunk: Collections-ct.946.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ct.946.mcz ==================== Summary ==================== Name: Collections-ct.946 Author: ct Time: 6 May 2021, 10:16:21.568835 pm UUID: bccb3d02-408c-0a49-8276-6900a779892c Ancestors: Collections-mt.943 Makes HtmlReadWriter robust against invalid CSS colors. CSS is too complex to be covered completely in our simple HTML parser. For example, the following failed before: '<span style="color: rgb(0, 0, 0)">hi</span>' asTextFromHtml. =============== Diff against Collections-mt.943 =============== Item was changed: ----- Method: HtmlReadWriter>>mapContainerTag: (in category 'mapping') ----- mapContainerTag: aTag | result styleStart styleEnd styleAttributes | result := OrderedCollection new. + styleStart := (aTag findString: 'style="') + 7. + styleStart <= 7 ifTrue: [^ #()]. - styleStart := (aTag findString: 'style="' ) + 7. - styleStart <= 7 ifTrue: [^#()]. styleEnd := (aTag findString: '"' startingAt: styleStart) - 1. styleAttributes := (aTag copyFrom: styleStart to: styleEnd) subStrings: ';'. + styleAttributes do: [:ea | | keyValue key value | - styleAttributes do: [:ea | |keyValue key value| keyValue := (ea subStrings: ':') collect: [:s | s withBlanksTrimmed]. key := keyValue first asLowercase. value := keyValue second. keyValue size = 2 ifTrue: [ + key = 'color' ifTrue: [ | color | + color := [Color fromString: value] ifError: [nil]. + color ifNotNil: [result add: (TextColor color: color)]]. - key = 'color' ifTrue: [result add: (TextColor color: (Color fromString: value))]. (key beginsWith: 'font') ifTrue: [ + (value includesSubstring: 'bold') ifTrue: [result add: TextEmphasis bold]. + (value includesSubstring: 'italic') ifTrue: [result add: TextEmphasis italic]]]]. - (value includesSubstring: 'bold') - ifTrue: [result add: TextEmphasis bold]. - (value includesSubstring: 'italic') - ifTrue: [result add: TextEmphasis italic]]]]. ^ result!

1 0

The Trunk: Collections-ct.945.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ct.945.mcz ==================== Summary ==================== Name: Collections-ct.945 Author: ct Time: 6 May 2021, 10:08:28.643835 pm UUID: 4a526dd8-6418-c44f-aa41-3de63a54b393 Ancestors: Collections-mt.943 Makes HtmlReadWriter robust against HTML5 void tags. As opposed to XHTML tags, they need to be closed manually. In the past, HTML strings such as the following failed with an "error: this stack is empty": '<img src="code://Form fromDisplay: World bounds"></img>' asTextFromHtml This problem is now solved by ignoring void tags in #processEndTag:. =============== Diff against Collections-mt.943 =============== Item was added: + ----- Method: HtmlReadWriter>>isVoidTag: (in category 'testing') ----- + isVoidTag: aTag + + ^ self voidTags includes: aTag! Item was changed: ----- Method: HtmlReadWriter>>processEndTag: (in category 'reading') ----- processEndTag: aTag | index tagName | index := count - offset. tagName := aTag copyFrom: 3 to: aTag size - 1. + - (self isTagIgnored: tagName) ifTrue: [^ self]. + (self isVoidTag: tagName) ifTrue: [^ self]. tagName = 'code' ifTrue: [self mapCloseCodeTag]. tagName = 'pre' ifTrue: [self breakLines: true]. + - self processRunStackTop. + - runStack pop. + runStack top at: 2 put: index + 1! - runStack top at: 2 put: index + 1.! Item was removed: - ----- Method: HtmlReadWriter>>processEndTagEagerly: (in category 'reading') ----- - processEndTagEagerly: aTag - "Not all tags need an end tag. Simulate that here." - - (aTag beginsWith: '<img') - ifTrue: [^ self processEndTag: '</img>'].! Item was changed: ----- Method: HtmlReadWriter>>processStartTag: (in category 'reading') ----- processStartTag: aTag + | tagName index | + tagName := (aTag copyWithoutAll: '</>') copyUpTo: Character space. + (self isTagIgnored: tagName) ifTrue: [^ self]. + - | index | - (self isTagIgnored: aTag) ifTrue: [^ self]. - index := count - offset. + + tagName = 'br' ifTrue: [ - - aTag = '<br>' ifTrue: [ self addCharacter: Character cr. ^ self]. + + tagName = 'img' ifTrue: [ - - (aTag beginsWith: '<img') ifTrue: [ self addString: Character startOfHeader asString. offset := offset + 1. index := index - 1]. + self processRunStackTop. + "To add all attributes before the next tag adds some." - self processRunStackTop. "To add all attributes before the next tag adds some." - "Copy attr list and add new attr." + runStack push: { + runStack top first copy + addAll: (self mapTagToAttribute: aTag); + yourself. + index + 1. + index + 1}. + + "For void tags such as <img>, we should simulate the closing tag because in case of HTML5 there won't be any." + (self isVoidTag: tagName) ifTrue: [self processEndTag: tagName]! - runStack push: ({runStack top first copy addAll: (self mapTagToAttribute: aTag); yourself. index + 1 . index + 1}). - - "For tags such as <img>, we should simulate the closing tag because there won't be any." - self processEndTagEagerly: aTag.! Item was added: + ----- Method: HtmlReadWriter>>voidTags (in category 'accessing') ----- + voidTags + "Tags that are empty and won't be closed in HTML5." + + ^ #(#img)!

1 0

The Trunk: Collections-ct.944.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ct.944.mcz ==================== Summary ==================== Name: Collections-ct.944 Author: ct Time: 6 May 2021, 7:19:19.626252 pm UUID: ff2ccbdf-62a6-9040-ba1a-5c7ae932a1c9 Ancestors: Collections-mt.943 Fixes a slip in HtmlReadWriter when encountering an empty CSS value. Note that according to W3C, empty CSS values are not permitted, but let's not make our converter fail for such a trivial reason, in particular since I met such a tag in the wild. Also, the check already exists anyway. :-) =============== Diff against Collections-mt.943 =============== Item was changed: ----- Method: HtmlReadWriter>>mapContainerTag: (in category 'mapping') ----- mapContainerTag: aTag | result styleStart styleEnd styleAttributes | result := OrderedCollection new. styleStart := (aTag findString: 'style="' ) + 7. styleStart <= 7 ifTrue: [^#()]. styleEnd := (aTag findString: '"' startingAt: styleStart) - 1. styleAttributes := (aTag copyFrom: styleStart to: styleEnd) subStrings: ';'. styleAttributes do: [:ea | |keyValue key value| keyValue := (ea subStrings: ':') collect: [:s | s withBlanksTrimmed]. key := keyValue first asLowercase. - value := keyValue second. keyValue size = 2 ifTrue: [ + value := keyValue second. key = 'color' ifTrue: [result add: (TextColor color: (Color fromString: value))]. (key beginsWith: 'font') ifTrue: [ (value includesSubstring: 'bold') ifTrue: [result add: TextEmphasis bold]. (value includesSubstring: 'italic') ifTrue: [result add: TextEmphasis italic]]]]. ^ result!

1 0

The Trunk: CollectionsTests-ct.390.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ct.390.mcz ==================== Summary ==================== Name: CollectionsTests-ct.390 Author: ct Time: 20 May 2023, 5:43:42.758462 pm UUID: 19992341-2597-2d40-9a1d-d9d5b54680d5 Ancestors: CollectionsTests-ct.389, CollectionsTests-ct.356, CollectionsTests-ct.357 Complements Collections-ct.1036 (miscellaneous parsing improvements to HtmlReadWriter). Deduplicates and extends tests. =============== Diff against CollectionsTests-ct.389 =============== Item was changed: ----- Method: HtmlReadWriterTest>>setUp (in category 'running') ----- setUp super setUp. + self setUpReadWriter. - readWriter := HtmlReadWriter new. html := ''. text := '' asText.! Item was added: + ----- Method: HtmlReadWriterTest>>setUpReadWriter (in category 'running') ----- + setUpReadWriter + + ^ readWriter := HtmlReadWriter new! Item was changed: ----- Method: HtmlReadWriterTest>>test01Emphasis (in category 'tests') ----- test01Emphasis + self testReadAndWrite: { - { '<b>Hello, World!!</b>'. 'Hello, World!!' asText addAttribute: TextEmphasis bold. '<b>Hello</b>, World!!'. 'Hello, World!!' asText addAttribute: TextEmphasis bold from: 1 to: 5. + }. + + self testRead: { + '<B>Hello</b>, World!!'. + 'Hello, World!!' asText addAttribute: TextEmphasis bold from: 1 to: 5. - } pairsDo: [:expectedHtml :expectedText | + '<b>Hello</B>, World!!'. + 'Hello, World!!' asText addAttribute: TextEmphasis bold from: 1 to: 5. + }.! - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test02Mixed (in category 'tests') ----- test02Mixed - "At the moment, the html code generation is kind of verbose..." + self testReadAndWrite: { - { '<b>Hello, </b><b><i>World!!</i></b>!!'. 'Hello, World!!!!' asText addAttribute: TextEmphasis bold from: 1 to: 13; addAttribute: TextEmphasis italic from: 8 to: 13. + }.! - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test03FontTag (in category 'tests') ----- test03FontTag + self testReadAndWrite: { - { '<font color="#FFFF00">Hello, World!!</font>'. 'Hello, World!!' asText addAttribute: (TextColor color: Color yellow). '<font face="Accula" size="10.5">Hello, World!!</font>'. 'Hello, World!!' asText addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Accula' pointSize: 10.5)). "Note that we cannot directly use both face/size and color in the same font tag because of how #openHtmlOn: works in fonts. Works in general, but just not in this test setup." '<font face="Accula" size="10.5"><font color="#FFFF00">Hello, World!!</font></font>'. 'Hello, World!!' asText addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Accula' pointSize: 10.5)); addAttribute: (TextColor color: Color yellow). + }. + + self testRead: { + '<font + color = "reD" >Hello, World!!</font>'. + 'Hello, World!!' asText + addAttribute: (TextColor color: Color red). + '<font color="reD">Hello, World!!</font>'. + 'Hello, World!!' asText + addAttribute: (TextColor color: Color red). - } pairsDo: [:expectedHtml :expectedText | + '<Font face=Accula size="10.5" color="#FFFF00">Hello, World!!</font>'. + 'Hello, World!!' asText + addAttribute: (TextColor color: Color yellow); + addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Accula' pointSize: 10.5)). - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. + '<font color="rgb(var(--r),1000,0)">Hello, World!!</span>'. + 'Hello, World!!' asText. + }! - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test04LineBreaks (in category 'tests') ----- test04LineBreaks { 'Hello, World!!<br> '. 'Hello, World!! ' asText. 'Hello, <b>World!!<br> </b>'. 'Hello, World!! ' asText addAttribute: TextEmphasis bold from: 8 to: 14. - } pairsDo: [:expectedHtml :expectedText | + 'Hello, <b>World<br> + !!</b>'. + 'Hello, World + !!' asText + addAttribute: TextEmphasis bold from: 8 to: 14. + } pairsDo: [:givenHtml :givenText | - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. + self testRead: givenHtml as: givenText. + self testWrite: givenText as: givenHtml. - self convertText: expectedText. - self assert: expectedHtml equals: html. self convertHtml: html. self convertText: text. + self assert: givenHtml equals: html]. + + self testRead: { + 'Hello<BR>World'. + 'Hello + World' asText + }.! - self assert: expectedHtml equals: html. - - - ].! Item was changed: ----- Method: HtmlReadWriterTest>>test05Escaping (in category 'tests') ----- test05Escaping + self testReadAndWrite: { - { '<b>Morph>>#drawOn:</b>'. 'Morph>>#drawOn:' asText addAttribute: TextEmphasis bold. + }.! - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test08MultilineCode (in category 'tests') ----- test08MultilineCode + self testReadAndWrite: { '<code> - { '<code> <pre>3 + 7. 3 > 4.</pre></code>' . Text string: '3 + 7. 3 > 4.' runs: (RunArray runs: #(13) values: { {TextDoIt evalString: '3 + 7. + 3 > 4. + ' } } ) + }.! - 3 > 4.' } } ) - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test09StruckOut (in category 'tests') ----- test09StruckOut + self testReadAndWrite: { - { '<s>Hello, World!!</s>'. 'Hello, World!!' asText addAttribute: TextEmphasis struckOut. '<s>Hello</s>, World!!'. 'Hello, World!!' asText addAttribute: TextEmphasis struckOut from: 1 to: 5. + }.! - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test10Underline (in category 'tests') ----- test10Underline + self testReadAndWrite: { - { '<u>Hello, World!!</u>'. 'Hello, World!!' asText addAttribute: TextEmphasis underlined. '<u>Hello</u>, World!!'. 'Hello, World!!' asText addAttribute: TextEmphasis underlined from: 1 to: 5. + }.! - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test11Alignment (in category 'tests') ----- test11Alignment + self testReadAndWrite: { - { " '<center>Hello, World!!</center>'. 'Hello, World!!' asText addAttribute: TextAlignment centered. " '<div align=left>Hello, World!!</div>'. 'Hello, World!!' asText addAttribute: TextAlignment leftFlush. '<div align=right>Hello, World!!</div>'. 'Hello, World!!' asText addAttribute: TextAlignment rightFlush. '<div align=justify>Hello, World!!</div>'. 'Hello, World!!' asText addAttribute: TextAlignment justified. + }. + + self testRead: { + '<DIV ALIGN=RIGHT>Hello, World!!</DIV>'. + 'Hello, World!!' asText addAttribute: TextAlignment rightFlush. - } pairsDo: [:expectedHtml :expectedText | + '<div align="right">Hello, World!!</div>'. + 'Hello, World!!' asText addAttribute: TextAlignment rightFlush. + + '<div align = "justify">Hello, World!!</div>'. + 'Hello, World!!' asText addAttribute: TextAlignment justified. - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. + '<div align="center">Hello, World!!</div>'. + 'Hello, World!!' asText addAttribute: TextAlignment centered. + }.! - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test12AlignmentMixed (in category 'tests') ----- test12AlignmentMixed + self testReadAndWrite: { - { '<center>Hello, <i>World!!</i></center>'. 'Hello, World!!' asText addAttribute: TextAlignment centered; addAttribute: TextEmphasis italic from: 8 to: 13. + }.! - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs. - - self convertText: expectedText. - self assert: expectedHtml equals: html].! Item was changed: ----- Method: HtmlReadWriterTest>>test13SpanTag (in category 'tests') ----- test13SpanTag + self testRead: { + '<span style="width: 100px;color:#FFFF00; font-style : bold; font-size: 10px">Hello, World!!</span>'. - { - '<span style="width: 100px;color:#FFFF00; font-style: bold; font-size: 10px">Hello, World!!</span>'. 'Hello, World!!' asText addAttribute: (TextColor color: Color yellow); + addAttribute: TextEmphasis bold. - addAttribute: (TextEmphasis bold). - } pairsDo: [:expectedHtml :expectedText | + '<span style="width: 100px; incorrectly-empty-tag:; font-style: bold">Hello, World!!</span>'. + 'Hello, World!!' asText + addAttribute: TextEmphasis bold. + + '<span style="width: 100px; color:rgb(var(--r),1000,0); font-style: bold">Hello, World!!</span>'. + 'Hello, World!!' asText + addAttribute: TextEmphasis bold. + + '<span style="Color:Red">Hello, World!!</span>'. + 'Hello, World!!' asText + addAttribute: (TextColor color: Color red). + + '<span style="">Hello, World!!</span>'. + 'Hello, World!!' asText. + + '<span style=>Hello, World!!</span>'. + 'Hello, World!!' asText. + + '<span style>Hello, World!!</span>'. + 'Hello, World!!' asText. + + '<SPAN STYLE = "font-style: bold">Hello, World!!</SPAN>'. + 'Hello, World!!' asText + addAttribute: TextEmphasis bold. + }! - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs]! Item was changed: ----- Method: HtmlReadWriterTest>>test14NumericalHtmlEntities (in category 'tests') ----- test14NumericalHtmlEntities + self testRead: { - { '.!'. '.!!' asText. + }.! - } pairsDo: [:expectedHtml :expectedText | - - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string]! Item was changed: ----- Method: HtmlReadWriterTest>>test15NestedTagsStillEndBefore (in category 'tests') ----- test15NestedTagsStillEndBefore + self testRead: { - { '<span><i>Hallo</i> welt</span>'. 'Hallo welt' asText addAttribute: TextEmphasis italic from: 1 to: 5. + }.! - } pairsDo: [:expectedHtml :expectedText | - self convertHtml: expectedHtml. - self assert: expectedText string equals: text string. - self assert: expectedText runs equals: text runs]! Item was changed: ----- Method: HtmlReadWriterTest>>test16ImgTag (in category 'tests') ----- test16ImgTag <timeout: 10> | imgUrl imgExpression formFromUrl formFromExpression | imgUrl := 'https://squeak.org/img/downloads/image.png'. imgExpression := 'Form dotOfSize: 12@12 color: Color green'. self ensureSecureInternetConnection. formFromUrl := (Smalltalk classNamed: 'WebClient') ifNotNil: [:client | Form fromBinaryStream: (client httpGet: imgUrl) content asByteArray readStream]. formFromExpression := Compiler evaluate: imgExpression. RealEstateAgent scaleFactor = 1.0 ifFalse: [ formFromUrl := formFromUrl scaledToSize: (formFromUrl extent * RealEstateAgent scaleFactor). formFromExpression := formFromExpression scaledToSize: (formFromExpression extent * RealEstateAgent scaleFactor)]. + ({ + []. imgUrl. formFromUrl. + []. 'fantasy:wonderland/alice'. readWriter imagePlaceholder. + + []. 'code://' , imgExpression. formFromExpression. + []. 'code://Object'. readWriter imagePlaceholder. + []. 'code://' , imgExpression , ';'. readWriter imagePlaceholder. + } groupsCollect: [:prepareBlock :src :expectedForm | { + 'Hello <img src="{1}"> World' format: { src }. - { - 'Hello <img src="{1}"> World' format: { imgUrl }. ('Hello {1} World' format: { Character startOfHeader }) asText + addAttribute: expectedForm asTextAnchor from: 7 to: 7; - addAttribute: formFromUrl asTextAnchor from: 7 to: 7; addAttribute: (TextColor color: Color transparent) from: 7 to: 7. + prepareBlock}]) + + , ({ + 'Hello <img src="code://{1}"></img> World' format: { imgExpression }. - - 'Hello <img src="code://{1}"> World' format: { imgExpression }. ('Hello {1} World' format: { Character startOfHeader }) asText addAttribute: formFromExpression asTextAnchor from: 7 to: 7; addAttribute: (TextColor color: Color transparent) from: 7 to: 7. + 'Hello <img src="code://{1}"/> World' format: { imgExpression }. + ('Hello {1} World' format: { Character startOfHeader }) asText + addAttribute: formFromExpression asTextAnchor from: 7 to: 7; + addAttribute: (TextColor color: Color transparent) from: 7 to: 7. - } pairsDo: [:expectedHtml :expectedText | + 'Hello <IMG SRC = "code://{1}"> World' format: { imgExpression }. + ('Hello {1} World' format: { Character startOfHeader }) asText + addAttribute: formFromExpression asTextAnchor from: 7 to: 7; + addAttribute: (TextColor color: Color transparent) from: 7 to: 7. + + } pairsCollect: [:html :expectedText | {html. expectedText}]) + collect: [:spec | + | html expectedText prepareBlock | + html := spec first. + expectedText := spec second. + prepareBlock := spec at: 3 ifAbsent: []. + + self setUpReadWriter. + prepareBlock value. + self convertHtml: html. - self convertHtml: expectedHtml. self assert: expectedText string equals: text string. expectedText runs with: text runs do: [:expectedAttributes :actualAttributes | expectedAttributes with: actualAttributes do: [:expectedAttribute :actualAttribute | self assert: (expectedAttribute = actualAttribute or: [ ((expectedAttribute respondsTo: #anchoredMorph) and: [actualAttribute respondsTo: #anchoredMorph]) and: [(expectedAttribute anchoredMorph "aForm" unhibernate; bits) = (actualAttribute anchoredMorph "aForm" unhibernate; bits)] ]) ]]].! Item was added: + ----- Method: HtmlReadWriterTest>>test19ExcludedTags (in category 'tests') ----- + test19ExcludedTags + + { + 'A<b>B<script>C<i>D</i>E</script>F</b>G'. + 'A<b>BF</b>G' asTextFromHtml. + + 'A<script>B<style>C</style>D</script>E'. + 'AE' asText. + } pairsDo: [:expectedHtml :expectedText | + + self convertHtml: expectedHtml. + self assert: expectedText string equals: text string. + self assert: expectedText runs equals: text runs]! Item was added: + ----- Method: HtmlReadWriterTest>>test20Link (in category 'tests') ----- + test20Link + + self testReadAndWrite: { + '<a href="https://squeak.org">hErE</a>'. + 'hErE' asText addAttribute: (TextURL url: 'https://squeak.org'). + + '<a href="code://World explore">hErE</a>'. + 'hErE' asText addAttribute: (TextURL url: 'code://World explore'). + }. + + self testRead: { + '<a href = + "https://squeak.org">hErE</a>'. + 'hErE' asText addAttribute: (TextURL url: 'https://squeak.org'). + + '<a href=https://squeak.org>hErE</a>'. + 'hErE' asText addAttribute: (TextURL url: 'https://squeak.org'). + + '<a href="https://www.google.com/search?q="modern, open-source Smalltalk"">hErE</a>'. + 'hErE' asText addAttribute: (TextURL url: 'https://www.google.com/search?q="modern, open-source Smalltalk"'). + + '<alt href="https://squeak.org">hi</alt>'. "also begins with <a" + 'hi' asText. + }.! Item was added: + ----- Method: HtmlReadWriterTest>>test21BreakLines (in category 'tests') ----- + test21BreakLines + + { + ' a b '. + 'a b' asText. + ' a b ' asText. + + ' a + + <b> b </b> + '. + 'a b' asText addAttribute: TextEmphasis bold from: 3 to: 3. + ' a + + b + ' asText addAttribute: TextEmphasis bold from: 6 to: 8. + + "breakLines is preserved after <pre> tag" + ' a <pre> b + </pre> c '. + 'a + b + + c' asText. + ' a + b + + c ' asText. + + "linebreaks in tags are NOT ignored" + 'a<s + pan>b</span>c'. + 'abc' asText addAttribute: TextEmphasis struckOut from: 2 to: 2. + 'abc' asText addAttribute: TextEmphasis struckOut from: 2 to: 2. + } groupsDo: [:givenHtml :expectedBreakLines :expectedNoBreakLines | + + self setUpReadWriter breakLines: true. + self testRead: givenHtml as: expectedBreakLines. + self setUpReadWriter breakLines: false. + self testRead: givenHtml as: expectedNoBreakLines].! Item was added: + ----- Method: HtmlReadWriterTest>>test22LinebreakAcceptance (in category 'tests') ----- + test22LinebreakAcceptance + + self testRead: { + '<div>Hi all!!<div></div><div><br></div><div><span>Squeak.</span></div><div><span>Is.</span><br></div><div><span><b>Great.</b></span></div></div>'. + 'Hi all!! + + Squeak. + Is. + Great.' asText addAttribute: TextEmphasis bold from: 22 to: 27. + + '<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + </head> + <body> + <div class="WordSection1"> + <p>Hi all,</p> + <p><o:p> </o:p></p> + <p>You are <i>so</i> right!!</p> + </div> + </body>'. + 'Hi all, + + You are so right!!' asText addAttribute: TextEmphasis italic from: 19 to: 20. + + '<div> + <p>I agree!!</p> + <p><br> + </p> + <p>Best,</p> + <p>Everyone</p> + </div> + <hr> + <div>signature</div>'. + 'I agree!! + + Best, + Everyone + + signature' asText + }.! Item was added: + ----- Method: HtmlReadWriterTest>>testRead: (in category 'running') ----- + testRead: pairs + + pairs pairsDo: [:givenHtml :expectedText | + self testRead: givenHtml as: expectedText].! Item was added: + ----- Method: HtmlReadWriterTest>>testRead:as: (in category 'running') ----- + testRead: givenHtml as: expectedText + + self convertHtml: givenHtml. + self assert: expectedText string equals: text string. + self assert: expectedText runs equals: text runs.! Item was added: + ----- Method: HtmlReadWriterTest>>testReadAndWrite: (in category 'running') ----- + testReadAndWrite: pairs + + pairs pairsDo: [:givenHtml :givenText | + self testRead: givenHtml as: givenText. + self testWrite: givenText as: givenHtml].! Item was added: + ----- Method: HtmlReadWriterTest>>testWrite:as: (in category 'running') ----- + testWrite: givenText as: expectedHtml + + self convertText: givenText. + self assert: expectedHtml equals: html.!

1 0

The Trunk: CollectionsTests-ct.389.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ct.389.mcz ==================== Summary ==================== Name: CollectionsTests-ct.389 Author: ct Time: 20 May 2023, 5:17:15.932462 pm UUID: def11a9e-a326-6c4e-b43d-a1141be4a6fc Ancestors: CollectionsTests-ct.388 Complements Collections-ct.1035 (adds SequenceableCollection>>groupsCollect:). =============== Diff against CollectionsTests-ct.388 =============== Item was added: + ----- Method: SequenceableCollectionTest>>testGroupsCollect (in category 'tests - copying') ----- + testGroupsCollect + + | array | + array := (1 to: 12) asArray. + self shouldRaiseError: [array groupsCollect: []]. + self assert: array * 2 equals: + (array groupsCollect: [:each | each * 2]). + self assert: #((1 2) (3 4) (5 6) (7 8) (9 10) (11 12)) equals: + (array groupsCollect: [:a :b | { a. b }]). + self assert: #((1 2 3) (4 5 6) (7 8 9) (10 11 12)) equals: + (array groupsCollect: [:a :b :c | { a. b. c }]). + self assert: #() equals: + (#(1 2 3) groupsCollect: [:a :b :c :d | { a. b. c. d } ]).!

1 0

The Trunk: Collections-ct.1035.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ct.1035.mcz ==================== Summary ==================== Name: Collections-ct.1035 Author: ct Time: 20 May 2023, 5:16:35.545462 pm UUID: c36b5e22-b60e-7148-ba41-35c553fb023a Ancestors: Collections-ct.1034 Adds SequenceableCollection>>groupsCollect: (analogously to #groupsDo: and #pairsCollect:). Especially useful for tests. =============== Diff against Collections-ct.1034 =============== Item was added: + ----- Method: SequenceableCollection>>groupsCollect: (in category 'enumerating') ----- + groupsCollect: aBlock + "Evaluate aBlock with my elements taken n at a time, where n is the number of arguments of aBlock, and asnwer an Array with the results. Ignore any leftovers at the end." + + | index argumentArray results numArgs endIndex | + numArgs := aBlock numArgs. + numArgs + caseOf: { + [ 0 ] -> [ ^self error: 'At least one block argument expected.' ]. + [ 1 ] -> [ ^self collect: aBlock ]. + [ 2 ] -> [ ^self pairsCollect: aBlock ] } + otherwise: []. + argumentArray := Array new: numArgs. + results := (Array new: self size // numArgs) writeStream. + index := 1. + endIndex := self size - numArgs + 1. + [ index <= endIndex ] whileTrue: [ + argumentArray + replaceFrom: 1 + to: numArgs + with: self + startingAt: index. + results nextPut: (aBlock valueWithArguments: argumentArray). + index := index + numArgs ]. + ^ results contents!

1 0

The Trunk: CollectionsTests-ct.388.mcz
by commits＠source.squeak.org 20 May '23

20 May '23

Christoph Thiede uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ct.388.mcz ==================== Summary ==================== Name: CollectionsTests-ct.388 Author: ct Time: 20 May 2023, 1:34:12.322278 pm UUID: 39970f78-2332-344d-91eb-3e592cf07dfb Ancestors: CollectionsTests-ct.387 Complements Collections-ct.1034 (String>>#beginsWith:caseSensitive: and #endsWith:caseSensitive:). =============== Diff against CollectionsTests-ct.387 =============== Item was added: + ----- Method: StringTest>>testBeginsWithCaseSensitive (in category 'tests - finding') ----- + testBeginsWithCaseSensitive + + self assert: ('Elvis' beginsWith: 'Elv' caseSensitive: true). + self deny: ('Elvis' beginsWith: 'elv' caseSensitive: true). + + self assert: ('Elvis' beginsWith: 'Elvis' caseSensitive: false). + self assert: ('Elvis' beginsWith: 'elvis' caseSensitive: false). + self assert: ('Elvis' beginsWith: 'E' caseSensitive: false). + self assert: ('Elvis' beginsWith: 'e' caseSensitive: false). + self deny: ('Elvis' beginsWith: 'Elvis ' caseSensitive: false). + self assert: ('' beginsWith: '' caseSensitive: false). + self assert: ('abc' beginsWith: '' caseSensitive: false)! Item was added: + ----- Method: StringTest>>testEndsWithCaseSensitive (in category 'tests - finding') ----- + testEndsWithCaseSensitive + + self assert: ('Elvis' endsWith: 'vis' caseSensitive: true). + self deny: ('Elvis' endsWith: 'viS' caseSensitive: true). + + self assert: ('Elvis' endsWith: 'vis' caseSensitive: false). + self assert: ('Elvis' endsWith: 'viS' caseSensitive: false). + self assert: ('Elvis' endsWith: 'Elvis' caseSensitive: false). + self assert: ('Elvis' endsWith: 's' caseSensitive: false). + self assert: ('Elvis' endsWith: 'S' caseSensitive: false). + self deny: ('Elvis' endsWith: ' Elvis' caseSensitive: false). + self assert: ('' endsWith: '' caseSensitive: false). + self assert: ('abc' endsWith: '' caseSensitive: false)!

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →