diff --git a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading1Structure.st b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading1Structure.st index 54c71be..91abdf1 100644 --- a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading1Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading1Structure.st @@ -3,4 +3,5 @@ initialHeading1Structure ^ RichTextStructure new: #heading1 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 20). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 20). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading2Structure.st b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading2Structure.st index 9d18292..6e9ab13 100644 --- a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading2Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading2Structure.st @@ -3,4 +3,5 @@ initialHeading2Structure ^ RichTextStructure new: #heading2 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 17). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 17). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading3Structure.st b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading3Structure.st index 8f55acb..6b05c78 100644 --- a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading3Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialHeading3Structure.st @@ -3,4 +3,5 @@ initialHeading3Structure ^ RichTextStructure new: #heading3 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 14). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 14). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialURLStructure.st b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialURLStructure.st index 04d0e71..1da80e9 100644 --- a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialURLStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/class/initialURLStructure.st @@ -3,4 +3,6 @@ initialURLStructure ^ RichTextStructure new: #url - from: {RichTextStructure autohyperlink. RichTextStructure underlined. RichTextStructure notExtendable} \ No newline at end of file + from: {RichTextStructure autohyperlink. + RichTextStructure underlined. + RichTextStructure notExtendable} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/methodProperties.json index e46fd66..1c934bf 100644 --- a/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDefaultTemplate.class/methodProperties.json @@ -4,13 +4,13 @@ "identifier" : "JEH 7/4/2020 11:17", "initialBoldStructure" : "tok 8/7/2020 15:50", "initialFootnoteStructure" : "tok 8/7/2020 15:50", - "initialHeading1Structure" : "tok 8/7/2020 15:50", - "initialHeading2Structure" : "tok 8/7/2020 15:50", - "initialHeading3Structure" : "tok 8/7/2020 15:50", + "initialHeading1Structure" : "tok 8/7/2020 20:57", + "initialHeading2Structure" : "tok 8/7/2020 20:57", + "initialHeading3Structure" : "tok 8/7/2020 20:57", "initialItalicStructure" : "tok 8/7/2020 15:51", "initialListStructure" : "tok 8/7/2020 15:51", "initialTextStructures" : "JEH 7/4/2020 11:16", - "initialURLStructure" : "tok 8/7/2020 15:51", + "initialURLStructure" : "tok 8/7/2020 20:57", "initialUnderlinedStructure" : "tok 8/7/2020 15:51", "textStructures" : "frc 7/15/2020 18:31" }, "instance" : { diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/hasStructure.for.from.to..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/hasStructure.for.from.to..st new file mode 100644 index 0000000..b202d3c --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/hasStructure.for.from.to..st @@ -0,0 +1,10 @@ +utilities +hasStructure: aSymbol for: aText from: start to: end + + aText isEmpty + ifTrue: [^ false]. + + ^ (aText runs copyFrom: start to: end) allSatisfy: [:attributes | + attributes anySatisfy: [:attribute | + attribute isTextStructure ifTrue: [ + attribute structureIdentifier = aSymbol] ifFalse: [false]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/hasStructure.forText.from.to..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/hasStructure.forText.from.to..st deleted file mode 100644 index ae32573..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/hasStructure.forText.from.to..st +++ /dev/null @@ -1,10 +0,0 @@ -utilities -hasStructure: aSymbol forText: aText from: start to: end - - aText isEmpty - ifTrue: [^ false]. - - ^ (aText runs copyFrom: start to: end) allSatisfy: - [:attributes | attributes anySatisfy: - [:attribute | attribute isTextStructure ifTrue: [ - attribute structureIdentifier = aSymbol] ifFalse: [false]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/hash.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/hash.st index 009faef..49abd13 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/hash.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/hash.st @@ -1,4 +1,7 @@ comparing hash - ^ (((self textStructures hash) bitXor: (self text hash)) bitXor: (self name hash)) bitXor: (self timeLastSaved hash) \ No newline at end of file + ^ (((self textStructures hash) + bitXor: (self text hash)) + bitXor: (self name hash)) + bitXor: (self timeLastSaved hash) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textRuns..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textRuns..st index 5a34df8..543869c 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textRuns..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textRuns..st @@ -1,4 +1,4 @@ accessing -textRuns: anArray +textRuns: aRunArray - self text runs: anArray \ No newline at end of file + self text runs: aRunArray \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureSymbols.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureSymbols.st index 11183ea..5b41bb0 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureSymbols.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureSymbols.st @@ -1,5 +1,4 @@ text structures textStructureSymbols - ^ self textStructures collect: [:each | - each structureIdentifier] \ No newline at end of file + ^ self textStructures collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/wordcount.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/wordcount.st index 4c736ef..8f54a15 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/wordcount.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/wordcount.st @@ -1,8 +1,10 @@ count wordcount - | prev bool byteString| + | prev bool byteString | byteString := self asByteArray. prev := self emptyChars first. - ^ (byteString count: [:each | bool := ((self emptyChars includes: each) not and: [ - self emptyChars includes: prev]). prev := each. bool ]) + ^ (byteString count: [:each | + bool := ((self emptyChars includes: each) not and: [ + self emptyChars includes: prev]). + prev := each. bool]) diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index 9ff4e21..80b328d 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -3,7 +3,7 @@ "commonStructures" : "kh 6/21/2020 17:03", "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", - "hasStructure:forText:from:to:" : "frc 8/7/2020 11:27", + "hasStructure:for:from:to:" : "tok 8/7/2020 20:50", "initialTextStructures" : "JEH 7/4/2020 11:19" }, "instance" : { "=" : "frc 8/6/2020 20:01", @@ -16,7 +16,7 @@ "createNewStructure:" : "ls 7/24/2019 15:24", "dateLastSaved" : "tok 7/20/2020 14:10", "emptyChars" : "frc 6/1/2020 13:43", - "hash" : "frc 8/7/2020 11:37", + "hash" : "tok 8/7/2020 20:29", "initialize" : "ls 7/24/2019 15:10", "initializeStructure:" : "tok 8/7/2020 15:51", "initializeStructures" : "ls 7/24/2019 15:12", @@ -35,13 +35,13 @@ "text:" : "MB 7/3/2019 19:29", "textChanged" : "ls 7/24/2019 14:41", "textRuns" : "lh 7/24/2019 17:14", - "textRuns:" : "frc 7/15/2020 17:53", + "textRuns:" : "tok 8/7/2020 20:30", "textStructureAt:" : "tok 8/7/2020 15:53", - "textStructureSymbols" : "ls 7/24/2019 14:25", + "textStructureSymbols" : "tok 8/7/2020 20:30", "textStructures" : "ls 6/26/2019 17:28", "textStructures:" : "MB 7/3/2019 19:29", "textStructuresDo:" : "ls 7/24/2019 21:29", "timeLastSaved" : "frc 8/6/2020 20:07", "timestampLastSaved" : "tok 7/20/2020 14:10", "timestampLastSaved:" : "tok 7/20/2020 14:10", - "wordcount" : "frc 8/7/2020 12:04" } } + "wordcount" : "tok 8/7/2020 20:31" } } diff --git a/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/instance/beginOfStructure.st b/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/instance/beginOfStructure.st index 162cbc0..51ecd47 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/instance/beginOfStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/instance/beginOfStructure.st @@ -1,7 +1,7 @@ stop conditions beginOfStructure - | diff | + | diff | self position + 1 > self readLimit ifTrue: [^ nil]. diff := self structureDifferenceBetween: self position + 1 and: self position. ^ diff isEmpty diff --git a/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/methodProperties.json index 9e5bccf..753c565 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocumentReadStream.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "on:" : "kh 7/3/2020 19:29" }, "instance" : { - "beginOfStructure" : "OS 8/7/2020 09:58", + "beginOfStructure" : "tok 8/7/2020 20:32", "currentCharacter" : "JEH 7/25/2020 12:51", "endOfDocument" : "JEH 7/26/2020 17:14", "endOfStructure" : "frc 8/1/2020 13:17", diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/class/initializeShiftCmdKeyShortcuts.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/class/initializeShiftCmdKeyShortcuts.st index 562f86e..205d9c3 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/class/initializeShiftCmdKeyShortcuts.st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/class/initializeShiftCmdKeyShortcuts.st @@ -2,7 +2,7 @@ instance creation initializeShiftCmdKeyShortcuts super initializeShiftCmdKeyShortcuts. - self structureKeymap do: - [:char | shiftCmdActions at: char asciiValue + 1 put: #toggleStructureSelectionAt: ] + self structureKeymap do: [:char | + shiftCmdActions at: char asciiValue + 1 put: #toggleStructureSelectionAt:] diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/URLRegex.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/URLRegex.st index 8e2ee82..21f57e6 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/URLRegex.st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/URLRegex.st @@ -1,4 +1,5 @@ constants URLRegex - ^ RxMatcher forString: '^https?\:\/\/([0-9a-zA-Z\-]+\.)*[0-9a-zA-Z]+(\/[0-9a-zA-Z\-\.\?\&\=\%]+)*$' \ No newline at end of file + ^ RxMatcher forString: + '^https?\:\/\/([0-9a-zA-Z\-]+\.)*[0-9a-zA-Z]+(\/[0-9a-zA-Z\-\.\?\&\=\%]+)*$' \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isStructureShortcut..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isStructureShortcut..st index 81f2059..76241f6 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isStructureShortcut..st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isStructureShortcut..st @@ -1,6 +1,6 @@ input events isStructureShortcut: aKeyboardEvent - ^aKeyboardEvent controlKeyPressed and: [ - aKeyboardEvent shiftPressed] and: [ - self class structureKeymap includes: aKeyboardEvent keyCharacter] \ No newline at end of file + ^ aKeyboardEvent controlKeyPressed and: [ + aKeyboardEvent shiftPressed] and: [ + self class structureKeymap includes: aKeyboardEvent keyCharacter] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/keyStroke..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/keyStroke..st index 7e7d061..23b65ea 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/keyStroke..st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/keyStroke..st @@ -3,11 +3,9 @@ keyStroke: aKeyboardEvent | returnValue | returnValue := super keyStroke: aKeyboardEvent. - (self isNewCharacter: aKeyboardEvent) - ifTrue: [self model applyCurrentStructures]. - (self class isCtrlA: aKeyboardEvent) - ifTrue: [self selectAll]. - (self isStructureShortcut: aKeyboardEvent) ifFalse: - [self model precedingStructuresChanged]. + (self isNewCharacter: aKeyboardEvent) ifTrue: [self model applyCurrentStructures]. + (self class isCtrlA: aKeyboardEvent) ifTrue: [self selectAll]. + (self isStructureShortcut: aKeyboardEvent) + ifFalse: [self model precedingStructuresChanged]. self model updateFooter. ^ returnValue \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json index ce9f348..673ec67 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "initialize" : "AG 7/25/2019 13:10", "initializeCmdKeyShortcuts" : "OS 5/6/2020 20:40", - "initializeShiftCmdKeyShortcuts" : "tok 8/7/2020 11:14", + "initializeShiftCmdKeyShortcuts" : "tok 8/7/2020 20:51", "initializeShiftedYellowButtonMenu" : "AG 5/29/2019 18:39", "initializeYellowButtonMenu" : "AG 5/29/2019 18:39", "isCtrlA:" : "frc 8/7/2020 11:26", @@ -11,15 +11,15 @@ "structureKeymap" : "tok 8/7/2020 11:13", "structureKeymap:" : "frc 8/6/2020 19:39" }, "instance" : { - "URLRegex" : "kh 6/15/2020 10:42", + "URLRegex" : "tok 8/7/2020 20:32", "clipboardContainsURL" : "kh 6/15/2020 13:32", "crWithIndent:" : "OS 8/7/2020 09:49", "initialize" : "JEH 8/3/2020 15:01", "isNewCharacter:" : "tok 6/13/2020 12:03", "isSpecialCharacter:" : "OS 6/12/2020 12:03", - "isStructureShortcut:" : "tok 8/7/2020 11:14", + "isStructureShortcut:" : "tok 8/7/2020 20:33", "isValidCharacter:" : "tok 6/13/2020 12:04", - "keyStroke:" : "frc 8/7/2020 11:26", + "keyStroke:" : "tok 8/7/2020 20:33", "mouseDown:" : "OS 8/6/2020 16:26", "openStructureTypeIn" : "tok 8/3/2020 14:33", "paste" : "kh 6/15/2020 13:32", diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/yellowButtonMenuItems.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/yellowButtonMenuItems.st index 74031b8..4124b51 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/yellowButtonMenuItems.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/yellowButtonMenuItems.st @@ -17,6 +17,6 @@ yellowButtonMenuItems {'paste...' translated. #pasteRecent}. #-. {'save (s)' translated. #saveText}. - {'save as' translated. #saveDocumentInSaverWithNamePrompt}. + {'save as' translated. #saveDocumentWithNamePrompt}. {'cancel (l)' translated. #cancel}. } \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/bufferDocument..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/bufferDocument..st index a987c1c..8442770 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/bufferDocument..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/bufferDocument..st @@ -2,5 +2,6 @@ accessing bufferDocument: aRichTextDocument bufferDocument := aRichTextDocument. - self textChanged; + self + textChanged; noUnacceptedEdits \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/documentTimeText.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/documentTimeText.st index 77efc0d..67dba9f 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/documentTimeText.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/documentTimeText.st @@ -3,4 +3,5 @@ documentTimeText self bufferDocument isUnsavedDocument ifTrue: [^ 'unsaved document'] - ifFalse: [^ 'last saved ', (self bufferDocument dateLastSaved), ' ', (self bufferDocument timeLastSaved)] \ No newline at end of file + ifFalse: [^ 'last saved ', (self bufferDocument dateLastSaved), ' ', + (self bufferDocument timeLastSaved)] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/hasStructure.between.to..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/hasStructure.between.to..st index 089e501..e04e741 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/hasStructure.between.to..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/hasStructure.between.to..st @@ -5,6 +5,6 @@ hasStructure: aSymbol between: start to: end ^ self bufferDocument class hasStructure: aSymbol - forText: self text + for: self text from: start to: end \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/importFileFrom..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/importFileFrom..st index 7e3c809..77b2ab6 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/importFileFrom..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/importFileFrom..st @@ -4,7 +4,8 @@ importFileFrom: aFilePath | fileStream text document | fileStream := StandardFileStream readOnlyFileNamed: aFilePath. text := Text fromString: fileStream contents. - document := self documentClass fromText: text withStructures: (self documentClass initialTextStructures). + document := self documentClass fromText: text + withStructures: (self documentClass initialTextStructures). self setDocument: document. fileStream close \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/initializeCompletionController.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/initializeCompletionController.st index 73a49ba..5ca1de0 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/initializeCompletionController.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/initializeCompletionController.st @@ -2,5 +2,5 @@ initialize-release initializeCompletionController ^ self wantsAutocompletion - ifTrue: [self addDependent: self createCompletionController] - ifFalse: [nil] \ No newline at end of file + ifTrue: [self addDependent: self createCompletionController] + ifFalse: [nil] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadDocumentFromSaver.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadDocumentFromSaver.st index 0c7d5f0..af2bfbb 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadDocumentFromSaver.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/loadDocumentFromSaver.st @@ -3,9 +3,8 @@ loadDocumentFromSaver | chosen document | chosen := self chosenDocument. - chosen - ifNotNil: [ - document := self saver loadDocumentFromName: chosen. - self setDocument: document; - setCurrentSave: chosen; - noUnacceptedEdits] \ No newline at end of file + chosen ifNotNil: [ + document := self saver loadDocumentFromName: chosen. + self setDocument: document; + setCurrentSave: chosen; + noUnacceptedEdits] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openDocumentMenu.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openDocumentMenu.st index 47ffdec..1f43d19 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openDocumentMenu.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openDocumentMenu.st @@ -4,7 +4,7 @@ openDocumentMenu ^ self openMenuWith: { {'New' . #openNewEditor}. {'Save' . #saveText}. - {'Save as' . #saveDocumentInSaverWithNamePrompt}. + {'Save as' . #saveDocumentWithNamePrompt}. {'Load' . #loadDocumentFromSaver}. {'Import from File' . #importFileWithDialog}. {'Import from Object File' . #importObjectFileWithDialog}. diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openEditMenu.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openEditMenu.st index cbb0585..06b0968 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openEditMenu.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/openEditMenu.st @@ -5,5 +5,4 @@ openEditMenu {'Undo (z)' . #undo}. {'Redo (Z)' . #redo}. {'Structures' . #openStructureEditor}. - {'Template'. #openTemplateChoser} - } \ No newline at end of file + {'Template'. #openTemplateChoser}} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/positionInTextAtIndex..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/positionInTextAtIndex..st index 2526757..46744ec 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/positionInTextAtIndex..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/positionInTextAtIndex..st @@ -7,8 +7,8 @@ positionInTextAtIndex: anIndex lineCounter := 0. currentLine := self displayedLines - detect: - [: each | lineCounter := lineCounter + 1. + detect: [:each | + lineCounter := lineCounter + 1. each first <= (anIndex + 1) and: [each last >= (anIndex + 1)]] ifNone: [self displayedLines last]. positionInLine := anIndex - currentLine first + 2. diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/postBuildWith..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/postBuildWith..st index ce13f08..c02c374 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/postBuildWith..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/postBuildWith..st @@ -1,7 +1,8 @@ toolbuilder postBuildWith: aBuilder - self textView: (aBuilder widgetAt: 'textView'). - self footer: (aBuilder widgetAt: 'footer'). - self updateFooter. + self + textView: (aBuilder widgetAt: 'textView'); + footer: (aBuilder widgetAt: 'footer'); + updateFooter. self editor model: self \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/removeTextAttribute..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/removeTextAttribute..st index aec1121..76a5d9c 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/removeTextAttribute..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/removeTextAttribute..st @@ -1,5 +1,6 @@ text structure removeTextAttribute: aTextAttribute + self bufferDocument removeTextAttribute: aTextAttribute from: self selectionStart diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/saveDocumentInSaverWithNamePrompt.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/saveDocumentWithNamePrompt.st similarity index 56% rename from packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/saveDocumentInSaverWithNamePrompt.st rename to packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/saveDocumentWithNamePrompt.st index 013e5d2..11974ed 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/saveDocumentInSaverWithNamePrompt.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/saveDocumentWithNamePrompt.st @@ -1,13 +1,11 @@ saving and loading -saveDocumentInSaverWithNamePrompt +saveDocumentWithNamePrompt | name | name := UIManager default request: 'Save as...'. - name = '' - ifFalse: [ - self saver - addSave: self targetDocument + (name = '') ifFalse: [ + self saver addSave: self targetDocument underName: name. - self + self setCurrentSave: name; noUnacceptedEdits] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/selectionChanged.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/selectionChanged.st index ae51ae2..628106d 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/selectionChanged.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/selectionChanged.st @@ -1,6 +1,7 @@ change selectionChanged - self isSelectionEmpty ifFalse: [self selectedStructures: (self textStructureSymbols select: [:structure | - self hasStructure: structure]) asSet]. + self isSelectionEmpty ifFalse: [ + self selectedStructures: (self textStructureSymbols select: [:structure | + self hasStructure: structure]) asSet]. self changed: #allSelections diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setLabel..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setLabel..st index 498343c..347687f 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setLabel..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setLabel..st @@ -2,8 +2,6 @@ saving and loading setLabel: aString (aString = '') - ifTrue: [ - self label: self class initialLabel] - ifFalse: [ - self label: self class initialLabel, ' - ', aString]. + ifTrue: [self label: self class initialLabel] + ifFalse: [self label: self class initialLabel, ' - ', aString]. self changed: #label \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setText..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setText..st index c906702..f4f373a 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setText..st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/setText..st @@ -1,5 +1,6 @@ accessing setText: aText - self text: aText; + self + text: aText; changed: #text \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st index 9bec8b8..b2981c5 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st @@ -1,8 +1,6 @@ document information showInfo - | infoText | - infoText := 'Word count: ', self bufferDocument wordcount. - infoText := infoText , String crlf, 'Total characters: ', (self bufferDocument charcountExcept: #()). - infoText := infoText, String crlf, 'Non-blank characters: ', self bufferDocument charcount. - ^ self showInfoDialog: infoText \ No newline at end of file + ^ self showInfoDialog: 'Word count: ', self bufferDocument wordcount asString, + String crlf, 'Total characters: ', (self bufferDocument charcountExcept: #()), + String crlf, 'Non-blank characters: ', self bufferDocument charcount \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textChanged.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textChanged.st index 37ca943..b14fc94 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textChanged.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textChanged.st @@ -1,7 +1,8 @@ text structure textChanged - self changed: #text; + self + changed: #text; unacceptedEdits; fitParagraphs; updateFooter \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json index 292d456..78c7959 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json @@ -9,13 +9,13 @@ "open:" : "kh 7/27/2020 12:26", "openWith:" : "AG 7/25/2019 13:12", "saverClass" : "ls 5/8/2019 20:28", - "yellowButtonMenuItems" : "tok 5/31/2020 20:54" }, + "yellowButtonMenuItems" : "tok 8/7/2020 19:08" }, "instance" : { "addExtendableStructures" : "OS 8/7/2020 13:51", "addTextAttribute:" : "OS 8/7/2020 13:51", "applyCurrentStructures" : "OS 6/3/2020 22:35", "bufferDocument" : "ls 6/26/2019 17:45", - "bufferDocument:" : "ls 7/24/2019 20:57", + "bufferDocument:" : "tok 8/7/2020 20:34", "buildDocumentMenuWith:" : "kh 7/11/2020 16:09", "buildEditMenuWith:" : "kh 7/11/2020 16:09", "buildFooterWith:" : "kh 8/3/2020 13:55", @@ -38,7 +38,7 @@ "defaultExportNameFor:" : "tok 7/3/2020 19:32", "displayedLines" : "JEH 6/14/2020 09:57", "documentClass" : "ls 7/10/2019 15:53", - "documentTimeText" : "tok 7/20/2020 14:10", + "documentTimeText" : "tok 8/7/2020 20:35", "editor" : "lh 7/24/2019 17:17", "exportFileWithDialog" : "tok 7/3/2020 19:34", "fitParagraphs" : "lh 7/24/2019 22:44", @@ -49,16 +49,16 @@ "footerText" : "JEH 6/14/2020 11:16", "getStructureSelectionAt:" : "OS 8/6/2020 16:24", "hasStructure:" : "AG 7/25/2019 13:13", - "hasStructure:between:to:" : "frc 8/7/2020 11:29", + "hasStructure:between:to:" : "tok 8/7/2020 20:02", "hasUnacceptedEdits" : "ls 5/9/2019 10:34", - "initializeCompletionController" : "frc 7/3/2020 21:49", "help" : "frc 8/7/2020 13:51", - "importFileFrom:" : "frc 8/6/2020 20:08", + "importFileFrom:" : "tok 8/7/2020 20:35", "importFileWithDialog" : "tok 7/3/2020 18:50", "importObjectFileFrom:" : "kh 8/3/2020 14:40", "importObjectFileWithDialog" : "kh 8/3/2020 14:40", "infoText" : "kh 6/20/2020 21:11", "initialize" : "OS 8/6/2020 16:23", + "initializeCompletionController" : "tok 8/7/2020 20:36", "initializeDocuments" : "lh 7/24/2019 22:37", "inspectDocument" : "ls 6/26/2019 18:57", "isCursorBetweenText" : "OS 8/7/2020 13:52", @@ -66,26 +66,26 @@ "isTextEmpty" : "AG 7/25/2019 13:13", "label" : "ls 5/11/2019 12:23", "label:" : "ls 6/26/2019 17:46", - "loadDocumentFromSaver" : "tok 7/8/2020 16:09", + "loadDocumentFromSaver" : "tok 8/7/2020 20:36", "mainSectionFrame" : "frc 8/7/2020 11:57", "manageStructuresButtonFrame" : "frc 8/7/2020 11:56", "menuBarFrame" : "frc 8/7/2020 11:56", "noUnacceptedEdits" : "ls 7/24/2019 21:08", "okToChange" : "ls 6/12/2019 22:15", - "openDocumentMenu" : "kh 8/3/2020 14:34", - "openEditMenu" : "frc 7/16/2020 12:35", + "openDocumentMenu" : "tok 8/7/2020 19:08", + "openEditMenu" : "tok 8/7/2020 20:37", "openMenuWith:" : "frc 6/16/2020 19:51", "openNewEditor" : "JEH 5/31/2020 14:14", "openStructureEditor" : "kh 7/27/2020 12:26", "openTemplateChoser" : "kh 7/27/2020 12:26", - "positionInTextAtIndex:" : "JEH 6/15/2020 15:09", - "postBuildWith:" : "kh 7/11/2020 16:11", + "positionInTextAtIndex:" : "tok 8/7/2020 20:37", + "postBuildWith:" : "tok 8/7/2020 20:38", "precedingStructuresChanged" : "OS 6/1/2020 00:04", "redo" : "AG 5/29/2019 18:37", - "removeTextAttribute:" : "OS 8/7/2020 10:38", + "removeTextAttribute:" : "tok 8/7/2020 20:38", "renameDocuments:" : "ls 6/26/2019 19:13", "resetSaver" : "ls 6/26/2019 18:44", - "saveDocumentInSaverWithNamePrompt" : "OS 6/14/2020 11:17", + "saveDocumentWithNamePrompt" : "tok 8/7/2020 20:39", "saveText" : "tok 7/20/2020 14:10", "saveText:" : "ls 6/26/2019 18:33", "saver" : "ls 6/26/2019 21:15", @@ -96,16 +96,16 @@ "selectInvisibly" : "lh 7/24/2019 18:02", "selectedStructures" : "MB 6/19/2019 17:36", "selectedStructures:" : "AG 7/25/2019 11:18", - "selectionChanged" : "OS 8/7/2020 13:52", + "selectionChanged" : "tok 8/7/2020 20:40", "selectionInterval" : "lh 7/24/2019 17:20", "selectionStart" : "OS 5/31/2020 13:38", "selectionStop" : "OS 5/31/2020 14:35", "setCurrentSave:" : "ls 6/26/2019 19:12", "setDocument:" : "OS 7/13/2020 15:21", - "setLabel:" : "lh 7/24/2019 17:21", - "setText:" : "AG 5/29/2019 18:35", + "setLabel:" : "tok 8/7/2020 20:40", + "setText:" : "tok 8/7/2020 20:40", "setTextFromView" : "ls 7/24/2019 20:27", - "showInfo" : "frc 7/16/2020 12:44", + "showInfo" : "tok 8/7/2020 20:41", "showInfoDialog:" : "frc 7/16/2020 12:45", "structureListFrame" : "frc 8/7/2020 11:56", "structureSectionFrame" : "frc 8/7/2020 11:56", @@ -115,7 +115,7 @@ "targetDocument:" : "lh 7/24/2019 20:23", "text" : "ls 6/26/2019 17:59", "text:" : "ls 6/26/2019 17:59", - "textChanged" : "frc 5/25/2020 15:22", + "textChanged" : "tok 8/7/2020 20:42", "textEditorClass" : "lh 7/24/2019 15:09", "textFieldFrame" : "frc 8/7/2020 11:56", "textMorph" : "ls 7/24/2019 21:06", diff --git a/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/class/current.st b/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/class/current.st index c7550a3..414a042 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/class/current.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/class/current.st @@ -1,6 +1,5 @@ singleton current - current isNil ifTrue: [^ current := self new]. - + current ifNil: [current := self new]. ^ current \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/methodProperties.json index 92cfa49..7927a2b 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditorSaver.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "current" : "AG 7/25/2019 13:15", + "current" : "tok 8/7/2020 20:52", "reset" : "AG 5/29/2019 18:40" }, "instance" : { "addSave:underName:" : "AG 7/25/2019 10:57", diff --git a/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/export.to..st b/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/export.to..st index a0e9091..2816343 100644 --- a/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/export.to..st +++ b/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/export.to..st @@ -2,7 +2,6 @@ export export: aRichTextDocument to: aFilePath | fileStream | - fileStream := StandardFileStream newFileNamed: aFilePath. self export: aRichTextDocument on: fileStream. fileStream close \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/template.st b/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/template.st index 2e90598..a142b02 100644 --- a/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/template.st +++ b/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/class/template.st @@ -1,5 +1,5 @@ export template - "Use a template to first transform a document to a specific set of structures, then export" + ^ self subclassResponsibility \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/methodProperties.json index 12b7946..df85759 100644 --- a/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextExportStrategy.class/methodProperties.json @@ -2,11 +2,11 @@ "class" : { "availableExportStrategies" : "JEH 7/26/2020 18:52", "export:on:" : "frc 8/7/2020 12:09", - "export:to:" : "frc 8/4/2020 14:23", + "export:to:" : "tok 8/7/2020 20:51", "fileEnding" : "tok 7/6/2020 14:33", "label" : "tok 7/8/2020 16:42", "prepareExportFor:" : "JEH 7/26/2020 18:14", "setTemplateFor:" : "frc 7/30/2020 08:31", - "template" : "frc 8/1/2020 13:11" }, + "template" : "tok 8/7/2020 20:52" }, "instance" : { } } diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/export.on..st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/export.on..st index e851b63..96b9282 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/export.on..st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/export.on..st @@ -1,9 +1,10 @@ export export: aRichTextDocument on: aStream - self document: aRichTextDocument. - self fileStream: aStream. - self put: self startString. - self processDocument. - self put: self endString. - self saveFile \ No newline at end of file + self + document: aRichTextDocument; + fileStream: aStream; + put: self startString; + processDocument; + put: self endString; + saveFile \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleEndOfStructure..st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleEndOfStructure..st index c5835a6..9439643 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleEndOfStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleEndOfStructure..st @@ -4,6 +4,7 @@ handleEndOfStructure: anEvent "If the ranges text structures are applied on overlap, it is neccessary to close ALL tags before opening the remaining ones again, because otherwise you will not produce valid HTML." - self putClosingStrings. - self removeStructuresFromActive: anEvent second. - self putOpeningStrings \ No newline at end of file + self + putClosingStrings; + removeStructuresFromActive: anEvent second; + putOpeningStrings \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleParagraph..st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleParagraph..st index 8795a27..8ca1086 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleParagraph..st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/handleParagraph..st @@ -2,7 +2,8 @@ stop-condition-handling handleParagraph: anEvent self inList ifTrue: [^ self handleNewListItem]. - self putClosingStrings. - self put: self class paragraphStructureEnclosingStrings last. - self put: self class paragraphStructureEnclosingStrings first. - self putOpeningStrings \ No newline at end of file + self + putClosingStrings; + put: self class paragraphStructureEnclosingStrings last; + put: self class paragraphStructureEnclosingStrings first; + putOpeningStrings \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/inList.st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/inList.st index 7a92670..a70688e 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/inList.st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/inList.st @@ -1,4 +1,5 @@ testing inList - ^ self currentStructures anySatisfy: [:each | self listSymbols includes: each structureIdentifier] \ No newline at end of file + ^ self currentStructures anySatisfy: [:each | + self listSymbols includes: each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/processDocument.st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/processDocument.st index 7a5ac75..7e32a0e 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/processDocument.st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/processDocument.st @@ -1,8 +1,7 @@ export processDocument - | readStream next| - + | readStream next | readStream := RichTextDocumentReadStream on: self document. next := readStream next. [next notNil] whileTrue: [ diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putSpecialStrings.with..st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putSpecialStrings.with..st index 5fa2271..dbd01e0 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putSpecialStrings.with..st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putSpecialStrings.with..st @@ -2,6 +2,5 @@ printing putSpecialStrings: aCollection with: aDictionary | string | - string := aCollection inject: '' into: [:a :b | a, (aDictionary at: b structureIdentifier)]. self nextPutAll: string \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putTextForEvent..st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putTextForEvent..st index 4479a42..91fda9f 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putTextForEvent..st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/putTextForEvent..st @@ -2,7 +2,6 @@ printing putTextForEvent: aDocumentReadStreamEvent | text | - text := aDocumentReadStreamEvent first. (self class event: aDocumentReadStreamEvent contains: #paragraph) ifTrue: [text := self class removeLastCharFrom: text]. diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/removeStructuresFromActive..st b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/removeStructuresFromActive..st index 1de587f..c36b737 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/removeStructuresFromActive..st +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/instance/removeStructuresFromActive..st @@ -1,4 +1,5 @@ stop-condition-handling removeStructuresFromActive: aCollection - self currentStructures: (self currentStructures reject: [:each | aCollection contains: [:any | any = each]]) \ No newline at end of file + self currentStructures: (self currentStructures reject: [:each | + aCollection contains: [:any | any = each]]) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/methodProperties.json index 18dd9a9..f19e655 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextHTMLExportStrategy.class/methodProperties.json @@ -30,29 +30,29 @@ "document:" : "frc 7/30/2020 08:43", "endString" : "JEH 7/26/2020 17:39", "eventHandlingDictionary" : "OS 8/7/2020 09:58", - "export:on:" : "frc 8/4/2020 14:27", + "export:on:" : "tok 8/7/2020 20:43", "fileStream" : "frc 7/30/2020 08:43", "fileStream:" : "frc 7/30/2020 08:43", "handleBeginningOfStructure:" : "JEH 7/26/2020 17:28", "handleEndOfDocument:" : "JEH 7/26/2020 17:28", - "handleEndOfStructure:" : "JEH 8/3/2020 14:56", + "handleEndOfStructure:" : "tok 8/7/2020 20:44", "handleLineFeed:" : "frc 8/1/2020 13:33", "handleNewListItem" : "frc 8/1/2020 13:31", "handleNextEvent:" : "frc 8/1/2020 13:08", - "handleParagraph:" : "JEH 8/3/2020 14:46", - "inList" : "frc 8/1/2020 13:33", + "handleParagraph:" : "tok 8/7/2020 20:44", + "inList" : "tok 8/7/2020 20:45", "initialize" : "frc 8/1/2020 13:08", "lineFeed" : "JEH 7/26/2020 16:32", "listSymbols" : "frc 8/1/2020 13:23", "nextPutAll:" : "JEH 7/26/2020 17:36", "openingStrings" : "JEH 8/3/2020 14:42", "outputString" : "frc 7/30/2020 08:43", - "processDocument" : "OS 8/7/2020 13:22", + "processDocument" : "tok 8/7/2020 20:45", "put:" : "JEH 7/26/2020 16:38", "putClosingStrings" : "JEH 7/26/2020 16:27", "putOpeningStrings" : "JEH 7/26/2020 16:27", - "putSpecialStrings:with:" : "JEH 8/3/2020 14:53", - "putTextForEvent:" : "frc 8/7/2020 11:24", - "removeStructuresFromActive:" : "frc 8/1/2020 13:07", + "putSpecialStrings:with:" : "tok 8/7/2020 20:45", + "putTextForEvent:" : "tok 8/7/2020 20:45", + "removeStructuresFromActive:" : "tok 8/7/2020 20:45", "saveFile" : "JEH 7/26/2020 17:36", "startString" : "JEH 7/26/2020 16:16" } } diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/README.md b/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/README.md index ddf85c8..d3e0543 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/README.md +++ b/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/README.md @@ -1,4 +1,4 @@ I am a RichTextHTMLTemplate. I specify structures that can be used to style the text in a HTML-like formatting. -Currently, it does mirror the RichTextMarkdownTemplate, since the two formats contain similar structures. +Currently, it refers to the RichTextMarkdownTemplate, since the two formats contain similar structures. diff --git a/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/properties.json b/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/properties.json index 081c0d1..d5b82ce 100644 --- a/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/properties.json +++ b/packages/RichTextEditing-Core.package/RichTextHTMLTemplate.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "JEH 8/7/2020 17:13", + "commentStamp" : "tok 8/7/2020 21:02", "instvars" : [ ], "name" : "RichTextHTMLTemplate", diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/class/export.on..st b/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/class/export.on..st index 6c27e73..d23c247 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/class/export.on..st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/class/export.on..st @@ -3,7 +3,6 @@ export: aRichTextDocument on: aStream "Markdown does not allow a proper representation of the structures and is not well defined. That's why the implementation of Markdown export is handled with an HTML export. This will also create valid Markdown." | document | - document := aRichTextDocument copy. super prepareExportFor: document. RichTextHTMLExportStrategy new export: document on: aStream \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/methodProperties.json index 313b1f5..94f9d26 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownExportStrategy.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "export:on:" : "frc 8/4/2020 14:25", + "export:on:" : "tok 8/7/2020 20:52", "fileEnding" : "JEH 7/26/2020 17:58", "label" : "JEH 7/26/2020 17:58", "template" : "JEH 7/26/2020 18:12" }, diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/README.md b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/README.md index c06bce4..6b4ec97 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/README.md +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/README.md @@ -1,3 +1,4 @@ I am a RichTextMarkdownTemplate. I specify structures that can be used to style the text in a markdown-like formatting. + diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialCodeStructure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialCodeStructure.st index 7cc35a7..8ce5748 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialCodeStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialCodeStructure.st @@ -4,4 +4,5 @@ initialCodeStructure ^ RichTextStructure new: #code from: {RichTextStructure fromColor: (Color r: 0.93 g: 0.745 b: 0.142). - RichTextStructure fromFont: ((TextStyle named: #BitstreamVeraSansMono) fontOfPointSize: 12)} \ No newline at end of file + RichTextStructure fromFont: + ((TextStyle named: #BitstreamVeraSansMono) fontOfPointSize: 12)} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading1Structure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading1Structure.st index 54c71be..91abdf1 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading1Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading1Structure.st @@ -3,4 +3,5 @@ initialHeading1Structure ^ RichTextStructure new: #heading1 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 20). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 20). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading2Structure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading2Structure.st index 9d18292..6e9ab13 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading2Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading2Structure.st @@ -3,4 +3,5 @@ initialHeading2Structure ^ RichTextStructure new: #heading2 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 17). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 17). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading3Structure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading3Structure.st index 8f55acb..6b05c78 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading3Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading3Structure.st @@ -3,4 +3,5 @@ initialHeading3Structure ^ RichTextStructure new: #heading3 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 14). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 14). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading4Structure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading4Structure.st index f4029a8..fd2e5f5 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading4Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialHeading4Structure.st @@ -3,4 +3,5 @@ initialHeading4Structure ^ RichTextStructure new: #heading4 - from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 12). RichTextStructure bold} \ No newline at end of file + from: {RichTextStructure fromFont: (StrikeFont createDejaVuDark: 12). + RichTextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialQuoteStructure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialQuoteStructure.st index 14c5320..495f95b 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialQuoteStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialQuoteStructure.st @@ -3,4 +3,5 @@ initialQuoteStructure ^ RichTextStructure new: #quote - from: {RichTextStructure fromColor: (Color veryLightGray). RichTextStructure listOnLevel: 1} \ No newline at end of file + from: {RichTextStructure fromColor: (Color veryLightGray). + RichTextStructure listOnLevel: 1} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialURLStructure.st b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialURLStructure.st index 04d0e71..1da80e9 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialURLStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/class/initialURLStructure.st @@ -3,4 +3,6 @@ initialURLStructure ^ RichTextStructure new: #url - from: {RichTextStructure autohyperlink. RichTextStructure underlined. RichTextStructure notExtendable} \ No newline at end of file + from: {RichTextStructure autohyperlink. + RichTextStructure underlined. + RichTextStructure notExtendable} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/methodProperties.json index 17df69b..cc10fc9 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/methodProperties.json @@ -3,18 +3,18 @@ "clearCachedDictionaries" : "JEH 7/25/2020 20:06", "identifier" : "JEH 7/4/2020 11:26", "initialBoldStructure" : "tok 8/7/2020 15:51", - "initialCodeStructure" : "tok 8/7/2020 15:52", - "initialHeading1Structure" : "tok 8/7/2020 15:52", - "initialHeading2Structure" : "tok 8/7/2020 15:52", - "initialHeading3Structure" : "tok 8/7/2020 15:52", - "initialHeading4Structure" : "tok 8/7/2020 15:52", + "initialCodeStructure" : "tok 8/7/2020 20:58", + "initialHeading1Structure" : "tok 8/7/2020 20:58", + "initialHeading2Structure" : "tok 8/7/2020 20:58", + "initialHeading3Structure" : "tok 8/7/2020 20:58", + "initialHeading4Structure" : "tok 8/7/2020 20:58", "initialItalicStructure" : "tok 8/7/2020 15:52", "initialLevel1ListStructure" : "tok 8/7/2020 15:52", "initialLevel2ListStructure" : "tok 8/7/2020 15:52", "initialLevel3ListStructure" : "tok 8/7/2020 15:52", - "initialQuoteStructure" : "tok 8/7/2020 15:52", + "initialQuoteStructure" : "tok 8/7/2020 20:58", "initialTextStructures" : "JEH 7/25/2020 18:59", - "initialURLStructure" : "tok 8/7/2020 15:52", + "initialURLStructure" : "tok 8/7/2020 20:58", "initialUnderlinedStructure" : "tok 8/7/2020 15:52", "textStructures" : "frc 7/15/2020 18:31" }, "instance" : { diff --git a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/properties.json b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/properties.json index 5e392d2..8e3ce44 100644 --- a/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/properties.json +++ b/packages/RichTextEditing-Core.package/RichTextMarkdownTemplate.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "JEH 7/10/2020 15:08", + "commentStamp" : "tok 8/7/2020 21:04", "instvars" : [ ], "name" : "RichTextMarkdownTemplate", diff --git a/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/setTemplateFor..st b/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/setTemplateFor..st new file mode 100644 index 0000000..63d3e34 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/setTemplateFor..st @@ -0,0 +1,3 @@ +export +setTemplateFor: aRichTextDocument + "No template here" \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/template.st b/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/template.st index 5f363b3..a906a58 100644 --- a/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/template.st +++ b/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/class/template.st @@ -1,4 +1,4 @@ export template - self shouldBeImplemented \ No newline at end of file + ^ self shouldNotImplement \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/methodProperties.json index def3e8c..0ae753f 100644 --- a/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextObjectExportStrategy.class/methodProperties.json @@ -3,6 +3,7 @@ "export:on:" : "frc 8/7/2020 12:13", "fileEnding" : "kh 7/27/2020 12:15", "label" : "kh 7/27/2020 12:15", - "template" : "kh 7/27/2020 12:15" }, + "setTemplateFor:" : "tok 8/7/2020 20:55", + "template" : "tok 8/7/2020 20:54" }, "instance" : { } } diff --git a/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/setTemplateFor..st b/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/setTemplateFor..st index 26d1bf8..63d3e34 100644 --- a/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/setTemplateFor..st +++ b/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/setTemplateFor..st @@ -1,4 +1,3 @@ export setTemplateFor: aRichTextDocument - - "No template required" \ No newline at end of file + "No template here" \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/template.st b/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/template.st index 0e08d2b..06b9eed 100644 --- a/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/template.st +++ b/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/class/template.st @@ -1,5 +1,5 @@ export template - "No template here" + ^ self shouldNotImplement \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/methodProperties.json index f78225e..494cb3c 100644 --- a/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextPlainExportStrategy.class/methodProperties.json @@ -3,7 +3,7 @@ "export:on:" : "frc 8/4/2020 14:24", "fileEnding" : "tok 7/3/2020 19:28", "label" : "tok 7/8/2020 16:42", - "setTemplateFor:" : "frc 7/30/2020 08:42", - "template" : "JEH 7/26/2020 18:16" }, + "setTemplateFor:" : "tok 8/7/2020 20:55", + "template" : "tok 8/7/2020 20:53" }, "instance" : { } } diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStyleIdentifiers.st similarity index 76% rename from packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st rename to packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStyleIdentifiers.st index c32a894..1f808b8 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStyleIdentifiers.st @@ -1,4 +1,4 @@ constants -allStructureIdentifiers +allStyleIdentifiers ^ RichTextStructure all collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st deleted file mode 100644 index 3ab6af0..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -allStructureIdentifiers - - ^ self class allStructureIdentifiers \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStyleIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStyleIdentifiers.st new file mode 100644 index 0000000..a87ef06 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStyleIdentifiers.st @@ -0,0 +1,4 @@ +text attributes +allStyleIdentifiers + + ^ self class allStyleIdentifiers \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st index f8793b9..5ac8774 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st @@ -5,7 +5,7 @@ buildStyleFieldWith: aBuilder name: 'styleField'; model: self; frame: self styleFieldFrame; - list: #allStructureIdentifiers; + list: #allStyleIdentifiers; getSelectionList: #isActiveStructureAt:; setSelectionList: #structureAt:activate:; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/checkAcceptTemplateConfirmation.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/checkAcceptTemplateConfirmation.st index 065084c..738cabf 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/checkAcceptTemplateConfirmation.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/checkAcceptTemplateConfirmation.st @@ -2,14 +2,11 @@ template-choosing checkAcceptTemplateConfirmation | result | - result := UIManager default chooseFrom: {'Select Template'. 'Cancel'} values: {true. false} title: self formattingRemovedWarning. - result ifNil: [^ false]. - ^ result \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/chooseStructureToRemove.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/chooseStructureToRemove.st index 54e601f..b3a3fc3 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/chooseStructureToRemove.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/chooseStructureToRemove.st @@ -2,6 +2,6 @@ text structures chooseStructureToRemove | chosen | - chosen := UIManager default chooseFrom: self textStructures values: self textStructures title: 'Remove:'. - chosen ifNotNil: [ - self document removeStructure: chosen] \ No newline at end of file + chosen := UIManager default chooseFrom: self textStructures + values: self textStructures title: 'Remove:'. + chosen ifNotNil: [self document removeStructure: chosen] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st index 4ef99a7..bec6abc 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st @@ -3,6 +3,7 @@ currentStructureSymbol: aSymbol self lastStructureSymbol: self currentStructureSymbol. currentStructureSymbol := aSymbol. - self changed: #allSelections; + self + changed: #allSelections; changed: #currentStructureSymbol; updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentTemplateSymbol.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentTemplateSymbol.st index 0490b24..7c77c6f 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentTemplateSymbol.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentTemplateSymbol.st @@ -1,3 +1,4 @@ accessing currentTemplateSymbol + ^ currentTemplateSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st index 29dc486..b25ff18 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st @@ -6,6 +6,6 @@ structureAt: anIndex activate: aBoolean targetTextStructure := (RichTextStructure predefinedStructureFor: (self structureIdentifierAt: anIndex)). aBoolean - ifTrue: [ target add: targetTextStructure] - ifFalse: [ target remove: targetTextStructure]. + ifTrue: [target add: targetTextStructure] + ifFalse: [target remove: targetTextStructure]. self updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st index 9462a9b..49254e6 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st @@ -1,4 +1,4 @@ text attributes structureIdentifierAt: anIndex - ^ self allStructureIdentifiers at: anIndex \ No newline at end of file + ^ self allStyleIdentifiers at: anIndex \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/templateIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/templateIdentifiers.st index a311d62..982f431 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/templateIdentifiers.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/templateIdentifiers.st @@ -1,4 +1,4 @@ template-choosing templateIdentifiers - ^ RichTextStructureTemplate availableTemplates collect: [ : each | each identifier ] \ No newline at end of file + ^ RichTextStructureTemplate availableTemplates collect: [:each | each identifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st index f9ac698..fb9b5bb 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st @@ -3,7 +3,8 @@ updateLoremIpsum self lastStructureSymbol ifNotNil: [ self loremIpsum removeAttribute: - (self document textStructureAt: self lastStructureSymbol) from: 1 to: self loremIpsum size]. + (self document textStructureAt: self lastStructureSymbol) + from: 1 to: self loremIpsum size]. self currentStructureSymbol ifNotNil: [ self loremIpsum addAttribute: self currentStructure from: 1 to: self loremIpsum size]. diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index 38e680e..593f21b 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -1,13 +1,13 @@ { "class" : { - "allStructureIdentifiers" : "tok 8/7/2020 15:53", + "allStyleIdentifiers" : "tok 8/7/2020 20:05", "open:" : "kh 7/27/2020 12:29", "openWith:" : "AG 7/25/2019 13:15" }, "instance" : { "acceptNewTemplate" : "JEH 7/6/2020 15:56", "acceptTemplateButtonFrame" : "frc 8/7/2020 11:57", "addNewStructure" : "ls 7/24/2019 17:06", - "allStructureIdentifiers" : "kh 6/21/2020 16:17", + "allStyleIdentifiers" : "tok 8/7/2020 20:05", "buildAcceptTemplateButtonWith:" : "kh 7/27/2020 11:48", "buildAddStructureButtonWith:" : "kh 7/11/2020 19:14", "buildColorButtonWith:" : "kh 7/11/2020 19:21", @@ -21,22 +21,22 @@ "buildStructureFieldWith:" : "kh 7/27/2020 14:11", "buildStructurePanelWith:" : "kh 7/27/2020 14:08", "buildStyleButtonPanelWith:" : "kh 7/27/2020 14:11", - "buildStyleFieldWith:" : "kh 7/27/2020 14:11", + "buildStyleFieldWith:" : "tok 8/7/2020 20:05", "buildStylePanelWith:" : "kh 7/27/2020 14:08", "buildTemplateFieldWith:" : "kh 7/27/2020 11:39", "buildTemplatePanelWith:" : "kh 7/27/2020 14:08", "buildTextPreviewFieldWith:" : "kh 7/27/2020 14:11", "buildWith:" : "kh 7/27/2020 11:36", "buttonHeight" : "kh 7/27/2020 14:09", - "checkAcceptTemplateConfirmation" : "JEH 7/10/2020 14:56", - "chooseStructureToRemove" : "ls 7/24/2019 17:26", + "checkAcceptTemplateConfirmation" : "tok 8/7/2020 20:47", + "chooseStructureToRemove" : "tok 8/7/2020 20:48", "colorOfCurrentStructure:" : "kh 6/21/2020 15:46", "copyTextStructures" : "lh 7/24/2019 18:33", "currentPriority" : "kh 6/19/2020 10:46", "currentStructure" : "kh 6/21/2020 11:22", "currentStructureSymbol" : "kh 6/19/2020 10:48", - "currentStructureSymbol:" : "OS 7/10/2020 13:29", - "currentTemplateSymbol" : "JEH 7/6/2020 15:25", + "currentStructureSymbol:" : "tok 8/7/2020 20:48", + "currentTemplateSymbol" : "tok 8/7/2020 20:48", "currentTemplateSymbol:" : "JEH 7/6/2020 15:25", "decreasePriority" : "ls 7/24/2019 22:36", "defaultColor" : "kh 6/18/2020 23:09", @@ -64,19 +64,19 @@ "replaceFontOfCurrentStructure:" : "tok 8/7/2020 15:52", "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", - "structureAt:activate:" : "tok 8/7/2020 15:52", + "structureAt:activate:" : "tok 8/7/2020 20:49", "structureButtonPanelFrame" : "frc 8/7/2020 11:58", "structureFieldFrame" : "frc 8/7/2020 11:58", - "structureIdentifierAt:" : "kh 6/21/2020 16:18", + "structureIdentifierAt:" : "tok 8/7/2020 20:05", "structurePanelFrame" : "frc 8/7/2020 11:58", "styleButtonPanelFrame" : "frc 8/7/2020 11:58", "styleFieldFrame" : "frc 8/7/2020 11:58", "stylePanelFrame" : "frc 8/7/2020 11:58", "templateFieldFrame" : "frc 8/7/2020 11:58", - "templateIdentifiers" : "JEH 7/6/2020 15:25", + "templateIdentifiers" : "tok 8/7/2020 20:49", "templatePanelFrame" : "frc 8/7/2020 11:58", "textPreviewFrame" : "frc 8/7/2020 11:58", "textStructures" : "ls 7/24/2019 16:55", "update:" : "frc 7/16/2020 13:52", - "updateLoremIpsum" : "kh 6/21/2020 10:04", + "updateLoremIpsum" : "tok 8/7/2020 20:49", "updateStructures:" : "lh 7/25/2019 11:05" } } diff --git a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/initialStructureIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/initialStructureIdentifiers.st index 0913fde..12a5131 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/initialStructureIdentifiers.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/initialStructureIdentifiers.st @@ -1,4 +1,4 @@ initial structures initialStructureIdentifiers - ^ self textStructures collect: [:each | each structureIdentifier ] \ No newline at end of file + ^ self textStructures collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/templateFromIdentifier..st b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/templateFromIdentifier..st index f74a6a3..35eba23 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/templateFromIdentifier..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/templateFromIdentifier..st @@ -1,4 +1,4 @@ accessing templateFromIdentifier: aSymbol - ^ self subclasses detect: [ : each | each identifier = aSymbol ] \ No newline at end of file + ^ self subclasses detect: [:each | each identifier = aSymbol] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/textStructures.st b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/textStructures.st index ed5561d..ace39cd 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/textStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/textStructures.st @@ -1,5 +1,5 @@ text structures textStructures - "Handled in subclasses to access appropriate class variables" + ^ self subclassResponsibility \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/updateRunArrayOn.with..st b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/updateRunArrayOn.with..st index a9bdee2..bf332c2 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/updateRunArrayOn.with..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/class/updateRunArrayOn.with..st @@ -2,7 +2,6 @@ apply updateRunArrayOn: aDocument with: newStructures | initialRuns newRuns | - newRuns := OrderedCollection new. initialRuns := aDocument textRuns. initialRuns do: [:each | diff --git a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/methodProperties.json index 61ca834..4be6fa0 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureTemplate.class/methodProperties.json @@ -5,14 +5,14 @@ "clearAllTemplatesCachedDictionaries" : "JEH 7/25/2020 18:51", "defaultTemplate" : "JEH 7/4/2020 11:16", "identifier" : "JEH 7/4/2020 11:17", - "initialStructureIdentifiers" : "frc 7/15/2020 18:31", + "initialStructureIdentifiers" : "tok 8/7/2020 20:56", "initialTextStructures" : "JEH 7/4/2020 11:17", "selectValidStructures:" : "frc 7/15/2020 18:24", - "templateFromIdentifier:" : "JEH 7/4/2020 11:41", + "templateFromIdentifier:" : "tok 8/7/2020 20:56", "textStructureByIndentifier:" : "JEH 8/3/2020 15:02", - "textStructures" : "frc 8/1/2020 13:02", + "textStructures" : "tok 8/7/2020 20:57", "transformStructure:" : "frc 8/7/2020 14:43", "transformStructuresOn:" : "frc 8/7/2020 14:43", - "updateRunArrayOn:with:" : "frc 8/1/2020 12:59" }, + "updateRunArrayOn:with:" : "tok 8/7/2020 20:57" }, "instance" : { } } diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/stopConditionsForExampleText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/stopConditionsForExampleText.st new file mode 100644 index 0000000..6732528 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/stopConditionsForExampleText.st @@ -0,0 +1,8 @@ +acceptance-tests +stopConditionsForExampleText + + | stream | + self document text: self textWithAttributes. + stream := RichTextDocumentReadStream on: self document. + stream next. + ^ stream next second \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59EndOfStructureAndBeginOfStructureIncludeStructure.st b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59EndOfStructureAndBeginOfStructureIncludeStructure.st index 0dfdea5..ed46007 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59EndOfStructureAndBeginOfStructureIncludeStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59EndOfStructureAndBeginOfStructureIncludeStructure.st @@ -1,10 +1,7 @@ acceptance-tests testUS59EndOfStructureAndBeginOfStructureIncludeStructure - | stream stopConditions | - self document text: self textWithAttributes. - stream := RichTextDocumentReadStream on: self document. - stream next. - stopConditions := stream next second. + | stopConditions | + stopConditions := self stopConditionsForExampleText. self assert: (((stopConditions first) second) = {self boldTextStructure} asOrderedCollection). self assert: (((stopConditions third) second) = {self italicTextStructure} asOrderedCollection) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59NextReturnsNextSectionOfTextAndListOfStopConditions.st b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59NextReturnsNextSectionOfTextAndListOfStopConditions.st index c658240..c66967b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59NextReturnsNextSectionOfTextAndListOfStopConditions.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59NextReturnsNextSectionOfTextAndListOfStopConditions.st @@ -1,10 +1,8 @@ acceptance-tests testUS59NextReturnsNextSectionOfTextAndListOfStopConditions - | testText stream | - - testText := ('hello', RichTextEditor paragraphCharacter asString, 'world') asText. - self document text: testText. + | stream | + self document text: self textWithParagraph. stream := RichTextDocumentReadStream on: self document. self assert: stream next = {('hello', RichTextEditor paragraphCharacter asString) asText. {{#paragraph}}}. self assert: stream next = {'world' asText. {{#endOfDocument}}} \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59StopConditionsAreInCorrectOrder.st b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59StopConditionsAreInCorrectOrder.st index 05ca4c8..0f7cb66 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59StopConditionsAreInCorrectOrder.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/instance/testUS59StopConditionsAreInCorrectOrder.st @@ -1,11 +1,9 @@ acceptance-tests testUS59StopConditionsAreInCorrectOrder - | stream stopConditions | - self document text: self textWithAttributes. - stream := RichTextDocumentReadStream on: self document. - stream next. - stopConditions := stream next second. - self assert: (self isEndOfStructure: (stopConditions first)). - self assert: (self isParagraph: (stopConditions second)). - self assert: (self isBeginningOfStructure: (stopConditions third)) \ No newline at end of file + | stopConditions | + stopConditions := self stopConditionsForExampleText. + self + assert: (self isEndOfStructure: (stopConditions first)); + assert: (self isParagraph: (stopConditions second)); + assert: (self isBeginningOfStructure: (stopConditions third)) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/methodProperties.json index 29a14e5..50573a7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentReadStreamTests.class/methodProperties.json @@ -5,7 +5,8 @@ "isBeginningOfStructure:" : "OS 8/7/2020 09:58", "isEndOfStructure:" : "frc 7/13/2020 13:29", "isParagraph:" : "JEH 7/26/2020 18:39", - "testUS59EndOfStructureAndBeginOfStructureIncludeStructure" : "JEH 7/26/2020 18:34", - "testUS59NextReturnsNextSectionOfTextAndListOfStopConditions" : "JEH 7/26/2020 18:39", + "stopConditionsForExampleText" : "tok 8/7/2020 17:46", + "testUS59EndOfStructureAndBeginOfStructureIncludeStructure" : "tok 8/7/2020 17:46", + "testUS59NextReturnsNextSectionOfTextAndListOfStopConditions" : "tok 8/7/2020 17:44", "testUS59ReadStreamExists" : "OS 7/10/2020 11:22", - "testUS59StopConditionsAreInCorrectOrder" : "frc 8/7/2020 10:24" } } + "testUS59StopConditionsAreInCorrectOrder" : "tok 8/7/2020 17:47" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/letterA.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/ASCIISymbolsOfLetterA.st similarity index 50% rename from packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/letterA.st rename to packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/ASCIISymbolsOfLetterA.st index 8eeac60..05c2ea2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/letterA.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/ASCIISymbolsOfLetterA.st @@ -1,4 +1,4 @@ constants -letterA +ASCIISymbolsOfLetterA ^ #(65 97) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st index f9821a7..efd080c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st @@ -1,4 +1,4 @@ utilities boldIsListed - ^ self editorModel textStructures includes: self boldStructure \ No newline at end of file + ^ self editorModel textStructures includes: RichTextStructure bold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st deleted file mode 100644 index eda689a..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -boldStructure - - ^ RichTextStructure bold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st deleted file mode 100644 index 790ae25..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st +++ /dev/null @@ -1,5 +0,0 @@ -utilities -boldStructureSymbol - - ^ RichTextStructure bold structureIdentifier - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/loadSavedDocument.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/loadSavedDocument.st new file mode 100644 index 0000000..b42ad17 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/loadSavedDocument.st @@ -0,0 +1,5 @@ +utilities +loadSavedDocument + + self enterString: self saveName + inBackwardsCompatibleDialog: [self editorModel loadDocumentFromSaver] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/modifyStructures.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/modifyStructures.st new file mode 100644 index 0000000..56dad5a --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/modifyStructures.st @@ -0,0 +1,6 @@ +utilities +modifyStructures + + self document + createNewStructure: self structureSymbol; + removeStructure: RichTextStructure bold structureIdentifier \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/openEditorWithTargetDocument.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/openEditorWithTargetDocument.st deleted file mode 100644 index 2dd825e..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/openEditorWithTargetDocument.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -openEditorWithTargetDocument - - ^ self targetDocument openInEditor \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/openNewEditor.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/openNewEditor.st new file mode 100644 index 0000000..29b6789 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/openNewEditor.st @@ -0,0 +1,5 @@ +utilities +openNewEditor + + self editorView abandon. + self openNewEditorModel \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/removeStructure.andAddCostumStructure..st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/removeStructure.andAddCostumStructure..st deleted file mode 100644 index b696bbb..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/removeStructure.andAddCostumStructure..st +++ /dev/null @@ -1,6 +0,0 @@ -utilities -removeStructure: aRemoveStructure andAddCostumStructure: aAddStructure - - self document - createNewStructure: aAddStructure; - removeStructure: aRemoveStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/saveTextInImage.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/saveTextInImage.st new file mode 100644 index 0000000..4b2b3b7 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/saveTextInImage.st @@ -0,0 +1,5 @@ +utilities +saveTextInImage + + self editorModel saveText. + self enterStringInSaveDialog: self saveName \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/saveTextInImageAndOpenNewEditor.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/saveTextInImageAndOpenNewEditor.st deleted file mode 100644 index 6fe103f..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/saveTextInImageAndOpenNewEditor.st +++ /dev/null @@ -1,7 +0,0 @@ -utilities -saveTextInImageAndOpenNewEditor - - self editorModel saveText. - self enterStringInSaveDialog: self saveName. - self editorView abandon. - self openNewEditorModel \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/targetDocumentHasText..st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/targetDocumentHasText..st deleted file mode 100644 index f81fe32..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/targetDocumentHasText..st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -targetDocumentHasText: aText - - ^ self targetDocument text = aText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountForText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountForText.st new file mode 100644 index 0000000..0e4bac2 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountForText.st @@ -0,0 +1,5 @@ +unit-tests +testCharCountForText + + self enterExampleStringOntoTextField. + self assert: self document charcount = 16 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountInitiallyZero.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountInitiallyZero.st new file mode 100644 index 0000000..1f61bf9 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountInitiallyZero.st @@ -0,0 +1,4 @@ +unit-tests +testCharCountInitiallyZero + + self assert: self document charcount = 0 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithSpacesForText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithSpacesForText.st new file mode 100644 index 0000000..5f816e8 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithSpacesForText.st @@ -0,0 +1,5 @@ +unit-tests +testCharCountWithSpacesForText + + self enterExampleStringOntoTextField. + self assert: (self document charcountExcept: #()) = self exampleString size \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithoutLetterA.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithoutLetterA.st index 299c610..3990ad3 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithoutLetterA.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testCharCountWithoutLetterA.st @@ -1,7 +1,5 @@ unit-tests testCharCountWithoutLetterA - | testText | - testText := 'Abra Kadabra' asText. - self enterStringOntoTextField: testText. - self assert: (self document charcountExcept: self letterA) = 7 \ No newline at end of file + self enterStringOntoTextField: 'Abra Kadabra'. + self assert: (self document charcountExcept: self ASCIISymbolsOfLetterA) = 7 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentCanOpenEditor.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentCanOpenEditor.st index e9995cc..b44f6d8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentCanOpenEditor.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentCanOpenEditor.st @@ -1,10 +1,8 @@ unit-tests testDocumentCanOpenEditor - | editor possibleMorphs | + | windowCount editor | + windowCount := (self windowsWithLabel: self editorModel label) size. editor := self document openEditor. - possibleMorphs := Project current world submorphs. - possibleMorphs := possibleMorphs select: [:morph | morph class = PluggableSystemWindow]. - possibleMorphs := possibleMorphs select: [:morph | morph label = self editorModel label]. - self assert: (possibleMorphs notEmpty). + self assert: (self windowsWithLabel: self editorModel label) size > windowCount. editor abandon \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsEqual.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsEqual.st index 08bcd80..0cf7a5b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsEqual.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsEqual.st @@ -1,4 +1,5 @@ unit-tests testDocumentHashIsEqual - self assert: (RichTextDocument new copy: self htmlFormattedDocument) hash = self htmlFormattedDocument hash \ No newline at end of file + self assert: (RichTextDocument new copy: self htmlFormattedDocument) hash = + self htmlFormattedDocument hash \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsNotEqual.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsNotEqual.st index af46a45..97212c3 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsNotEqual.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testDocumentHashIsNotEqual.st @@ -2,6 +2,6 @@ unit-tests testDocumentHashIsNotEqual | aDocument | - aDocument := RichTextDocument new copy: self htmlFormattedDocument. + aDocument := RichTextDocument new copy: self htmlFormattedDocument. aDocument initializeStructure: #unequal. self assert: aDocument hash ~= self htmlFormattedDocument hash \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38ChangesToTextStructuresAreTextBound.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38ChangesToTextStructuresAreTextBound.st index 43e439b..434dab3 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38ChangesToTextStructuresAreTextBound.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38ChangesToTextStructuresAreTextBound.st @@ -2,8 +2,9 @@ acceptance-tests testUS38ChangesToTextStructuresAreTextBound self - removeStructure: self boldStructureSymbol andAddCostumStructure: self structureSymbol; - saveTextInImageAndOpenNewEditor. - - self deny: self structureSymbolIsListed. - self assert: self boldIsListed \ No newline at end of file + modifyStructures; + saveTextInImage; + openNewEditor; + + deny: self structureSymbolIsListed; + assert: self boldIsListed \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38TextStructuresAreLoadedInWithText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38TextStructuresAreLoadedInWithText.st index ad8ebb9..3ac331e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38TextStructuresAreLoadedInWithText.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS38TextStructuresAreLoadedInWithText.st @@ -2,9 +2,9 @@ acceptance-tests testUS38TextStructuresAreLoadedInWithText self - removeStructure: self boldStructureSymbol andAddCostumStructure: self structureSymbol; - saveTextInImageAndOpenNewEditor. - - self enterString: self saveName inBackwardsCompatibleDialog: [self editorModel loadDocumentFromSaver]. - self assert: self structureSymbolIsListed. - self deny: self boldIsListed \ No newline at end of file + modifyStructures; + saveTextInImage; + openNewEditor; + loadSavedDocument; + assert: self structureSymbolIsListed; + deny: self boldIsListed \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57OpenInEditorOpensDocumentInEditor.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57OpenInEditorOpensDocumentInEditor.st index 5fca159..044e74e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57OpenInEditorOpensDocumentInEditor.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57OpenInEditorOpensDocumentInEditor.st @@ -2,6 +2,8 @@ acceptance-tests testUS57OpenInEditorOpensDocumentInEditor | newEditor | - newEditor := self openEditorWithTargetDocument. + newEditor := self targetDocument openInEditor. self addMorphToEditorView: (newEditor textView owner). - self assert: (self editorHasSameTargetAsCurrent: newEditor) \ No newline at end of file + self assert: (self editorHasSameTargetAsCurrent: newEditor). + + newEditor textView owner owner abandon \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionPreservesTargetDocumentIdentity.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionPreservesTargetDocumentIdentity.st index 0b877e9..bc38f05 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionPreservesTargetDocumentIdentity.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionPreservesTargetDocumentIdentity.st @@ -1,8 +1,6 @@ acceptance-tests testUS57SaveActionPreservesTargetDocumentIdentity - | testText | - testText := 'test text' asText. - self enterStringOntoTextField: testText. + self enterExampleStringOntoTextField. self editorModel saveText. self assert: self targetIdentityIsPreserved \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionWritesIntoTargetDocument.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionWritesIntoTargetDocument.st index 8adf979..6c0677a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionWritesIntoTargetDocument.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveActionWritesIntoTargetDocument.st @@ -1,8 +1,6 @@ acceptance-tests testUS57SaveActionWritesIntoTargetDocument - | testText | - testText := 'test text' asText. - self enterStringOntoTextField: testText. + self enterExampleStringOntoTextField. self editorModel saveText. - self assert: (self targetDocumentHasText: testText) \ No newline at end of file + self assert: (self targetDocument text asString = self exampleString) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveAsPutsTargetDocumentInSaver.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveAsPutsTargetDocumentInSaver.st index 4d1a1c6..5dd525a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveAsPutsTargetDocumentInSaver.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS57SaveAsPutsTargetDocumentInSaver.st @@ -1,12 +1,10 @@ acceptance-tests testUS57SaveAsPutsTargetDocumentInSaver - | saveName | - saveName := 'save name'. - self enterStringInSaveDialog: saveName. + self enterStringInSaveDialog: self saveName. "Close old editor view, since new one is about to be opened" self editorView abandon. self openNewEditorModel; - enterString: saveName inBackwardsCompatibleDialog: [self editorModel loadDocumentFromSaver]; + loadSavedDocument; assert: self targetIdentityIsPreserved \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountForText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountForText.st deleted file mode 100644 index d176641..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountForText.st +++ /dev/null @@ -1,7 +0,0 @@ -acceptance-tests -testUS63CharCountForText - - | testText | - testText := 'Hello World' asText. - self enterStringOntoTextField: testText. - self assert: self document charcount = 10. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountInitiallyZero.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountInitiallyZero.st deleted file mode 100644 index 1246102..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountInitiallyZero.st +++ /dev/null @@ -1,4 +0,0 @@ -acceptance-tests -testUS63CharCountInitiallyZero - - self assert: self document charcount = 0 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountWithSpacesForText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountWithSpacesForText.st deleted file mode 100644 index a714598..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63CharCountWithSpacesForText.st +++ /dev/null @@ -1,7 +0,0 @@ -acceptance-tests -testUS63CharCountWithSpacesForText - - | testText | - testText := 'Hello World' asText. - self enterStringOntoTextField: testText. - self assert: (self document charcountExcept: #()) = 11. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63WordCountForText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63WordCountForText.st deleted file mode 100644 index 0384ffa..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63WordCountForText.st +++ /dev/null @@ -1,7 +0,0 @@ -acceptance-tests -testUS63WordCountForText - - | testText | - testText := 'This is a test text' asText. - self enterStringOntoTextField: testText. - self assert: self document wordcount = 5. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63WordCountInitiallyZero.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63WordCountInitiallyZero.st deleted file mode 100644 index 6cacb8f..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testUS63WordCountInitiallyZero.st +++ /dev/null @@ -1,4 +0,0 @@ -acceptance-tests -testUS63WordCountInitiallyZero - - self assert: self document wordcount = 0 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testWordCountForText.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testWordCountForText.st new file mode 100644 index 0000000..4d13fba --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testWordCountForText.st @@ -0,0 +1,5 @@ +unit-tests +testWordCountForText + + self enterExampleStringOntoTextField. + self assert: self document wordcount = 5 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testWordCountInitiallyZero.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testWordCountInitiallyZero.st new file mode 100644 index 0000000..7d1e7f3 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/testWordCountInitiallyZero.st @@ -0,0 +1,4 @@ +unit-tests +testWordCountInitiallyZero + + self assert: self document wordcount = 0 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json index 835f090..2c7e005 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json @@ -2,36 +2,34 @@ "class" : { }, "instance" : { - "boldIsListed" : "kh 6/19/2020 16:32", - "boldStructure" : "tok 8/7/2020 15:51", - "boldStructureSymbol" : "tok 8/7/2020 15:51", + "ASCIISymbolsOfLetterA" : "tok 8/7/2020 18:10", + "boldIsListed" : "tok 8/7/2020 18:16", "editorHasSameTargetAsCurrent:" : "ls 7/3/2019 19:05", - "letterA" : "frc 8/7/2020 12:42", - "openEditorWithTargetDocument" : "ls 7/3/2019 18:43", - "removeStructure:andAddCostumStructure:" : "ls 7/24/2019 17:30", + "loadSavedDocument" : "tok 8/7/2020 18:01", + "modifyStructures" : "tok 8/7/2020 18:17", + "openNewEditor" : "tok 8/7/2020 17:59", "saveName" : "MB 6/12/2019 18:08", - "saveTextInImageAndOpenNewEditor" : "ls 7/3/2019 21:42", + "saveTextInImage" : "tok 8/7/2020 18:33", "setUp" : "JEH 5/31/2020 14:55", "structureSymbol" : "ls 7/3/2019 21:38", "structureSymbolIsListed" : "ls 7/3/2019 21:42", "targetDocument" : "ls 7/3/2019 18:43", - "targetDocumentHasText:" : "ls 7/3/2019 18:43", "targetIdentity" : "ls 7/3/2019 18:14", "targetIdentity:" : "ls 7/3/2019 18:14", "targetIdentityIsPreserved" : "ls 7/3/2019 18:43", - "testCharCountWithoutLetterA" : "frc 8/7/2020 12:42", - "testDocumentCanOpenEditor" : "frc 6/13/2020 11:10", - "testDocumentHashIsEqual" : "frc 8/7/2020 11:54", - "testDocumentHashIsNotEqual" : "frc 8/7/2020 11:54", - "testUS38ChangesToTextStructuresAreTextBound" : "frc 8/7/2020 13:11", - "testUS38TextStructuresAreLoadedInWithText" : "frc 8/7/2020 13:11", + "testCharCountForText" : "tok 8/7/2020 18:32", + "testCharCountInitiallyZero" : "tok 8/7/2020 18:09", + "testCharCountWithSpacesForText" : "tok 8/7/2020 18:09", + "testCharCountWithoutLetterA" : "tok 8/7/2020 18:10", + "testDocumentCanOpenEditor" : "tok 8/7/2020 18:15", + "testDocumentHashIsEqual" : "tok 8/7/2020 18:16", + "testDocumentHashIsNotEqual" : "tok 8/7/2020 18:16", + "testUS38ChangesToTextStructuresAreTextBound" : "tok 8/7/2020 17:58", + "testUS38TextStructuresAreLoadedInWithText" : "tok 8/7/2020 18:01", "testUS57ButtonToInspectDocumentExists" : "ls 7/3/2019 17:59", - "testUS57OpenInEditorOpensDocumentInEditor" : "frc 8/7/2020 13:11", - "testUS57SaveActionPreservesTargetDocumentIdentity" : "MB 7/25/2019 11:41", - "testUS57SaveActionWritesIntoTargetDocument" : "MB 7/25/2019 11:41", - "testUS57SaveAsPutsTargetDocumentInSaver" : "tok 7/8/2020 16:09", - "testUS63CharCountForText" : "frc 5/25/2020 16:03", - "testUS63CharCountInitiallyZero" : "frc 5/19/2020 22:47", - "testUS63CharCountWithSpacesForText" : "frc 5/25/2020 16:05", - "testUS63WordCountForText" : "frc 5/25/2020 16:02", - "testUS63WordCountInitiallyZero" : "frc 5/19/2020 21:58" } } + "testUS57OpenInEditorOpensDocumentInEditor" : "tok 8/7/2020 18:18", + "testUS57SaveActionPreservesTargetDocumentIdentity" : "tok 8/7/2020 18:03", + "testUS57SaveActionWritesIntoTargetDocument" : "tok 8/7/2020 18:05", + "testUS57SaveAsPutsTargetDocumentInSaver" : "tok 8/7/2020 18:06", + "testWordCountForText" : "tok 8/7/2020 18:09", + "testWordCountInitiallyZero" : "tok 8/7/2020 18:09" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/createTestFileWithContent.at..st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/createTestFileWithContent.at..st index ba9c781..caf0db4 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/createTestFileWithContent.at..st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/createTestFileWithContent.at..st @@ -4,5 +4,4 @@ createTestFileWithContent: aString at: filePath | newFile | newFile := StandardFileStream fileNamed: filePath. newFile nextPutAll: aString. - self file: newFile. newFile close \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleDocument.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleDocument.st index 27dbf4b..39d6f6d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleDocument.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleDocument.st @@ -1,4 +1,4 @@ -running +constants exampleDocument | document | diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleExportContent.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleExportContent.st index 13aa258..2173b4c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleExportContent.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/exampleExportContent.st @@ -1,4 +1,4 @@ constants exampleExportContent - "Due to line endings tests will fail with newlines, even if it works correctly in normal use" + "Due to line endings, some tests will fail with newlines, even if it works correctly in normal use" ^ 'This is the content of the file! ÄÖÜ' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/file..st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/file..st deleted file mode 100644 index 9967a84..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/file..st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -file: aFile - - file := aFile - - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/file.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/file.st deleted file mode 100644 index 847befa..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/file.st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -file - - ^ file - - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlExampleString.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlExampleString.st index ebb2a41..448e47a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlExampleString.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlExampleString.st @@ -1,4 +1,4 @@ constants htmlExampleString - ^ '

This is a test.

' \ No newline at end of file + ^ '

This is a test.

' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedDocument.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedDocument.st index cf3a30a..eb0f546 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedDocument.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedDocument.st @@ -1,5 +1,5 @@ constants htmlLineFeedDocument - ^ RichTextDocument fromText: (Text fromString: self exampleContent) + ^ RichTextDocument fromText: (Text fromString: self exampleContent) withStructures: RichTextHTMLTemplate textStructures \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedString.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedString.st index 8748807..62312a9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedString.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlLineFeedString.st @@ -1,4 +1,4 @@ constants htmlLineFeedString - ^ '

This is the content of the file
This is another line! ÄÖÜ

' \ No newline at end of file + ^ '

This is the content of the file
This is another line! ÄÖÜ

' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListDocument.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListDocument.st index b995d98..d1dfecc 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListDocument.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListDocument.st @@ -1,7 +1,7 @@ constants htmlListDocument - | runs text | + | runs text | runs := RunArray runs: #(9 32) values: {#() . {RichTextMarkdownTemplate initialLevel1ListStructure}}. text := Text fromString: 'My list:', RichTextEditor paragraphCharacter asString, 'List item1', Character lf asString, 'List item2', Character lf asString, 'List item3'. diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListString.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListString.st index d7a2838..496e26a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListString.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlListString.st @@ -1,4 +1,4 @@ constants htmlListString - ^ '

My list:

' \ No newline at end of file + ^ '

My list:

' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlParagraphExampleString.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlParagraphExampleString.st index ce0da6d..60124c0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlParagraphExampleString.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/htmlParagraphExampleString.st @@ -1,4 +1,4 @@ constants htmlParagraphExampleString - ^ '

hello

world

' \ No newline at end of file + ^ '

hello

world

' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/paragraphingDocument.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/paragraphingDocument.st index f285714..56fdfcf 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/paragraphingDocument.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/paragraphingDocument.st @@ -1,4 +1,4 @@ constants paragraphingDocument - ^ RichTextDocument fromText: self textWithAttributes withStructures: RichTextHTMLTemplate textStructures \ No newline at end of file + ^ RichTextDocument fromText: self textWithAttributes withStructures: RichTextHTMLTemplate textStructures \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesLineFeed.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesLineFeed.st index 361560d..8a413bf 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesLineFeed.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesLineFeed.st @@ -1,4 +1,6 @@ unit-tests testHTMLExportHandlesLineFeed - self assert: self htmlLineFeedString equals: self htmlLineFeedDocument withExport: RichTextHTMLExportStrategy \ No newline at end of file + self assert: self htmlLineFeedString + equals: self htmlLineFeedDocument + withExport: RichTextHTMLExportStrategy \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesList.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesList.st index 29574e2..861140e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesList.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesList.st @@ -1,4 +1,6 @@ unit-tests testHTMLExportHandlesList - self assert: self htmlListString equals: self htmlListDocument withExport: RichTextHTMLExportStrategy \ No newline at end of file + self assert: self htmlListString + equals: self htmlListDocument + withExport: RichTextHTMLExportStrategy \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesParagraph.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesParagraph.st index 0c0bcce..3b3da72 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesParagraph.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testHTMLExportHandlesParagraph.st @@ -1,4 +1,6 @@ unit-tests testHTMLExportHandlesParagraph - self assert: self htmlParagraphExampleString equals: self paragraphingDocument withExport: RichTextHTMLExportStrategy \ No newline at end of file + self assert: self htmlParagraphExampleString + equals: self paragraphingDocument + withExport: RichTextHTMLExportStrategy \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS143ExportImportObjectEqual.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS143ExportImportObjectEqual.st index 096be79..4329b19 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS143ExportImportObjectEqual.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS143ExportImportObjectEqual.st @@ -2,6 +2,7 @@ acceptance-tests testUS143ExportImportObjectEqual self editorModel setDocument: self exampleDocument. - self chooseExportStrategy: RichTextObjectExportStrategy. - self answer: self exampleExportFilePath inDialog: [self editorModel importObjectFileWithDialog]. - self assert: self exampleDocument equals: self document \ No newline at end of file + self + chooseExportStrategy: RichTextObjectExportStrategy; + answer: self exampleExportFilePath inDialog: [self editorModel importObjectFileWithDialog]; + assert: self exampleDocument equals: self document \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS84ImportFileFromFilesystem.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS84ImportFileFromFilesystem.st index ce74642..36f789e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS84ImportFileFromFilesystem.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS84ImportFileFromFilesystem.st @@ -2,4 +2,4 @@ acceptance-tests testUS84ImportFileFromFilesystem self answer: self exampleImportFilePath inDialog: [self editorModel importFileWithDialog]. - self assert: (self exampleContent) equals: (self editorModel bufferDocument asString) \ No newline at end of file + self assert: (self exampleContent) equals: (self document asString) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS87ExportDocumentAsPlainText.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS87ExportDocumentAsPlainText.st index 02ea856..7f1c2cf 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS87ExportDocumentAsPlainText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS87ExportDocumentAsPlainText.st @@ -3,7 +3,7 @@ testUS87ExportDocumentAsPlainText self enterStringOntoTextField: self exampleExportContent. self editorModel saveText. - self chooseExportStrategy: RichTextPlainExportStrategy. - - self assert: self exportedFileExists. - self assert: self exportedFileContent equals: self exampleExportContent \ No newline at end of file + self + chooseExportStrategy: RichTextPlainExportStrategy; + assert: self exportedFileExists; + assert: self exportedFileContent equals: self exampleExportContent \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsHTML.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsHTML.st index 6b11476..7023149 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsHTML.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsHTML.st @@ -1,4 +1,6 @@ acceptance-tests testUS88ExportAsHTML - self assert: self htmlExampleString equals: self htmlFormattedDocument withExport: RichTextHTMLExportStrategy \ No newline at end of file + self assert: self htmlExampleString + equals: self htmlFormattedDocument + withExport: RichTextHTMLExportStrategy \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsMarkdown.st b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsMarkdown.st index c807aa0..f66eacd 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsMarkdown.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/instance/testUS88ExportAsMarkdown.st @@ -1,4 +1,6 @@ acceptance-tests testUS88ExportAsMarkdown - self assert: self htmlExampleString equals: self htmlFormattedDocument withExport: RichTextMarkdownExportStrategy \ No newline at end of file + self assert: self htmlExampleString + equals: self htmlFormattedDocument + withExport: RichTextMarkdownExportStrategy \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/methodProperties.json index 2597128..93dc9cd 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorImportExportTests.class/methodProperties.json @@ -4,41 +4,39 @@ "instance" : { "assert:equals:withExport:" : "frc 8/7/2020 12:29", "chooseExportStrategy:" : "tok 7/8/2020 20:45", - "createTestFileWithContent:at:" : "frc 8/4/2020 14:44", + "createTestFileWithContent:at:" : "tok 8/7/2020 16:34", "exampleContent" : "tok 7/9/2020 21:47", "exampleDocument" : "kh 8/6/2020 10:40", - "exampleExportContent" : "tok 7/9/2020 22:41", + "exampleExportContent" : "tok 8/7/2020 16:30", "exampleExportFilePath" : "tok 7/8/2020 20:43", "exampleImportFilePath" : "tok 7/9/2020 21:16", "exportOptionExists:" : "8/6/2020 19:49:02", "exportVariantExists:" : "kh 8/6/2020 09:50", "exportedFileContent" : "tok 7/9/2020 22:41", "exportedFileExists" : "tok 7/9/2020 21:44", - "file" : "frc 6/8/2020 15:00", - "file:" : "frc 6/8/2020 14:59", "fileDirectory" : "tok 7/10/2020 11:46", "fileDirectory:" : "tok 7/10/2020 11:46", - "htmlExampleString" : "frc 7/29/2020 08:29", - "htmlLineFeedDocument" : "frc 8/7/2020 12:05", - "htmlLineFeedString" : "frc 8/1/2020 13:40", - "htmlListDocument" : "frc 8/7/2020 12:05", - "htmlListString" : "frc 8/1/2020 13:36", - "htmlParagraphExampleString" : "frc 7/29/2020 09:07", - "paragraphingDocument" : "frc 7/29/2020 09:12", - "plainTextExportLabel" : "JEH 8/7/2020 16:00", + "htmlExampleString" : "tok 8/7/2020 16:31", + "htmlLineFeedDocument" : "tok 8/7/2020 16:31", + "htmlLineFeedString" : "tok 8/7/2020 16:31", + "htmlListDocument" : "tok 8/7/2020 16:31", + "htmlListString" : "tok 8/7/2020 16:31", + "htmlParagraphExampleString" : "tok 8/7/2020 16:31", + "paragraphingDocument" : "tok 8/7/2020 16:31", + "plainTextExportLabel" : "tok 7/8/2020 16:44", "setUp" : "kh 8/6/2020 10:24", "setupFile" : "tok 7/9/2020 21:10", "setupPlainTextFile" : "kh 8/6/2020 10:24", "tearDown" : "tok 7/8/2020 20:48", "tearDownFiles" : "tok 7/9/2020 21:44", - "testHTMLExportHandlesLineFeed" : "frc 8/1/2020 13:36", - "testHTMLExportHandlesList" : "frc 8/1/2020 13:36", - "testHTMLExportHandlesParagraph" : "frc 7/29/2020 09:59", + "testHTMLExportHandlesLineFeed" : "tok 8/7/2020 18:37", + "testHTMLExportHandlesList" : "tok 8/7/2020 18:37", + "testHTMLExportHandlesParagraph" : "tok 8/7/2020 18:37", "testUS143ExportAsObjectExistsInDialog" : "kh 8/6/2020 09:51", - "testUS143ExportImportObjectEqual" : "kh 8/6/2020 14:16", - "testUS84ImportFileFromFilesystem" : "frc 8/7/2020 10:50", - "testUS87ExportAsPlainTextExistsInDialog" : "JEH 8/7/2020 16:00", - "testUS87ExportDocumentAsPlainText" : "JEH 8/7/2020 16:00", - "testUS88ExportAsHTML" : "frc 7/26/2020 21:15", - "testUS88ExportAsMarkdown" : "frc 8/1/2020 12:44", + "testUS143ExportImportObjectEqual" : "tok 8/7/2020 18:34", + "testUS84ImportFileFromFilesystem" : "tok 8/7/2020 17:14", + "testUS87ExportAsPlainTextExistsInDialog" : "frc 7/30/2020 08:38", + "testUS87ExportDocumentAsPlainText" : "tok 8/7/2020 21:00", + "testUS88ExportAsHTML" : "tok 8/7/2020 18:35", + "testUS88ExportAsMarkdown" : "tok 8/7/2020 18:36", "testUS88ExportAsMarkdownExistsInDialog" : "kh 8/6/2020 09:49" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/saver.st b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/saver.st index f249da2..51d282b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/saver.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/saver.st @@ -1,4 +1,4 @@ -accessing +utilities saver ^ RichTextEditorModel saverClass current \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/testUS13UnitSavesCanBeAddedAndLoaded.st b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/testUS13UnitSavesCanBeAddedAndLoaded.st index d700309..fb864bb 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/testUS13UnitSavesCanBeAddedAndLoaded.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/instance/testUS13UnitSavesCanBeAddedAndLoaded.st @@ -1,9 +1,7 @@ acceptance-tests testUS13UnitSavesCanBeAddedAndLoaded - - | saveName text document | - saveName := 'Testname'. - text := 'this is a test' asText. - document := RichTextDocument fromText: text withStructures: Set new. - self saver addSave: document underName: saveName. - self assert: (self saver loadDocumentFromName: saveName) text equals: text \ No newline at end of file + + self saver + addSave: (RichTextDocument fromText: (self exampleString asText) withStructures: Set new) + underName: 'Testname'. + self assert: (self saver loadDocumentFromName: 'Testname') text equals: self exampleString asText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/methodProperties.json index d7fc861..6592283 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/methodProperties.json @@ -3,4 +3,4 @@ }, "instance" : { "saver" : "SR 5/8/2019 17:52", - "testUS13UnitSavesCanBeAddedAndLoaded" : "MB 7/25/2019 11:14" } } + "testUS13UnitSavesCanBeAddedAndLoaded" : "tok 8/7/2020 18:40" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/properties.json b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/properties.json index 795f277..f2497b6 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/properties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorSaverTests.class/properties.json @@ -10,5 +10,5 @@ "name" : "RichTextEditorSaverTests", "pools" : [ ], - "super" : "TestCase", + "super" : "RichTextEditorTestCase", "type" : "normal" } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/boldIsSelectedInList.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/boldIsSelectedInList.st index f90c68c..0b102eb 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/boldIsSelectedInList.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/boldIsSelectedInList.st @@ -1,6 +1,5 @@ utilities boldIsSelectedInList - | list | - list := self editorView findByName: 'structureList'. - ^ list listSelectionAt: (self editorModel textStructureSymbols indexOf: #bold) \ No newline at end of file + ^ (self editorView findByName: self structureListLabel) + listSelectionAt: (self editorModel textStructureSymbols indexOf: #bold) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedEmphasisCode.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedEmphasisCode.st index eb681f4..31fb9f5 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedEmphasisCode.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedEmphasisCode.st @@ -1,4 +1,4 @@ -utilities +constants combinedEmphasisCode ^ 1 + 2 + 4 + 16 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st index 8a43652..4fc8302 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st @@ -1,4 +1,4 @@ -utilities +constants combinedTextStructure ^ RichTextStructure new: #test from: diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/firstStructureIsSelectedInList.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/firstStructureIsSelectedInList.st index 2059515..477ffd8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/firstStructureIsSelectedInList.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/firstStructureIsSelectedInList.st @@ -1,6 +1,5 @@ utilities firstStructureIsSelectedInList - | list | - list := self editorView findByName: 'structureList'. - ^ list listSelectionAt: 1 \ No newline at end of file + ^ (self editorView findByName: self structureListLabel) + listSelectionAt: 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st index 2d4d55f..7c1f672 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st @@ -1,4 +1,4 @@ -utilities +constants listLevel ^ 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructureStyles.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructureStyles.st deleted file mode 100644 index 889e583..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructureStyles.st +++ /dev/null @@ -1,5 +0,0 @@ -utilities -listTextStructureStyles - - ^ {#indented} - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/menu.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/menu.st deleted file mode 100644 index 906d491..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/menu.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -menu - - ^ (self editorView findByLabel: 'structureList') list \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/setUpHalfBoldTestText.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/setUpHalfBoldTestText.st index f0f7c5f..6919b74 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/setUpHalfBoldTestText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/setUpHalfBoldTestText.st @@ -1,6 +1,6 @@ -utilities +running setUpHalfBoldTestText - self enterStringOntoTextField: 'test'. + self enterStringOntoTextField: self demoString. self textEditor selectFrom: 1 to: 2. self selectOptionBold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/structureListLabel.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/structureListLabel.st new file mode 100644 index 0000000..1ff0ac1 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/structureListLabel.st @@ -0,0 +1,4 @@ +constants +structureListLabel + + ^ 'structureList' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18SelectionStyleIsAppliedToSelection.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18SelectionStyleIsAppliedToSelection.st index 990cf70..d5dadac 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18SelectionStyleIsAppliedToSelection.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18SelectionStyleIsAppliedToSelection.st @@ -1,8 +1,8 @@ acceptance-tests testUS18SelectionStyleIsAppliedToSelection - self enterStringOntoTextField: 'test'. + self enterExampleStringOntoTextField. self textEditor selectAll. - self selectOptionBold. + self assert: (self editorModel hasStructure: #bold) diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18TextStyleIsSelectedInList.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18TextStyleIsSelectedInList.st index a4e02f6..3db76b7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18TextStyleIsSelectedInList.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS18TextStyleIsSelectedInList.st @@ -1,8 +1,8 @@ acceptance-tests testUS18TextStyleIsSelectedInList - self enterStringOntoTextField: 'test'. + self enterExampleStringOntoTextField. self textEditor selectAll. - self selectOptionBold. + self assert: self boldIsSelectedInList \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS32StructureIsRendered.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS32StructureIsRendered.st index d600153..7e6a5f2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS32StructureIsRendered.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS32StructureIsRendered.st @@ -3,5 +3,5 @@ testUS32StructureIsRendered self assert: self textHasNoStyle. self editorText addAttribute: self combinedTextStructure. - self assert: self textHasCombinedStyle + self assert: self textHasCombinedEmphasisCode diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44OldButtonsHaveBeenRemoved.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44OldButtonsHaveBeenRemoved.st deleted file mode 100644 index 1652107..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44OldButtonsHaveBeenRemoved.st +++ /dev/null @@ -1,6 +0,0 @@ -acceptance-tests -testUS44OldButtonsHaveBeenRemoved - - self deny: (self buttonWithLabelExists: 'Add Structure'). - self deny: (self buttonWithLabelExists: 'Remove Structure'). - self deny: (self buttonWithLabelExists: 'Structure') \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44SelectedStylesChangeAccordingToSelectedText.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44SelectedStylesChangeAccordingToSelectedText.st index 685f874..945fbaf 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44SelectedStylesChangeAccordingToSelectedText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44SelectedStylesChangeAccordingToSelectedText.st @@ -5,5 +5,6 @@ testUS44SelectedStylesChangeAccordingToSelectedText self textEditor selectFrom: 3 to: 4. self deny: self boldIsSelectedInList. + self textEditor selectFrom: 1 to: 2. self assert: self boldIsSelectedInList \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44StructureListExists.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44StructureListExists.st index 73fa41f..3d65ee9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44StructureListExists.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS44StructureListExists.st @@ -1,4 +1,4 @@ acceptance-tests testUS44StructureListExists - self editorView findByName: 'structureList' \ No newline at end of file + self assert: (self editorView findByName: self structureListLabel) morphs notEmpty \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutIsAppliedToNextText.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutIsAppliedToNextText.st index 7fee44b..374f7db 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutIsAppliedToNextText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutIsAppliedToNextText.st @@ -3,7 +3,7 @@ testUS61StructureShortcutIsAppliedToNextText self simulateKeyboardShortcutForStructure1; - enterStringOntoTextField: self demoText. + enterExampleStringOntoTextField. self textEditor selectAll. self assert: (self firstStructureIsSelectedInList) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureEndOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureEndOfText.st index 84f6954..1cb0184 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureEndOfText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureEndOfText.st @@ -2,7 +2,7 @@ acceptance-tests testUS61StructureShortcutTogglesStructureEndOfText self - enterStringOntoTextField: self demoText; + enterExampleStringOntoTextField; simulateKeyboardShortcutForStructure1; assert: (self firstStructureIsSelectedInList); simulateKeyboardShortcutForStructure1; diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureSelectedText.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureSelectedText.st index df9d67e..de555f6 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureSelectedText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS61StructureShortcutTogglesStructureSelectedText.st @@ -1,7 +1,7 @@ acceptance-tests testUS61StructureShortcutTogglesStructureSelectedText - self enterStringOntoTextField: self demoText. + self enterExampleStringOntoTextField. self textEditor selectAll. self simulateKeyboardShortcutForStructure1; diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st index d33f969..194008c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st @@ -1,7 +1,7 @@ acceptance-tests testUS64IndentedStructureIsRendered - self enterStringOntoTextField: 'test'. - self assert: ((self editorText indentationAmountAt: (1 to: self editorText size)) = 0). + self enterExampleStringOntoTextField. + self assert: (self editorText indentationAmountAt: (1 to: self editorText size)) = 0. self editorText addAttribute: self listTextStructure from: 1 to: self editorText size. - self assert: ((self editorText indentationAmountAt: (1 to: self editorText size)) = self listLevel) \ No newline at end of file + self assert: (self editorText indentationAmountAt: (1 to: self editorText size)) = self listLevel \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/textHasCombinedStyle.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/textHasCombinedEmphasisCode.st similarity index 82% rename from packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/textHasCombinedStyle.st rename to packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/textHasCombinedEmphasisCode.st index 9356a09..8291886 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/textHasCombinedStyle.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/textHasCombinedEmphasisCode.st @@ -1,5 +1,5 @@ utilities -textHasCombinedStyle +textHasCombinedEmphasisCode ^ (1 to: self editorText size) allSatisfy: [:index | (self editorText emphasisAt: index) = self combinedEmphasisCode] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json index f37f7f6..cd1fdd9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json @@ -2,25 +2,22 @@ "class" : { }, "instance" : { - "boldIsSelectedInList" : "MB 7/24/2019 18:54", + "boldIsSelectedInList" : "tok 8/7/2020 16:27", "combinedEmphasisCode" : "MB 5/29/2019 22:04", "combinedTextStructure" : "tok 8/7/2020 15:51", - "demoText" : "tok 6/13/2020 12:11", - "firstStructureIsSelectedInList" : "6/18/2020 19:16:32", + "firstStructureIsSelectedInList" : "tok 8/7/2020 16:27", "listLevel" : "kh 6/19/2020 10:04", "listTextStructure" : "tok 8/7/2020 15:51", - "listTextStructureStyles" : "tok 6/12/2020 12:12", - "menu" : "ls 6/18/2019 16:37", - "setUpHalfBoldTestText" : "lh 7/24/2019 20:04", - "testUS18SelectionStyleIsAppliedToSelection" : "MB 7/25/2019 12:28", - "testUS18TextStyleIsSelectedInList" : "MB 7/25/2019 12:27", - "testUS32StructureIsRendered" : "frc 8/7/2020 14:10", - "testUS44OldButtonsHaveBeenRemoved" : "ls 6/18/2019 15:57", + "setUpHalfBoldTestText" : "tok 8/7/2020 16:26", + "structureListLabel" : "tok 8/7/2020 16:28", + "testUS18SelectionStyleIsAppliedToSelection" : "tok 8/7/2020 18:41", + "testUS18TextStyleIsSelectedInList" : "tok 8/7/2020 18:41", + "testUS32StructureIsRendered" : "tok 8/7/2020 16:18", "testUS44SelectedStructureIsAssigned" : "ls 6/18/2019 16:00", - "testUS44SelectedStylesChangeAccordingToSelectedText" : "lh 7/24/2019 21:38", - "testUS44StructureListExists" : "AG 6/18/2019 15:22", - "testUS61StructureShortcutIsAppliedToNextText" : "tok 6/13/2020 16:27", - "testUS61StructureShortcutTogglesStructureEndOfText" : "tok 6/13/2020 16:25", - "testUS61StructureShortcutTogglesStructureSelectedText" : "tok 6/13/2020 16:26", - "testUS64IndentedStructureIsRendered" : "kh 6/19/2020 10:04", - "textHasCombinedStyle" : "AG 7/25/2019 13:22" } } + "testUS44SelectedStylesChangeAccordingToSelectedText" : "tok 8/7/2020 18:44", + "testUS44StructureListExists" : "tok 8/7/2020 18:49", + "testUS61StructureShortcutIsAppliedToNextText" : "tok 8/7/2020 17:36", + "testUS61StructureShortcutTogglesStructureEndOfText" : "tok 8/7/2020 18:50", + "testUS61StructureShortcutTogglesStructureSelectedText" : "tok 8/7/2020 18:50", + "testUS64IndentedStructureIsRendered" : "tok 8/7/2020 18:50", + "textHasCombinedEmphasisCode" : "tok 8/7/2020 16:18" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/ctrlButtonCode.st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/ctrlButtonCode.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/ctrlButtonCode.st rename to packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/ctrlButtonCode.st diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/demoText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/demoString.st similarity index 77% rename from packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/demoText.st rename to packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/demoString.st index fda6c0c..809daa4 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/demoText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/demoString.st @@ -1,5 +1,5 @@ -utilities -demoText +constants +demoString ^ 'This is a test ÖÜ. Another line;!@#$%^&*()_+=-[]{};: \|/?.>,<''' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterExampleStringOntoTextField.st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterExampleStringOntoTextField.st new file mode 100644 index 0000000..0c4e3d7 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterExampleStringOntoTextField.st @@ -0,0 +1,4 @@ +utilities +enterExampleStringOntoTextField + + self enterStringOntoTextField: self exampleString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterStringInSaveDialog..st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterStringInSaveDialog..st index 22e9ef6..5da3616 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterStringInSaveDialog..st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/enterStringInSaveDialog..st @@ -1,4 +1,4 @@ utilities enterStringInSaveDialog: aString - ^ self answer: aString inDialog: [self editorModel saveDocumentInSaverWithNamePrompt] \ No newline at end of file + ^ self answer: aString inDialog: [self editorModel saveDocumentWithNamePrompt] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/exampleString.st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/exampleString.st index df81c1e..510d627 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/exampleString.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/exampleString.st @@ -1,4 +1,4 @@ constants exampleString - ^ 'test' \ No newline at end of file + ^ 'This is a test text.' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithAttributes.st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithAttributes.st index 7833ac3..dfad78d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithAttributes.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithAttributes.st @@ -2,7 +2,7 @@ constants textWithAttributes | text | - text := ('hello', RichTextEditor paragraphCharacter asString, 'world') asText. + text := self textWithParagraph. text := text addAttribute: self boldTextStructure from: 1 to: 6. text := text addAttribute: self italicTextStructure from: 7 to: 11. ^ text \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithParagraph.st b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithParagraph.st new file mode 100644 index 0000000..2d237e0 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/instance/textWithParagraph.st @@ -0,0 +1,4 @@ +constants +textWithParagraph + + ^ ('hello' , RichTextEditor paragraphCharacter asString , 'world') asText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/methodProperties.json index 2673a56..d97543c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTestCase.class/methodProperties.json @@ -8,7 +8,9 @@ "buttonWithLabelExists:" : "AG 5/29/2019 22:21", "closeAllMenus" : "frc 6/16/2020 20:46", "closeWindowsWithLabel:" : "frc 7/30/2020 10:28", + "ctrlButtonCode" : "tok 8/7/2020 19:17", "ctrlShiftButtonCode" : "tok 8/3/2020 14:49", + "demoString" : "tok 8/7/2020 16:21", "doMenuActionByLabel:" : "frc 6/18/2020 19:00", "document" : "frc 7/13/2020 12:12", "documentMenu" : "frc 6/25/2020 16:24", @@ -19,11 +21,12 @@ "editorView" : "ls 5/8/2019 19:54", "editorView:" : "JEH 5/31/2020 15:01", "emphasisCodeNoStyle" : "tok 8/3/2020 14:56", + "enterExampleStringOntoTextField" : "tok 8/7/2020 17:30", "enterString:inBackwardsCompatibleDialog:" : "MB 7/24/2019 18:53", "enterString:inBackwardsCompatibleDialog:withAlternativeNumber:" : "tok 7/9/2020 21:57", - "enterStringInSaveDialog:" : "tok 7/9/2020 21:57", + "enterStringInSaveDialog:" : "tok 8/7/2020 19:08", "enterStringOntoTextField:" : "MB 7/24/2019 18:55", - "exampleString" : "frc 8/7/2020 10:27", + "exampleString" : "tok 8/7/2020 16:37", "exampleTextStructure" : "tok 8/7/2020 15:51", "flattenTextAttributes:" : "tok 8/4/2020 16:33", "htmlFormattedDocument" : "tok 8/7/2020 15:51", @@ -44,6 +47,7 @@ "textIsBold" : "tok 8/4/2020 16:41", "textView" : "MB 5/22/2019 17:55", "textViewWrapper" : "MB 5/15/2019 19:08", - "textWithAttributes" : "OS 8/7/2020 09:50", + "textWithAttributes" : "tok 8/7/2020 17:08", + "textWithParagraph" : "tok 8/7/2020 17:08", "triangleIsVisible" : "lh 6/18/2019 15:20", "windowsWithLabel:" : "frc 7/30/2020 10:26" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/anotherText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/anotherText.st deleted file mode 100644 index 05865e2..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/anotherText.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -anotherText - - ^ 'This is another test text.' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/addStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/createTestStructure.st similarity index 75% rename from packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/addStructure.st rename to packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/createTestStructure.st index efd9b0d..b838470 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/addStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/createTestStructure.st @@ -1,4 +1,4 @@ utilities -addStructure +createTestStructure self editorModel createNewStructure: #testStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/enterSaveNameInSaveAs.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/enterSaveNameInSaveAs.st new file mode 100644 index 0000000..0c100d9 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/enterSaveNameInSaveAs.st @@ -0,0 +1,5 @@ +acceptance-tests +enterSaveNameInSaveAs + + self enterSaveNameInDialog: [self editorModel + perform: (self menuActionByLabel: self saveAsButtonLabel)] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/instance.equals..st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/instance.equals..st deleted file mode 100644 index ba0ec04..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/instance.equals..st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -instance: anObject equals: anotherObject - - ^ anObject ~~ anotherObject \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/registeredOpenCommandsOfWorldMenuIncludes..st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/registeredOpenCommandsOfWorldMenuIncludes..st deleted file mode 100644 index 6b79fdd..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/registeredOpenCommandsOfWorldMenuIncludes..st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -registeredOpenCommandsOfWorldMenuIncludes: aOpenCommand - - ^ TheWorldMenu registeredOpenCommands includes: aOpenCommand \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/saveButtonLabel.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/saveButtonLabel.st new file mode 100644 index 0000000..39a5f23 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/saveButtonLabel.st @@ -0,0 +1,4 @@ +constants +saveButtonLabel + + ^ 'Save' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/setupBoldText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/setupBoldText.st index d88deec..38f355b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/setupBoldText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/setupBoldText.st @@ -1,6 +1,6 @@ running setupBoldText - self enterStringOntoTextField: self text. + self enterExampleStringOntoTextField. self textEditor selectAll. self selectOptionBold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testDocumentInfoContainsWordcount.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testDocumentInfoContainsWordcount.st index 0d8ee79..4aceffb 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testDocumentInfoContainsWordcount.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testDocumentInfoContainsWordcount.st @@ -1,5 +1,5 @@ unit-tests testDocumentInfoContainsWordcount - self enterStringOntoTextField: self anotherText asText. + self enterExampleStringOntoTextField. self assert: (self editorModel infoText includesSubstring: (self document wordcount asString)) diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testInspectDocument.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testInspectDocument.st index 55be8dc..a74d93c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testInspectDocument.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testInspectDocument.st @@ -2,5 +2,6 @@ unit-tests testInspectDocument self editorModel inspectDocument. - self assert: (self windowsWithLabel: (self inspectDocumentWindowLabel)) notEmpty. - self closeWindowsWithLabel: self inspectDocumentWindowLabel \ No newline at end of file + self + assert: (self windowsWithLabel: (self inspectDocumentWindowLabel)) notEmpty; + closeWindowsWithLabel: self inspectDocumentWindowLabel \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testOpenTemplateEditor.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testOpenTemplateEditor.st index fcb6b0a..d0add73 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testOpenTemplateEditor.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testOpenTemplateEditor.st @@ -4,5 +4,5 @@ testOpenTemplateEditor | windowCount | windowCount := (self windowsWithLabel: self structureEditorLabel) size. self doMenuActionByLabel: self templateButtonLabel. - self assert: ((self windowsWithLabel: self structureEditorLabel) size > windowCount). + self assert: (self windowsWithLabel: self structureEditorLabel) size > windowCount. self closeWindowsWithLabel: self structureEditorLabel \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testRedoStructureWith..st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testRedoStructureWith..st index 82c85a4..3b9792a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testRedoStructureWith..st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testRedoStructureWith..st @@ -1,7 +1,7 @@ utilities testRedoStructureWith: aRedoBlock - self enterStringOntoTextField: self text. + self enterExampleStringOntoTextField. self textEditor selectAll. self selectOptionBold. self editorModel undo. diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testSaveTextAccessorSavesUnsavedChanges.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testSaveTextAccessorSavesUnsavedChanges.st index d9fd4f1..a9433c0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testSaveTextAccessorSavesUnsavedChanges.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testSaveTextAccessorSavesUnsavedChanges.st @@ -1,7 +1,7 @@ unit-tests testSaveTextAccessorSavesUnsavedChanges - self enterStringOntoTextField: self anotherText. + self enterExampleStringOntoTextField. self assert: self editorModel hasUnacceptedEdits. self editorModel saveText: self editorModel text. self deny: self editorModel hasUnacceptedEdits \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testTextSizeReturnsCorrectSize.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testTextSizeReturnsCorrectSize.st index 69543e4..ca4082e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testTextSizeReturnsCorrectSize.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testTextSizeReturnsCorrectSize.st @@ -1,5 +1,5 @@ unit-tests testTextSizeReturnsCorrectSize - self enterStringOntoTextField: self anotherText. - self assert: self textEditor textSize equals: self anotherText size \ No newline at end of file + self enterExampleStringOntoTextField. + self assert: self textEditor textSize equals: self exampleString size \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04LoadedTextIsInsertedIntoEditor.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04LoadedTextIsInsertedIntoEditor.st index 9f6e716..c96089d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04LoadedTextIsInsertedIntoEditor.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04LoadedTextIsInsertedIntoEditor.st @@ -2,10 +2,10 @@ acceptance-tests testUS04LoadedTextIsInsertedIntoEditor self editorModel - setText: self text; + setText: self exampleString; saveText. - self enterSaveNameInDialog: [self editorModel saveDocumentInSaverWithNamePrompt]. - self editorModel setText: self anotherText. + self enterSaveNameInDialog: [self editorModel saveDocumentWithNamePrompt]. + self editorModel setText: self demoString. self loadDocumentFromSaver. - self assert: self editorModel text equals: self text \ No newline at end of file + self assert: self editorModel text equals: self exampleString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveAsButtonLetsChooseNameAndSavesInImage.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveAsButtonLetsChooseNameAndSavesInImage.st index 551643c..821a765 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveAsButtonLetsChooseNameAndSavesInImage.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveAsButtonLetsChooseNameAndSavesInImage.st @@ -1,5 +1,5 @@ acceptance-tests testUS04SaveAsButtonLetsChooseNameAndSavesInImage - self enterSaveNameInDialog: [self editorModel perform: (self menuActionByLabel: self saveAsButtonLabel)]. + self enterSaveNameInSaveAs. self assert: (self editorSavesIncludeKey: self saveName) diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveButtonExists.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveButtonExists.st index 771cf9d..0ef4a35 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveButtonExists.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SaveButtonExists.st @@ -1,4 +1,4 @@ acceptance-tests testUS04SaveButtonExists - self assert: (self menuItemWithLabelExists: 'Save') \ No newline at end of file + self assert: (self menuItemWithLabelExists: self saveButtonLabel) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SavedTextDoesntChange.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SavedTextDoesntChange.st index 6ea7552..7d0aa24 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SavedTextDoesntChange.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS04SavedTextDoesntChange.st @@ -2,10 +2,10 @@ acceptance-tests testUS04SavedTextDoesntChange self editorModel - setText: self text; + setText: self demoString; saveText. - self enterSaveNameInDialog: [self editorModel saveDocumentInSaverWithNamePrompt]. - self editorModel setText: self anotherText. + self enterSaveNameInDialog: [self editorModel saveDocumentWithNamePrompt]. + self editorModel setText: self exampleString. self loadDocumentFromSaver. - self assert: (self instance: self text equals: self editorModel text) \ No newline at end of file + self assert: self demoString = self editorModel text asString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoButtonRedoesChanges.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoButtonRedoesChanges.st index a1c8518..e526ce5 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoButtonRedoesChanges.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoButtonRedoesChanges.st @@ -1,8 +1,8 @@ acceptance-tests testUS07RedoButtonRedoesChanges - self enterStringOntoTextField: self anotherText. + self enterExampleStringOntoTextField. self editorModel undo. self clickRedoButton; - assert: self editorModel text equals: self anotherText \ No newline at end of file + assert: self editorModel text equals: self exampleString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoKeyboardShortcut.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoKeyboardShortcut.st index c07befa..1eb6f84 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoKeyboardShortcut.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07RedoKeyboardShortcut.st @@ -1,8 +1,8 @@ acceptance-tests testUS07RedoKeyboardShortcut - self enterStringOntoTextField: self text. + self enterExampleStringOntoTextField. self editorModel undo. self simulateRedoShortcut. - self assert: self editorText = self text \ No newline at end of file + self assert: self editorText = self exampleString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoButtonUndoesChanges.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoButtonUndoesChanges.st index d7a3abc..9a2d3a8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoButtonUndoesChanges.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoButtonUndoesChanges.st @@ -2,6 +2,6 @@ acceptance-tests testUS07UndoButtonUndoesChanges self - enterStringOntoTextField: self text; + enterExampleStringOntoTextField; clickUndoButton; assert: self editorText = '' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoChangesText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoChangesText.st index 61021ed..3d0b68f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoChangesText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoChangesText.st @@ -1,7 +1,7 @@ acceptance-tests testUS07UndoChangesText - self enterStringOntoTextField: self text. + self enterExampleStringOntoTextField. self editorModel undo. - self deny: self editorModel text = self text \ No newline at end of file + self deny: self editorModel text = self exampleString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoKeyboardShortcut.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoKeyboardShortcut.st index 904d378..5dfa476 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoKeyboardShortcut.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS07UndoKeyboardShortcut.st @@ -2,7 +2,7 @@ acceptance-tests testUS07UndoKeyboardShortcut self - enterStringOntoTextField: self text; + enterExampleStringOntoTextField; simulateUndoShortcut; assert: self editorText = '' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewLine.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewLine.st index 4792c18..a2aa853 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewLine.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewLine.st @@ -1,7 +1,8 @@ acceptance-tests testUS09CreateNewLine - self enterStringOntoTextField: 'hallo'. - self pressShiftEnter. - self assert: self editorModel text equals: ('hallo', String lf) asText + self + enterExampleStringOntoTextField; + pressShiftEnter; + assert: self editorModel text equals: (self exampleString, String lf) asText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewParagraph.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewParagraph.st index 4789aff..8725c4d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewParagraph.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS09CreateNewParagraph.st @@ -1,6 +1,8 @@ acceptance-tests testUS09CreateNewParagraph - self enterStringOntoTextField: 'hallo'. - self pressEnter. - self assert: self editorModel text equals: ('hallo', RichTextEditor paragraphCharacter asString) asText \ No newline at end of file + self + enterExampleStringOntoTextField; + pressEnter; + assert: self editorModel text + equals: (self exampleString, RichTextEditor paragraphCharacter asString) asText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS183ChangedStructureKeymapAllowsNewShortcuts.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS183ChangedStructureKeymapAllowsNewShortcuts.st index c72b98a..f557be2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS183ChangedStructureKeymapAllowsNewShortcuts.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS183ChangedStructureKeymapAllowsNewShortcuts.st @@ -3,7 +3,7 @@ testUS183ChangedStructureKeymapAllowsNewShortcuts self changeStructureKeymap; - enterStringOntoTextField: self text. + enterExampleStringOntoTextField. self textEditor selectAll. self simulateKeyboardShortcutForStructure1; diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS19ButtonInAppsMenuExists.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS19ButtonInAppsMenuExists.st index fe046df..9bf11b0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS19ButtonInAppsMenuExists.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS19ButtonInAppsMenuExists.st @@ -1,4 +1,5 @@ acceptance-tests testUS19ButtonInAppsMenuExists - - self assert: (self registeredOpenCommandsOfWorldMenuIncludes: self richTextEditorOpenCommand). \ No newline at end of file + + self assert: (TheWorldMenu registeredOpenCommands + includes: self richTextEditorOpenCommand) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveAsButtonChangesLabel.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveAsButtonChangesLabel.st index 355e2e9..6230187 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveAsButtonChangesLabel.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveAsButtonChangesLabel.st @@ -1,5 +1,6 @@ acceptance-tests testUS24SaveAsButtonChangesLabel - self enterSaveNameInDialog: [self editorModel perform: (self menuActionByLabel: 'Save as')]. - self assert: self editorModel label equals: self editorModel class initialLabel, ' - ' , self saveName \ No newline at end of file + self enterSaveNameInSaveAs. + self assert: self editorModel label + equals: self editorModel class initialLabel , ' - ' , self saveName \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveButtonSavesInImage.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveButtonSavesInImage.st index 66d5d64..7ae2395 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveButtonSavesInImage.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS24SaveButtonSavesInImage.st @@ -1,7 +1,7 @@ acceptance-tests testUS24SaveButtonSavesInImage - self enterSaveNameInDialog: [self editorModel perform: (self menuActionByLabel: 'Save as')]. - self doMenuActionByLabel: 'Save'. - - self assert: (self editorSavesIncludeKey: self editorModel currentSaveName) \ No newline at end of file + self + enterSaveNameInSaveAs; + doMenuActionByLabel: self saveButtonLabel; + assert: (self editorSavesIncludeKey: self editorModel currentSaveName) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS46NewEditorIsOpened.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS46NewEditorIsOpened.st index b733084..7a10858 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS46NewEditorIsOpened.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS46NewEditorIsOpened.st @@ -4,6 +4,7 @@ testUS46NewEditorIsOpened | currentMorphCount | self closeAllMenus. currentMorphCount := ActiveWorld submorphCount. - self doMenuActionByLabel: 'New'. - self closeAllMenus. - self assert: currentMorphCount + 1 equals: ActiveWorld submorphCount + self + doMenuActionByLabel: self newButtonLabel; + closeAllMenus; + assert: currentMorphCount + 1 equals: ActiveWorld submorphCount diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsAddedTheTriangleShows.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsAddedTheTriangleShows.st index 3e8db08..85483ed 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsAddedTheTriangleShows.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsAddedTheTriangleShows.st @@ -1,6 +1,7 @@ acceptance-tests testUS47WhenStructureIsAddedTheTriangleShows - self deny: self triangleIsVisible. - self addStructure. - self assert: self triangleIsVisible \ No newline at end of file + self + deny: self triangleIsVisible; + createTestStructure; + assert: self triangleIsVisible \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsRemovedTheTriangleShows.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsRemovedTheTriangleShows.st index d8df34a..9bf7983 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsRemovedTheTriangleShows.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS47WhenStructureIsRemovedTheTriangleShows.st @@ -1,6 +1,7 @@ acceptance-tests testUS47WhenStructureIsRemovedTheTriangleShows - self deny: self triangleIsVisible. - self removeStructure. - self assert: self triangleIsVisible \ No newline at end of file + self + deny: self triangleIsVisible; + removeStructure; + assert: self triangleIsVisible \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS63InfoWindowShowsWordcount.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS63InfoWindowShowsWordcount.st index bf08862..a9ef4a2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS63InfoWindowShowsWordcount.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS63InfoWindowShowsWordcount.st @@ -2,7 +2,7 @@ acceptance-tests testUS63InfoWindowShowsWordcount | infoWindow | - self enterStringOntoTextField: self anotherText asText. + self enterExampleStringOntoTextField. infoWindow := self editorModel showInfo. self assert: (infoWindow messageMorph text string includesSubstring: (self document wordcount asString)). infoWindow abandon \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpBrowserIsOpended.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpBrowserIsOpended.st index 9080fb1..68ebdde 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpBrowserIsOpended.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpBrowserIsOpended.st @@ -6,5 +6,5 @@ testUS67HelpBrowserIsOpended helpButton := self editorView findByLabel: self helpButtonLabel. helpButton click. - self assert: ((self windowsWithLabel: self helpBrowserLabel) size > currentHelpEditorNumber). + self assert: (self windowsWithLabel: self helpBrowserLabel) size > currentHelpEditorNumber. self closeWindowsWithLabel: self helpBrowserLabel \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpButtonExists.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpButtonExists.st index ccaef7f..370a9e2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpButtonExists.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS67HelpButtonExists.st @@ -1,4 +1,4 @@ acceptance-tests testUS67HelpButtonExists - self assert: (self buttonWithLabelExists: 'Help') \ No newline at end of file + self assert: (self buttonWithLabelExists: self helpButtonLabel) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonExists.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonExists.st index 72f33d2..8ae5a29 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonExists.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonExists.st @@ -1,4 +1,4 @@ acceptance-tests testUS87ExportAsButtonExists - self assert: (self menuItemWithLabelExists: 'Export as ...') \ No newline at end of file + self assert: (self menuItemWithLabelExists: self exportAsButtonLabel) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonOpensExportChooser.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonOpensExportChooser.st index 94397f7..411cad2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonOpensExportChooser.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUS87ExportAsButtonOpensExportChooser.st @@ -3,7 +3,7 @@ testUS87ExportAsButtonOpensExportChooser | notificationName | - [self editorModel perform: (self menuActionByLabel: 'Export as ...')] + [self editorModel perform: (self menuActionByLabel: self exportAsButtonLabel)] on: ProvideAnswerNotification do: [:notification | notificationName := notification messageText. diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUndoRestoresPreviousStructuresWith..st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUndoRestoresPreviousStructuresWith..st index 1b07155..0c88901 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUndoRestoresPreviousStructuresWith..st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/testUndoRestoresPreviousStructuresWith..st @@ -1,7 +1,7 @@ utilities testUndoRestoresPreviousStructuresWith: anUndoBlock - self enterStringOntoTextField: self text. + self enterExampleStringOntoTextField. self textEditor selectFrom: 1 to: 2. self selectOptionBold. self textEditor selectAll. diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/text.st b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/text.st deleted file mode 100644 index 92fc4c2..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/instance/text.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -text - - ^ 'This is a test text.' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json index ea6e054..2b68381 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json @@ -2,26 +2,24 @@ "class" : { }, "instance" : { - "addStructure" : "ls 6/12/2019 17:54", - "anotherText" : "MB 7/25/2019 11:03", "autocompletionPreference" : "kh 5/24/2020 18:57", "changeStructureKeymap" : "tok 8/7/2020 10:15", "clickRedoButton" : "tok 8/3/2020 15:04", "clickUndoButton" : "tok 8/3/2020 15:03", "crKeyCode" : "MB 5/15/2019 20:53", - "ctrlButtonCode" : "MB 5/15/2019 21:04", + "createTestStructure" : "tok 8/7/2020 16:39", "deselectOptionBold" : "tok 8/4/2020 16:55", "editorSavesIncludeKey:" : "MB 5/22/2019 18:01", "editorStructureKeymap" : "tok 8/7/2020 11:17", "enableAutocompletion" : "frc 7/3/2020 21:45", "enterSaveNameInDialog:" : "tok 7/9/2020 21:57", + "enterSaveNameInSaveAs" : "tok 8/7/2020 19:06", "exportAsButtonLabel" : "tok 7/8/2020 16:28", "footerContainsColNumber" : "JEH 6/14/2020 12:43", "footerContainsLineNumber" : "JEH 6/14/2020 12:43", "helpBrowserLabel" : "frc 8/7/2020 13:52", "helpButtonLabel" : "kh 5/25/2020 22:42", "inspectDocumentWindowLabel" : "frc 8/1/2020 11:27", - "instance:equals:" : "lh 7/24/2019 18:46", "loadDocumentFromSaver" : "tok 7/8/2020 16:09", "manageStructuresLabel" : "frc 8/1/2020 11:36", "newButtonLabel" : "MB 6/12/2019 19:18", @@ -31,14 +29,14 @@ "pressShiftEnter" : "MB 5/15/2019 20:54", "redoButtonLabel" : "frc 7/16/2020 13:43", "regExFoundInFooter:" : "JEH 6/14/2020 12:43", - "registeredOpenCommandsOfWorldMenuIncludes:" : "MB 5/15/2019 21:27", "removeStructure" : "ls 7/24/2019 17:24", "restoreAutocompletion" : "frc 7/3/2020 21:46", "richTextEditorOpenCommand" : "ls 6/22/2019 10:49", "saveAsButtonLabel" : "frc 8/7/2020 10:55", + "saveButtonLabel" : "tok 8/7/2020 18:54", "saveName" : "MB 7/25/2019 11:02", "setUp" : "tok 8/7/2020 11:18", - "setupBoldText" : "tok 8/4/2020 17:30", + "setupBoldText" : "tok 8/7/2020 17:30", "shiftButtonCode" : "MB 5/15/2019 21:06", "simulateRedoShortcut" : "tok 8/4/2020 15:23", "simulateUndoShortcut" : "tok 8/3/2020 14:59", @@ -52,27 +50,27 @@ "testInitializeCompletionControllerAddsDependent" : "frc 8/7/2020 15:55", "testInspectDocument" : "JEH 8/3/2020 15:03", "testOpenStructureEditor" : "frc 8/1/2020 11:36", - "testOpenTemplateEditor" : "frc 8/1/2020 11:55", + "testOpenTemplateEditor" : "tok 8/7/2020 19:21", "testRedoStructureUnapplyUnappliesStructureWith:" : "tok 8/6/2020 14:51", - "testRedoStructureWith:" : "tok 8/6/2020 14:51", - "testSaveTextAccessorSavesUnsavedChanges" : "frc 8/1/2020 12:04", + "testRedoStructureWith:" : "tok 8/7/2020 17:30", + "testSaveTextAccessorSavesUnsavedChanges" : "tok 8/7/2020 17:30", "testTargetDocumentSavesTextStructures" : "frc 8/1/2020 11:56", - "testTextSizeReturnsCorrectSize" : "6/18/2020 19:22:35", + "testTextSizeReturnsCorrectSize" : "tok 8/7/2020 17:30", "testUS04LoadButtonExists" : "frc 8/7/2020 13:11", - "testUS04LoadedTextIsInsertedIntoEditor" : "frc 8/7/2020 13:12", + "testUS04LoadedTextIsInsertedIntoEditor" : "tok 8/7/2020 19:08", "testUS04SaveAsButtonExists" : "frc 8/7/2020 13:12", - "testUS04SaveAsButtonLetsChooseNameAndSavesInImage" : "frc 8/7/2020 13:12", - "testUS04SaveButtonExists" : "frc 8/7/2020 13:12", - "testUS04SavedTextDoesntChange" : "frc 8/7/2020 13:12", + "testUS04SaveAsButtonLetsChooseNameAndSavesInImage" : "tok 8/7/2020 19:06", + "testUS04SaveButtonExists" : "tok 8/7/2020 18:54", + "testUS04SavedTextDoesntChange" : "tok 8/7/2020 19:08", "testUS07RedoButtonExists" : "frc 7/16/2020 13:43", - "testUS07RedoButtonRedoesChanges" : "tok 8/3/2020 15:05", - "testUS07RedoKeyboardShortcut" : "tok 8/4/2020 17:17", + "testUS07RedoButtonRedoesChanges" : "tok 8/7/2020 17:31", + "testUS07RedoKeyboardShortcut" : "tok 8/7/2020 17:31", "testUS07UndoButtonExists" : "frc 7/16/2020 13:43", - "testUS07UndoButtonUndoesChanges" : "tok 8/4/2020 17:23", - "testUS07UndoChangesText" : "tok 8/4/2020 17:23", - "testUS07UndoKeyboardShortcut" : "tok 8/4/2020 17:22", - "testUS09CreateNewLine" : "frc 8/7/2020 13:13", - "testUS09CreateNewParagraph" : "frc 8/7/2020 13:13", + "testUS07UndoButtonUndoesChanges" : "tok 8/7/2020 17:31", + "testUS07UndoChangesText" : "tok 8/7/2020 17:31", + "testUS07UndoKeyboardShortcut" : "tok 8/7/2020 17:31", + "testUS09CreateNewLine" : "tok 8/7/2020 19:11", + "testUS09CreateNewParagraph" : "tok 8/7/2020 19:12", "testUS142RedoButtonRedoesStructure" : "tok 8/4/2020 17:07", "testUS142RedoButtonStructureUnapplyUnappliesStructure" : "tok 8/4/2020 17:15", "testUS142RedoRedoesStructure" : "tok 8/4/2020 17:07", @@ -89,29 +87,28 @@ "testUS142UndoStructureUnapplyReappliesStructure" : "tok 8/4/2020 17:20", "testUS142UndoUndoesStructure" : "tok 8/4/2020 17:04", "testUS183ChangeStructureKeymap" : "tok 8/7/2020 11:07", - "testUS183ChangedStructureKeymapAllowsNewShortcuts" : "tok 8/7/2020 11:25", - "testUS19ButtonInAppsMenuExists" : "MB 5/15/2019 21:29", + "testUS183ChangedStructureKeymapAllowsNewShortcuts" : "tok 8/7/2020 17:31", + "testUS19ButtonInAppsMenuExists" : "tok 8/7/2020 18:59", "testUS19WindowsOpensWithoutFailure" : "MB 5/15/2019 21:30", - "testUS24SaveAsButtonChangesLabel" : "frc 8/7/2020 13:13", - "testUS24SaveButtonSavesInImage" : "frc 8/7/2020 13:13", + "testUS24SaveAsButtonChangesLabel" : "tok 8/7/2020 19:12", + "testUS24SaveButtonSavesInImage" : "tok 8/7/2020 19:06", "testUS46NewButtonExists" : "frc 6/21/2020 20:25", - "testUS46NewEditorIsOpened" : "frc 6/16/2020 20:41", - "testUS47WhenStructureIsAddedTheTriangleShows" : "ls 7/25/2019 13:20", - "testUS47WhenStructureIsRemovedTheTriangleShows" : "ls 7/25/2019 13:20", + "testUS46NewEditorIsOpened" : "tok 8/7/2020 19:19", + "testUS47WhenStructureIsAddedTheTriangleShows" : "tok 8/7/2020 19:13", + "testUS47WhenStructureIsRemovedTheTriangleShows" : "tok 8/7/2020 19:13", "testUS60DisableAutocompletion" : "frc 8/7/2020 13:13", "testUS60EnableAutocompletion" : "frc 8/7/2020 13:13", "testUS62ColNumberIsShownInFooter" : "JEH 6/14/2020 12:36", "testUS62LineNumberIsShownInFooter" : "JEH 6/14/2020 12:40", "testUS63InfoButtonExists" : "6/1/2020 14:03:20", - "testUS63InfoWindowShowsWordcount" : "frc 6/18/2020 20:51", - "testUS67HelpBrowserIsOpended" : "frc 8/1/2020 11:58", - "testUS67HelpButtonExists" : "kh 5/25/2020 22:35", + "testUS63InfoWindowShowsWordcount" : "tok 8/7/2020 17:31", + "testUS67HelpBrowserIsOpended" : "tok 8/7/2020 19:14", + "testUS67HelpButtonExists" : "tok 8/7/2020 19:16", "testUS84ImportFileButtonExists" : "tok 7/8/2020 16:23", "testUS86TimeLastSavedIsUpdatedWhenSaving" : "frc 8/7/2020 13:14", - "testUS87ExportAsButtonExists" : "tok 7/3/2020 20:15", - "testUS87ExportAsButtonOpensExportChooser" : "tok 7/10/2020 12:07", - "testUndoRestoresPreviousStructuresWith:" : "tok 8/7/2020 15:51", + "testUS87ExportAsButtonExists" : "tok 8/7/2020 19:16", + "testUS87ExportAsButtonOpensExportChooser" : "tok 8/7/2020 19:16", + "testUndoRestoresPreviousStructuresWith:" : "tok 8/7/2020 17:31", "testUndoStructureUnapplyReappliesStructureWith:" : "tok 8/6/2020 14:51", "testUndoStructureWith:" : "tok 8/6/2020 14:52", - "text" : "MB 7/25/2019 11:02", "undoButtonLabel" : "frc 7/16/2020 13:43" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/activateHeading.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/activateHeading.st index a20f7bf..9567871 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/activateHeading.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/activateHeading.st @@ -1,4 +1,6 @@ utilities activateHeading - self editorModel structureSelectionAt: self headingTextStructureIndex put: true \ No newline at end of file + self editorModel + structureSelectionAt: (self editorModel textStructureSymbols indexOf: #heading1) + put: true \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/addMoreText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/addMoreText.st deleted file mode 100644 index 0fc44b6..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/addMoreText.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -addMoreText - - self enterStringOntoTextField: 'More text' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/emphasisCodeBold.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/emphasisCodeBold.st deleted file mode 100644 index 7c73a66..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/emphasisCodeBold.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -emphasisCodeBold - - ^ 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/enterNothingInSaveDialog.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/enterNothingInSaveDialog.st deleted file mode 100644 index d7b0556..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/enterNothingInSaveDialog.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -enterNothingInSaveDialog - - self enterStringInSaveDialog: ''. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingIsAddedToWrittenText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingIsAddedToWrittenText.st index dfa870f..7d7de6f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingIsAddedToWrittenText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingIsAddedToWrittenText.st @@ -1,9 +1,9 @@ utilities headingIsAddedToWrittenText - self moveCaretToBeginningOfOtherText. - ^ self editorModel bufferDocument class + self moveCaretRightBy: self exampleString size. + ^ self document class hasStructure: #heading1 - forText: self editorText + for: self editorText from: self caretPosition + 1 - to: (self caretPosition + self otherText size - 2) \ No newline at end of file + to: (self caretPosition + self exampleString size - 2) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingTextStructureIndex.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingTextStructureIndex.st deleted file mode 100644 index 57f8744..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/headingTextStructureIndex.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -headingTextStructureIndex - - ^ self editorModel textStructureSymbols indexOf: #heading1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/leftArrowKey.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/leftArrowKey.st deleted file mode 100644 index 067438e..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/leftArrowKey.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -leftArrowKey - - ^ Character arrowLeft \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/middleTextOffset.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/middleTextOffset.st index 13f590f..c8c12a7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/middleTextOffset.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/middleTextOffset.st @@ -1,4 +1,4 @@ -utilities +constants middleTextOffset ^ 8 diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaret.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaret.st index bf2e503..0882fb7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaret.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaret.st @@ -1,5 +1,5 @@ utilities moveCaret - - self moveCaretMultipleTimesRight: 5. - self moveCaretMultipleTimesLeft: 3 \ No newline at end of file + + self moveCaretRightBy: 5. + self moveCaretLeftBy: 3 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretLeftBy..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretLeftBy..st new file mode 100644 index 0000000..ba49af0 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretLeftBy..st @@ -0,0 +1,4 @@ +utilities +moveCaretLeftBy: aNumber + + self enterCharacter: Character arrowLeft times: aNumber \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretMultipleTimesLeft..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretMultipleTimesLeft..st deleted file mode 100644 index e399fb7..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretMultipleTimesLeft..st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -moveCaretMultipleTimesLeft: aNumber - - self enterCharacter: self leftArrowKey times: aNumber \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretMultipleTimesRight..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretMultipleTimesRight..st deleted file mode 100644 index 6cf0c91..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretMultipleTimesRight..st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -moveCaretMultipleTimesRight: aNumber - - self enterCharacter: self rightArrowKey times: aNumber \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretRightBy..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretRightBy..st new file mode 100644 index 0000000..41b1ae5 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretRightBy..st @@ -0,0 +1,4 @@ +utilities +moveCaretRightBy: aNumber + + self enterCharacter: Character arrowRight times: aNumber \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginOfText.st new file mode 100644 index 0000000..5867862 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginOfText.st @@ -0,0 +1,6 @@ +utilities +moveCaretToBeginOfText + + self + moveCaretLeftBy: self editorText size; + caretPosition: 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginningOfOtherText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginningOfOtherText.st deleted file mode 100644 index 04fdb03..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginningOfOtherText.st +++ /dev/null @@ -1,5 +0,0 @@ -utilities -moveCaretToBeginningOfOtherText - - self - moveCaretMultipleTimesLeft: self otherText size \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginningOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginningOfText.st deleted file mode 100644 index 172eb1c..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToBeginningOfText.st +++ /dev/null @@ -1,6 +0,0 @@ -utilities -moveCaretToBeginningOfText - - self - moveCaretMultipleTimesLeft: self editorText size; - caretPosition: 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToEndOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToEndOfText.st index 1a96ad6..b3f964c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToEndOfText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToEndOfText.st @@ -2,5 +2,5 @@ utilities moveCaretToEndOfText self - moveCaretMultipleTimesRight: self editorText size; + moveCaretRightBy: self editorText size; caretPosition: self editorText size. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToMidOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToMidOfText.st index 72ee38b..20c056f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToMidOfText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/moveCaretToMidOfText.st @@ -2,6 +2,6 @@ utilities moveCaretToMidOfText self - moveCaretToBeginningOfText; - moveCaretMultipleTimesRight: self middleTextOffset; + moveCaretToBeginOfText; + moveCaretRightBy: self middleTextOffset; caretPosition: self middleTextOffset. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/multipleLineText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/multipleLineString.st similarity index 77% rename from packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/multipleLineText.st rename to packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/multipleLineString.st index 94e9ae9..ae8afc9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/multipleLineText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/multipleLineString.st @@ -1,5 +1,5 @@ constants -multipleLineText +multipleLineString ^ 'This is a text diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/otherText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/otherText.st deleted file mode 100644 index 48fe049..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/otherText.st +++ /dev/null @@ -1,5 +0,0 @@ -constants -otherText - - ^ 'This is other Text.' - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/rightArrowKey.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/rightArrowKey.st deleted file mode 100644 index 58d903e..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/rightArrowKey.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -rightArrowKey - - ^ Character arrowRight \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/setUp.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/setUp.st index 0857fa9..e510d54 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/setUp.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/setUp.st @@ -2,5 +2,4 @@ running setUp super setUp. - self - enterStringOntoTextField: self standardText. \ No newline at end of file + self enterExampleStringOntoTextField \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/standardText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/standardText.st deleted file mode 100644 index 9ed63a7..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/standardText.st +++ /dev/null @@ -1,5 +0,0 @@ -constants -standardText - - ^ 'This is standard Text. ' - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testApplySelectedStructureWithoutASelectionToNextTextWith..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testApplySelectedStructureWithoutASelectionToNextTextWith..st new file mode 100644 index 0000000..d0cc1af --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testApplySelectedStructureWithoutASelectionToNextTextWith..st @@ -0,0 +1,10 @@ +acceptance-tests +testApplySelectedStructureWithoutASelectionToNextTextWith: aMoveCaretBlock + + aMoveCaretBlock value. + self + activateHeading; + enterExampleStringOntoTextField; + assert: self headingIsAddedToWrittenText + + \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtArbitraryPositionInText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtArbitraryPositionInText.st index 0ed60f2..c6568e4 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtArbitraryPositionInText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtArbitraryPositionInText.st @@ -2,7 +2,7 @@ unit-tests testCorrectLineColNumberAtArbitraryPositionInText self - enterStringOntoTextField: self multipleLineText; - moveCaretToBeginningOfText; - moveCaretMultipleTimesRight: (self standardText size + 22); + enterStringOntoTextField: self multipleLineString; + moveCaretToBeginOfText; + moveCaretRightBy: (self exampleString size + 22); assert: (self editorModel currentPositionInText) = (7@3) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtEndOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtEndOfText.st index c5b370b..1c3b5a9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtEndOfText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtEndOfText.st @@ -2,6 +2,6 @@ unit-tests testCorrectLineColNumberAtEndOfText self - enterStringOntoTextField: self multipleLineText; + enterStringOntoTextField: self multipleLineString; moveCaretToEndOfText; assert: (self editorModel currentPositionInText) = (2@7) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtStartOfText.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtStartOfText.st index f9a86bb..1d4f325 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtStartOfText.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testCorrectLineColNumberAtStartOfText.st @@ -2,6 +2,6 @@ unit-tests testCorrectLineColNumberAtStartOfText self - enterStringOntoTextField: self multipleLineText; - moveCaretToBeginningOfText; + enterStringOntoTextField: self multipleLineString; + moveCaretToBeginOfText; assert: (self editorModel currentPositionInText) = (1@1) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testNoStructureApplyWhenCaretMovedWith..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testNoStructureApplyWhenCaretMovedWith..st new file mode 100644 index 0000000..2b20278 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testNoStructureApplyWhenCaretMovedWith..st @@ -0,0 +1,9 @@ +acceptance-tests +testNoStructureApplyWhenCaretMovedWith: aMoveCaretBlock + + aMoveCaretBlock value. + self + activateHeading; + moveCaret; + enterExampleStringOntoTextField; + deny: self headingIsAddedToWrittenText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testPaste.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testPaste.st index 90b2a51..6265f72 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testPaste.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testPaste.st @@ -1,6 +1,6 @@ unit-tests testPaste - Clipboard clipboardText: self otherText. + Clipboard clipboardText: self exampleString. self textEditor paste. - self assert: self standardText size + self otherText size = self editorText size \ No newline at end of file + self assert: self exampleString size + self exampleString size = self editorText size \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleDisappearsAfterSuccesfulSave.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleDisappearsAfterSuccesfulSave.st index 5e2ceee..30c3f2d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleDisappearsAfterSuccesfulSave.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleDisappearsAfterSuccesfulSave.st @@ -2,7 +2,7 @@ acceptance-tests testUS23TriangleDisappearsAfterSuccesfulSave self - enterStringOntoTextField: 'Test text'; + enterExampleStringOntoTextField; enterStringInSaveDialog: 'Save name'; deny: self triangleIsVisible. diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled.st index c63fad5..e3b9586 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled.st @@ -2,6 +2,6 @@ acceptance-tests testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled self - enterStringOntoTextField: 'Write text'; - enterNothingInSaveDialog; + enterExampleStringOntoTextField; + enterStringInSaveDialog: ''; assert: self triangleIsVisible. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleReappearsWhenEditing.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleReappearsWhenEditing.st index f73a289..9d0134c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleReappearsWhenEditing.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23TriangleReappearsWhenEditing.st @@ -2,7 +2,7 @@ acceptance-tests testUS23TriangleReappearsWhenEditing self - enterStringOntoTextField: 'Start writing text.'; + enterExampleStringOntoTextField; enterStringInSaveDialog: 'Save name'; - enterStringOntoTextField: ' Continue to write text.'; + enterExampleStringOntoTextField; assert: self triangleIsVisible. \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog.st deleted file mode 100644 index 1253f49..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog.st +++ /dev/null @@ -1,4 +0,0 @@ -acceptance-tests -testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog - - "omitted because this behavior was changed in US57" \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS36StructureIsNotExtendable.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS36StructureIsNotExtendable.st index 8002364..edbd288 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS36StructureIsNotExtendable.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS36StructureIsNotExtendable.st @@ -4,6 +4,6 @@ testUS36StructureIsNotExtendable self textEditor selectFrom: 1 to: self editorText size. self editorModel addTextAttribute: self boldTextStructure. self textView textMorph releaseParagraph. - self addMoreText. + self enterExampleStringOntoTextField. self deny: self textIsBold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning.st index 60925a9..28aa274 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning.st @@ -1,10 +1,7 @@ acceptance-tests testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning - self moveCaretToBeginningOfText; - activateHeading; - enterStringOntoTextField: self otherText. - - self assert: self headingIsAddedToWrittenText + self testApplySelectedStructureWithoutASelectionToNextTextWith: [ + self moveCaretToBeginOfText] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd.st index 77ec785..02ab7b2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd.st @@ -1,8 +1,5 @@ acceptance-tests testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd - self moveCaretToEndOfText; - activateHeading; - enterStringOntoTextField: self otherText. - - self assert: self headingIsAddedToWrittenText \ No newline at end of file + self testApplySelectedStructureWithoutASelectionToNextTextWith: [ + self moveCaretToEndOfText] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle.st index 33753ca..174c34f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle.st @@ -1,10 +1,7 @@ acceptance-tests testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle - self moveCaretToMidOfText; - activateHeading; - enterStringOntoTextField: self otherText. - - self assert: self headingIsAddedToWrittenText + self testApplySelectedStructureWithoutASelectionToNextTextWith: [ + self moveCaretToMidOfText] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedBeginning.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedBeginning.st index 184be58..73e113d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedBeginning.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedBeginning.st @@ -1,9 +1,4 @@ acceptance-tests testUS49NoStructureApplyWhenCaretMovedBeginning - self moveCaretToBeginningOfText; - activateHeading; - moveCaret; - enterStringOntoTextField: self otherText. - - self deny: self headingIsAddedToWrittenText \ No newline at end of file + self testNoStructureApplyWhenCaretMovedWith: [self moveCaretToBeginOfText] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedEnd.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedEnd.st index 3b0355a..75978bb 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedEnd.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedEnd.st @@ -1,9 +1,4 @@ acceptance-tests testUS49NoStructureApplyWhenCaretMovedEnd - self moveCaretToEndOfText; - activateHeading; - moveCaret; - enterStringOntoTextField: self otherText. - - self deny: self headingIsAddedToWrittenText \ No newline at end of file + self testNoStructureApplyWhenCaretMovedWith: [self moveCaretToEndOfText] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedMid.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedMid.st index 9c0e68a..4b65a16 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedMid.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS49NoStructureApplyWhenCaretMovedMid.st @@ -1,9 +1,4 @@ acceptance-tests testUS49NoStructureApplyWhenCaretMovedMid - self moveCaretToMidOfText; - activateHeading; - moveCaret; - enterStringOntoTextField: self otherText. - - self deny: self headingIsAddedToWrittenText \ No newline at end of file + self testNoStructureApplyWhenCaretMovedWith: [self moveCaretToMidOfText] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69LinkGetsPasted.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69LinkGetsPasted.st index 46336f2..3af0ce3 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69LinkGetsPasted.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69LinkGetsPasted.st @@ -3,4 +3,4 @@ testUS69LinkGetsPasted Clipboard clipboardText: self url. self textEditor paste. - self assert: self standardText size + self url size = self editorText size \ No newline at end of file + self assert: self exampleString size + self url size = self editorText size \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69NormalTextDoesNotConvertToClickableLink.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69NormalTextDoesNotConvertToClickableLink.st index cc2cc71..6ed5893 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69NormalTextDoesNotConvertToClickableLink.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/testUS69NormalTextDoesNotConvertToClickableLink.st @@ -1,7 +1,7 @@ acceptance-tests testUS69NormalTextDoesNotConvertToClickableLink - Clipboard clipboardText: self standardText. + Clipboard clipboardText: self exampleString. self textEditor selectAll. self textEditor paste. self deny: self textIsLink \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json index a4ca723..a42f347 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json @@ -2,48 +2,40 @@ "class" : { }, "instance" : { - "activateHeading" : "ls 6/21/2019 16:34", - "addMoreText" : "lh 6/5/2019 18:17", + "activateHeading" : "tok 8/7/2020 19:37", "caretPosition" : "ls 6/21/2019 16:34", "caretPosition:" : "ls 6/21/2019 16:34", - "emphasisCodeBold" : "lh 6/5/2019 18:20", "enterCharacter:times:" : "ls 6/21/2019 17:12", - "enterNothingInSaveDialog" : "ls 5/10/2019 01:37", "enterSaveNameInDialog:" : "tok 7/9/2020 21:57", - "headingIsAddedToWrittenText" : "frc 8/7/2020 11:30", - "headingTextStructureIndex" : "ls 6/26/2019 22:25", - "leftArrowKey" : "MB 6/19/2019 18:08", + "headingIsAddedToWrittenText" : "tok 8/7/2020 20:02", "middleTextOffset" : "MB 6/19/2019 18:06", - "moveCaret" : "JEH 6/14/2020 14:04", - "moveCaretMultipleTimesLeft:" : "JEH 6/14/2020 14:04", - "moveCaretMultipleTimesRight:" : "JEH 6/14/2020 14:04", - "moveCaretToBeginningOfOtherText" : "JEH 6/14/2020 14:04", - "moveCaretToBeginningOfText" : "JEH 6/14/2020 14:04", - "moveCaretToEndOfText" : "JEH 6/14/2020 14:04", - "moveCaretToMidOfText" : "JEH 6/14/2020 14:04", - "multipleLineText" : "JEH 6/14/2020 18:12", - "otherText" : "ls 6/21/2019 17:14", - "rightArrowKey" : "JEH 6/14/2020 13:07", - "setUp" : "MB 7/25/2019 12:15", - "standardText" : "ls 6/21/2019 17:14", - "testCorrectLineColNumberAtArbitraryPositionInText" : "JEH 6/14/2020 18:12", - "testCorrectLineColNumberAtEndOfText" : "JEH 6/14/2020 18:11", - "testCorrectLineColNumberAtStartOfText" : "JEH 6/14/2020 18:11", - "testPaste" : "kh 6/15/2020 20:48", + "moveCaret" : "tok 8/7/2020 19:39", + "moveCaretLeftBy:" : "tok 8/7/2020 19:38", + "moveCaretRightBy:" : "tok 8/7/2020 19:46", + "moveCaretToBeginOfText" : "tok 8/7/2020 19:54", + "moveCaretToEndOfText" : "tok 8/7/2020 19:39", + "moveCaretToMidOfText" : "tok 8/7/2020 19:39", + "multipleLineString" : "tok 8/7/2020 16:53", + "setUp" : "tok 8/7/2020 17:32", + "testApplySelectedStructureWithoutASelectionToNextTextWith:" : "tok 8/7/2020 19:31", + "testCorrectLineColNumberAtArbitraryPositionInText" : "tok 8/7/2020 19:46", + "testCorrectLineColNumberAtEndOfText" : "tok 8/7/2020 16:53", + "testCorrectLineColNumberAtStartOfText" : "tok 8/7/2020 19:39", + "testNoStructureApplyWhenCaretMovedWith:" : "tok 8/7/2020 19:31", + "testPaste" : "tok 8/7/2020 16:57", "testPasteDetectsURL" : "frc 7/3/2020 19:33", - "testUS23TriangleDisappearsAfterSuccesfulSave" : "ls 7/25/2019 13:20", - "testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled" : "AG 6/21/2019 14:16", - "testUS23TriangleReappearsWhenEditing" : "AG 6/21/2019 14:33", - "testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog" : "lh 7/24/2019 16:19", - "testUS36StructureIsNotExtendable" : "OS 8/7/2020 13:51", - "testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning" : "JEH 6/14/2020 14:00", - "testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd" : "JEH 6/14/2020 13:56", - "testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle" : "MB 7/25/2019 10:33", - "testUS49NoStructureApplyWhenCaretMovedBeginning" : "MB 7/25/2019 10:32", - "testUS49NoStructureApplyWhenCaretMovedEnd" : "MB 7/25/2019 10:32", - "testUS49NoStructureApplyWhenCaretMovedMid" : "MB 7/25/2019 10:32", - "testUS69LinkGetsPasted" : "kh 6/15/2020 20:13", - "testUS69NormalTextDoesNotConvertToClickableLink" : "kh 6/15/2020 20:08", + "testUS23TriangleDisappearsAfterSuccesfulSave" : "tok 8/7/2020 17:37", + "testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled" : "tok 8/7/2020 19:24", + "testUS23TriangleReappearsWhenEditing" : "tok 8/7/2020 17:37", + "testUS36StructureIsNotExtendable" : "tok 8/7/2020 17:32", + "testUS49ApplySelectedStructureWithoutASelectionToNextTextBeginning" : "tok 8/7/2020 19:39", + "testUS49ApplySelectedStructureWithoutASelectionToNextTextEnd" : "tok 8/7/2020 19:29", + "testUS49ApplySelectedStructureWithoutASelectionToNextTextMiddle" : "tok 8/7/2020 19:29", + "testUS49NoStructureApplyWhenCaretMovedBeginning" : "tok 8/7/2020 19:39", + "testUS49NoStructureApplyWhenCaretMovedEnd" : "tok 8/7/2020 19:27", + "testUS49NoStructureApplyWhenCaretMovedMid" : "tok 8/7/2020 19:27", + "testUS69LinkGetsPasted" : "tok 8/7/2020 16:57", + "testUS69NormalTextDoesNotConvertToClickableLink" : "tok 8/7/2020 16:57", "testUS69PastedLinkConvertsToClickableLink" : "kh 6/15/2020 20:16", "textIsLink" : "kh 6/15/2020 20:10", "url" : "kh 6/15/2020 19:25" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/loadTextIntoScanner..st b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/loadTextIntoScanner..st index f542ccf..115f84a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/loadTextIntoScanner..st +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/loadTextIntoScanner..st @@ -1,4 +1,4 @@ utilities loadTextIntoScanner: aText - self scanner text: aText textStyle: TextStyle default. \ No newline at end of file + self scanner text: aText textStyle: TextStyle default \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/modifiedLineHeight..st b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/modifiedLineHeightFor..st similarity index 76% rename from packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/modifiedLineHeight..st rename to packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/modifiedLineHeightFor..st index f3f121d..d217287 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/modifiedLineHeight..st +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/modifiedLineHeightFor..st @@ -1,4 +1,4 @@ utilities -modifiedLineHeight: textLine +modifiedLineHeightFor: textLine ^ (textLine lineHeight - self extraSpacing) * self paragraphLineExtraHeight + self extraSpacing \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/setUp.st b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/setUp.st index 0e3b543..4e86559 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/setUp.st +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/setUp.st @@ -2,5 +2,5 @@ running setUp super setUp. - self scanner: CompositionScanner new. + self scanner: CompositionScanner new \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphBreaksNewLine.st b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphBreaksNewLine.st index 0957cdd..56c49a4 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphBreaksNewLine.st +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphBreaksNewLine.st @@ -3,4 +3,5 @@ testUS25ParagraphBreaksNewLine self loadTextIntoScanner: self textWithParagraph. - self assert: (self textWithParagraph at: self firstLine last) asString equals: RichTextEditor paragraphCharacter asString \ No newline at end of file + self assert: (self textWithParagraph at: self firstLine last) asString + equals: RichTextEditor paragraphCharacter asString \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphLineHasLargerLineSpacing.st b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphLineHasLargerLineSpacing.st index 16c8abc..0cc6236 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphLineHasLargerLineSpacing.st +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/testUS25ParagraphLineHasLargerLineSpacing.st @@ -7,4 +7,4 @@ testUS25ParagraphLineHasLargerLineSpacing textLine1 := self lineBeginningAt: self firstLineFirstIndex. textLine2 := self lineBeginningAt: textLine1 last + 1. - self assert: textLine1 lineHeight equals: (self modifiedLineHeight: textLine2) \ No newline at end of file + self assert: textLine1 lineHeight equals: (self modifiedLineHeightFor: textLine2) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/textWithParagraph.st b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/textWithParagraph.st deleted file mode 100644 index fcec86a..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/instance/textWithParagraph.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -textWithParagraph - - ^ ('foo', RichTextEditor paragraphCharacter asString , 'bar.') asText \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/methodProperties.json index fe8786d..3390c1c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/methodProperties.json @@ -6,16 +6,15 @@ "firstLine" : "tok 7/10/2020 11:52", "firstLineFirstIndex" : "MB 6/10/2019 17:33", "lineBeginningAt:" : "tok 7/10/2020 11:52", - "loadTextIntoScanner:" : "MB 6/12/2019 20:52", - "modifiedLineHeight:" : "lh 7/24/2019 16:09", + "loadTextIntoScanner:" : "tok 8/7/2020 17:09", + "modifiedLineHeightFor:" : "tok 8/7/2020 19:41", "newLineCharacter" : "MB 6/12/2019 20:50", "paragraphLineExtraHeight" : "ls 7/3/2019 22:39", "scanner" : "MB 5/29/2019 18:00", "scanner:" : "MB 5/29/2019 18:00", - "setUp" : "MB 6/12/2019 20:55", + "setUp" : "tok 8/7/2020 17:09", "sufficientLargeRectangle" : "MB 6/10/2019 17:36", "testUS25NewLineHasEqualLineSpacing" : "tok 7/10/2020 11:52", - "testUS25ParagraphBreaksNewLine" : "OS 8/7/2020 09:50", - "testUS25ParagraphLineHasLargerLineSpacing" : "tok 7/10/2020 11:52", - "textWithNewLine" : "MB 6/12/2019 22:15", - "textWithParagraph" : "OS 8/7/2020 09:50" } } + "testUS25ParagraphBreaksNewLine" : "tok 8/7/2020 19:42", + "testUS25ParagraphLineHasLargerLineSpacing" : "tok 8/7/2020 19:41", + "textWithNewLine" : "MB 6/12/2019 22:15" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/properties.json b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/properties.json index d8bbde8..8145b7d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/properties.json +++ b/packages/RichTextEditing-Tests.package/RichTextFormattingTests.class/properties.json @@ -10,5 +10,5 @@ "name" : "RichTextFormattingTests", "pools" : [ ], - "super" : "TestCase", + "super" : "RichTextEditorTestCase", "type" : "normal" } diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/bufferDocument.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/bufferDocument.st deleted file mode 100644 index fcb07b0..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/bufferDocument.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -bufferDocument - - ^ self editorModel bufferDocument \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/firstIndex.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/firstIndex.st deleted file mode 100644 index 4770d79..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/firstIndex.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -firstIndex - - ^ 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasNoStructureForText..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasNoStructureFor..st similarity index 86% rename from packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasNoStructureForText..st rename to packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasNoStructureFor..st index 4d3748c..2e813ce 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasNoStructureForText..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasNoStructureFor..st @@ -1,5 +1,5 @@ utilities -hasNoStructureForText: aText +hasNoStructureFor: aText ^ (aText runs copyFrom: 0 to: aText size) allSatisfy: [:attributes | attributes diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasStructure.for..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasStructure.for..st new file mode 100644 index 0000000..26450b4 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasStructure.for..st @@ -0,0 +1,10 @@ +utilities +hasStructure: aSymbol for: aText + + ^ self document class + hasStructure: aSymbol + for: aText + from: 1 + to: aText size + + \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasStructure.forText..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasStructure.forText..st deleted file mode 100644 index 6f0f436..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/hasStructure.forText..st +++ /dev/null @@ -1,10 +0,0 @@ -utilities -hasStructure: aSymbol forText: aText - - ^ self editorModel bufferDocument class - hasStructure: aSymbol - forText: aText - from: 1 - to: aText size - - \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/initialTextStructures.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/initialTextStructures.st index bf93f03..a20d4d0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/initialTextStructures.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/initialTextStructures.st @@ -1,5 +1,5 @@ utilities initialTextStructures - ^ self bufferDocument class initialTextStructures collect: [:each | + ^ self document class initialTextStructures collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/previewText.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/previewText.st index 5bb8c52..2f4a556 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/previewText.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/previewText.st @@ -1,4 +1,4 @@ -accessing +utilities previewText ^ (self structureEditorView findByName: self textPreviewLabel) text \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/secondIndex.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/secondIndex.st deleted file mode 100644 index 1314403..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/secondIndex.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -secondIndex - - ^ 2 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/styleList.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/styleList.st new file mode 100644 index 0000000..d018ba1 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/styleList.st @@ -0,0 +1,4 @@ +acceptance-tests +styleList + + ^ (self structureEditorView findByClass: PluggableListMorphOfMany) list \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st index ca3ab65..85cf208 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st @@ -1,9 +1,5 @@ acceptance-tests testUS32CheckAllStylesAreAvailable - - | styleList essentialStyles | - styleList := self structureEditorView findByClass: PluggableListMorphOfMany. - essentialStyles := {#bold . #italic . #underlined . #struckOut . #notExtendable} asSet. - - self assert: (essentialStyles allSatisfy: [:each | styleList list asSet includes: each]) - \ No newline at end of file + + self assert: (RichTextStructureEditor allStyleIdentifiers + allSatisfy: [:each | self styleList includes: each]) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS43PreviewTextfieldHasSelectedStructureApplied.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS43PreviewTextfieldHasSelectedStructureApplied.st index 9da49e3..b5adb58 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS43PreviewTextfieldHasSelectedStructureApplied.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS43PreviewTextfieldHasSelectedStructureApplied.st @@ -1,8 +1,8 @@ acceptance-tests testUS43PreviewTextfieldHasSelectedStructureApplied - self assert: (self hasNoStructureForText: self previewText). + self assert: (self hasNoStructureFor: self previewText). self structureEditor currentStructureSymbol: #bold. - self assert: (self hasStructure: #bold forText: self previewText) + self assert: (self hasStructure: #bold for: self previewText) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeDecreased.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeDecreased.st index d78e85d..a18cb42 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeDecreased.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeDecreased.st @@ -4,8 +4,8 @@ testUS58StructurePriorityCanBeDecreased | structure | self assert: self initialTextStructures size >= 2. - structure := self symbolAt: self firstIndex. + structure := self symbolAt: 1. self structureEditor currentStructureSymbol: structure. self moveDownButton click. - self assert: (self symbolAt: self secondIndex) equals: structure. \ No newline at end of file + self assert: (self symbolAt: 2) equals: structure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeIncreased.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeIncreased.st index 20a4d73..a9603e6 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeIncreased.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructurePriorityCanBeIncreased.st @@ -4,8 +4,8 @@ testUS58StructurePriorityCanBeIncreased | structure | self assert: self initialTextStructures size >= 2. - structure := self symbolAt: self secondIndex. + structure := self symbolAt: 2. self structureEditor currentStructureSymbol: structure. self moveUpButton click. - self assert: (self symbolAt: self firstIndex) equals: structure. \ No newline at end of file + self assert: (self symbolAt: 1) equals: structure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructureWithHighestPriorityWins.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructureWithHighestPriorityWins.st index df246e8..d088222 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructureWithHighestPriorityWins.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS58StructureWithHighestPriorityWins.st @@ -2,11 +2,11 @@ acceptance-tests testUS58StructureWithHighestPriorityWins self - enterStringOntoTextField: self exampleString; - setStructureAt: self firstIndex toColor: Color green; - setStructureAt: self secondIndex toColor: Color blue; - addAttributeAt: self firstIndex; - addAttributeAt: self secondIndex; + enterExampleStringOntoTextField; + setStructureAt: 1 toColor: Color green; + setStructureAt: 2 toColor: Color blue; + addAttributeAt: 1; + addAttributeAt: 2; assert: (self textHasColor: Color green); - removeAttributeAt: self firstIndex; + removeAttributeAt: 1; assert: (self textHasColor: Color blue) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS64IndentationStyleAvailable.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS64IndentationStyleAvailable.st index 3e5150f..5606431 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS64IndentationStyleAvailable.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS64IndentationStyleAvailable.st @@ -1,8 +1,4 @@ acceptance-tests testUS64IndentationStyleAvailable - - | styleList | - styleList := self structureEditorView findByClass: PluggableListMorphOfMany. - self assert: (styleList list asSet includes: #indented) - \ No newline at end of file + self assert: (self styleList includes: #indented) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json index bb32f04..4ac92e9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json @@ -3,23 +3,21 @@ }, "instance" : { "addAttributeAt:" : "frc 8/7/2020 14:11", - "bufferDocument" : "lh 7/3/2019 22:16", - "firstIndex" : "lh 7/24/2019 20:06", - "hasNoStructureForText:" : "frc 8/1/2020 12:00", - "hasStructure:forText:" : "frc 8/7/2020 11:31", - "initialTextStructures" : "lh 7/3/2019 22:25", + "hasNoStructureFor:" : "tok 8/7/2020 20:01", + "hasStructure:for:" : "tok 8/7/2020 20:02", + "initialTextStructures" : "tok 8/7/2020 17:14", "moveDownButton" : "frc 8/7/2020 10:29", "moveUpButton" : "frc 8/7/2020 10:29", "previewText" : "lh 7/24/2019 17:48", "removeAttributeAt:" : "kh 6/21/2020 10:04", - "secondIndex" : "lh 7/24/2019 20:06", "setStructureAt:toColor:" : "kh 6/21/2020 15:41", + "styleList" : "tok 8/7/2020 20:12", "symbolAt:" : "lh 7/3/2019 22:46", - "testUS32CheckAllStylesAreAvailable" : "kh 6/19/2020 17:31", + "testUS32CheckAllStylesAreAvailable" : "tok 8/7/2020 20:11", "testUS43PreviewTextfieldExists" : "ls 6/6/2019 00:27", - "testUS43PreviewTextfieldHasSelectedStructureApplied" : "kh 6/19/2020 10:46", - "testUS58StructurePriorityCanBeDecreased" : "frc 8/7/2020 10:29", - "testUS58StructurePriorityCanBeIncreased" : "frc 8/7/2020 10:29", - "testUS58StructureWithHighestPriorityWins" : "frc 8/7/2020 10:28", - "testUS64IndentationStyleAvailable" : "tok 6/1/2020 13:10", + "testUS43PreviewTextfieldHasSelectedStructureApplied" : "tok 8/7/2020 20:01", + "testUS58StructurePriorityCanBeDecreased" : "tok 8/7/2020 20:08", + "testUS58StructurePriorityCanBeIncreased" : "tok 8/7/2020 20:08", + "testUS58StructureWithHighestPriorityWins" : "tok 8/7/2020 20:08", + "testUS64IndentationStyleAvailable" : "tok 8/7/2020 20:12", "textPreviewLabel" : "MB 6/12/2019 20:29" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/setUp.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/setUp.st index 539707e..2629845 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/setUp.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/setUp.st @@ -4,5 +4,5 @@ setUp super setUp. self richTextEditorMorph: self editorView; - wantsToTest: (RichTextStructureEditor open: self editorModel bufferDocument); + wantsToTest: (RichTextStructureEditor open: self document); structureEditor: self structureEditorView model \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json index fa72b4f..fd32074 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "richTextEditorMorph" : "ls 6/6/2019 00:24", "richTextEditorMorph:" : "MB 7/25/2019 12:04", - "setUp" : "kh 7/27/2020 12:26", + "setUp" : "tok 8/7/2020 17:14", "structureEditor" : "ls 6/6/2019 00:23", "structureEditor:" : "ls 6/6/2019 00:24", "structureEditorView" : "ls 6/6/2019 00:24", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/allStructuresAreDisplayed.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/allStructuresAreDisplayed.st index 57323da..1c87a67 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/allStructuresAreDisplayed.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/allStructuresAreDisplayed.st @@ -1,7 +1,5 @@ utilities allStructuresAreDisplayed - | structureSymbols | - structureSymbols := self document textStructureSymbols. - - ^ (structureSymbols allSatisfy: [:structure | self structureIsDisplayed: structure]) \ No newline at end of file + ^ (self document textStructureSymbols + allSatisfy: [:structure | self structureIsDisplayed: structure]) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureName.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureName.st deleted file mode 100644 index c358c5d..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureName.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -coloredStructureName - - ^ 'coloredStructure' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureSymbol.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureSymbol.st index 141fbbb..eac7606 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureSymbol.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/coloredStructureSymbol.st @@ -1,4 +1,4 @@ utilities coloredStructureSymbol - ^ self coloredStructureName asSymbol \ No newline at end of file + ^ #coloredStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/displayedStructuresEqualInitialStructuresOf..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/displayedStructuresEqualInitialStructuresOf..st index f4f3b16..0d13bb2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/displayedStructuresEqualInitialStructuresOf..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/displayedStructuresEqualInitialStructuresOf..st @@ -1,4 +1,5 @@ utilities displayedStructuresEqualInitialStructuresOf: aRichTextTemplate - ^ (self structureEditorView findByName: 'structureField') getList = aRichTextTemplate initialStructureIdentifiers \ No newline at end of file + ^ (self structureEditorView findByName: 'structureField') getList = + aRichTextTemplate initialStructureIdentifiers \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/newTemplate.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/exampleTemplate.st similarity index 51% rename from packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/newTemplate.st rename to packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/exampleTemplate.st index e9e8b32..4e17b82 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/newTemplate.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/exampleTemplate.st @@ -1,4 +1,4 @@ -utilities -newTemplate +constants +exampleTemplate ^ RichTextMarkdownTemplate \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureName.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureName.st deleted file mode 100644 index 8cdf03c..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureName.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -fontStructureName - - ^ 'fontStructure' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureSymbol.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureSymbol.st index 1cb79c9..432739c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureSymbol.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/fontStructureSymbol.st @@ -1,4 +1,4 @@ utilities fontStructureSymbol - ^ self fontStructureName asSymbol \ No newline at end of file + ^ #fontStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setUp.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setUp.st index 98879b0..468b664 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setUp.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setUp.st @@ -2,7 +2,7 @@ running setUp super setUp. - self newTemplate clearCachedDictionaries. + self exampleTemplate clearCachedDictionaries. self oldStructures: self document textStructureSymbols copy; removeAllTextStructures \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/structureIsNotDisplayed..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/structureIsNotDisplayed..st deleted file mode 100644 index d40a6b3..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/structureIsNotDisplayed..st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -structureIsNotDisplayed: aSymbol - - ^ (self structureIsDisplayed: aSymbol) not \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNewNullTextStructureReturnsNullTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNewNullTextStructureReturnsNullTextStructure.st index 81f9b20..89df95e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNewNullTextStructureReturnsNullTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNewNullTextStructureReturnsNullTextStructure.st @@ -1,4 +1,5 @@ unit-tests testNewNullTextStructureReturnsNullTextStructure - self assert: self structureEditorView model newNullTextStructure class equals: RichTextNullStructure \ No newline at end of file + self assert: self structureEditorView model newNullTextStructure class + equals: RichTextNullStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowColor.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowColor.st index 66145bf..6fb23a2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowColor.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowColor.st @@ -1,4 +1,5 @@ unit-tests testNoSelectedStructureDoesntAllowColor - self should: [(self structureEditorView findByLabel: self colorPickerLabel) click] raise: ProvideAnswerNotification \ No newline at end of file + self should: [(self structureEditorView findByLabel: self colorPickerLabel) click] + raise: ProvideAnswerNotification \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowFont.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowFont.st index 6e58066..e92a93d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowFont.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testNoSelectedStructureDoesntAllowFont.st @@ -1,4 +1,5 @@ unit-tests testNoSelectedStructureDoesntAllowFont - self should: [(self structureEditorView findByLabel: self fontChooserLabel) click] raise: ProvideAnswerNotification \ No newline at end of file + self should: [(self structureEditorView findByLabel: self fontChooserLabel) click] + raise: ProvideAnswerNotification \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS29RemoveNewStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS29RemoveNewStructure.st index 2d5ac80..a0cec3c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS29RemoveNewStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS29RemoveNewStructure.st @@ -6,4 +6,4 @@ testUS29RemoveNewStructure self editorModel createNewStructure: self newStructureName asSymbol. self enterStructureNameInRemoveDialog: [removeStructureButton click]. - self assert: (self structureIsNotDisplayed: self newStructureName asSymbol) \ No newline at end of file + self deny: (self structureIsDisplayed: self newStructureName asSymbol) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS37TemplateCanBeSelected.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS37TemplateCanBeSelected.st index 3033b10..692cab6 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS37TemplateCanBeSelected.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS37TemplateCanBeSelected.st @@ -1,6 +1,6 @@ acceptance-tests testUS37TemplateCanBeSelected - self structureEditor currentTemplateSymbol: (self newTemplate identifier). + self structureEditor currentTemplateSymbol: (self exampleTemplate identifier). self acceptCurrentTemplate. - self assert: (self displayedStructuresEqualInitialStructuresOf: self newTemplate) \ No newline at end of file + self assert: (self displayedStructuresEqualInitialStructuresOf: self exampleTemplate) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st index e37b6b1..5a0ca00 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st @@ -2,7 +2,7 @@ acceptance-tests testUS41ColorCanBeReset self - enterStringOntoTextField: self exampleString; + enterExampleStringOntoTextField; addColoredStructureToText; setGreenColor; deny: (self textHasColor: self structureEditor defaultColor). diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorIsAssignedToStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorIsAssignedToStructure.st index e78d60d..82c35a0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorIsAssignedToStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorIsAssignedToStructure.st @@ -2,7 +2,7 @@ acceptance-tests testUS41ColorIsAssignedToStructure self - enterStringOntoTextField: 'test'; + enterExampleStringOntoTextField; deny: (self textHasColor: Color green); addColoredStructureToText; setGreenColor; diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st index 596b073..c3513ee 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st @@ -2,7 +2,7 @@ acceptance-tests testUS42FontCanBeReset self - enterStringOntoTextField: self exampleString; + enterExampleStringOntoTextField; addFontStructureToText; setFont: self fontAtlanta22; deny: (self textHasFont: self structureEditor defaultFont). diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontIsAppliedToStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontIsAppliedToStructure.st index 43304fc..83cd93e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontIsAppliedToStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontIsAppliedToStructure.st @@ -2,7 +2,7 @@ acceptance-tests testUS42FontIsAppliedToStructure self - enterStringOntoTextField: self exampleString; + enterExampleStringOntoTextField; deny: (self textHasFontSize: 22); addFontStructureToText; setFont: self fontAtlanta22; diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontSizeCanBeAssigned.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontSizeCanBeAssigned.st index dde674b..eab228a 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontSizeCanBeAssigned.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontSizeCanBeAssigned.st @@ -2,7 +2,7 @@ acceptance-tests testUS42FontSizeCanBeAssigned self - enterStringOntoTextField: self exampleString; + enterExampleStringOntoTextField; addFontStructureToText; setFont: self fontAtlanta11; assert: (self textHasFont: self fontAtlanta11); diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json index 4f6916a..4b6eb0b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json @@ -5,19 +5,17 @@ "acceptCurrentTemplate" : "frc 8/1/2020 12:44", "addColoredStructureToText" : "frc 8/7/2020 14:11", "addFontStructureToText" : "frc 8/7/2020 14:11", - "allStructuresAreDisplayed" : "AG 7/25/2019 13:24", + "allStructuresAreDisplayed" : "tok 8/7/2020 17:20", "colorPickerLabel" : "frc 7/30/2020 11:51", - "coloredStructureName" : "AG 6/21/2019 14:02", - "coloredStructureSymbol" : "lh 6/26/2019 19:08", - "displayedStructuresEqualInitialStructuresOf:" : "JEH 7/9/2020 15:12", + "coloredStructureSymbol" : "tok 8/7/2020 17:20", + "displayedStructuresEqualInitialStructuresOf:" : "tok 8/7/2020 20:15", "enterStructureNameInRemoveDialog:" : "ls 7/24/2019 17:32", + "exampleTemplate" : "tok 8/7/2020 17:22", "fontAtlanta11" : "lh 6/26/2019 21:20", "fontAtlanta22" : "lh 6/26/2019 19:18", "fontChooserLabel" : "frc 7/30/2020 11:51", - "fontStructureName" : "lh 6/26/2019 19:10", - "fontStructureSymbol" : "lh 6/26/2019 19:09", + "fontStructureSymbol" : "tok 8/7/2020 17:22", "newStructureName" : "AG 6/18/2019 16:02", - "newTemplate" : "JEH 7/9/2020 15:06", "nullTextStructure" : "frc 6/13/2020 11:12", "oldStructures" : "ls 5/31/2019 15:08", "oldStructures:" : "ls 5/31/2019 15:06", @@ -29,22 +27,21 @@ "restoreTextStructures" : "ls 7/24/2019 17:32", "setFont:" : "kh 6/21/2020 15:45", "setGreenColor" : "kh 6/21/2020 15:41", - "setUp" : "frc 8/1/2020 12:33", + "setUp" : "tok 8/7/2020 17:22", "structureIsDisplayed:" : "ls 6/18/2019 16:27", - "structureIsNotDisplayed:" : "AG 6/18/2019 16:00", "tearDown" : "ls 6/12/2019 18:04", - "testNewNullTextStructureReturnsNullTextStructure" : "tok 8/7/2020 15:53", - "testNoSelectedStructureDoesntAllowColor" : "frc 8/1/2020 12:00", + "testNewNullTextStructureReturnsNullTextStructure" : "tok 8/7/2020 20:17", + "testNoSelectedStructureDoesntAllowColor" : "tok 8/7/2020 20:17", "testNoSelectedStructureDoesntAllowColorReset" : "frc 8/1/2020 10:50", - "testNoSelectedStructureDoesntAllowFont" : "frc 7/30/2020 12:31", + "testNoSelectedStructureDoesntAllowFont" : "tok 8/7/2020 20:18", "testNoSelectedStructureDoesntAllowFontReset" : "frc 8/1/2020 10:50", "testUS29AddNewStructure" : "tok 7/9/2020 21:57", "testUS29DisplayAllStructures" : "ls 6/18/2019 16:22", - "testUS29RemoveNewStructure" : "ls 6/18/2019 16:22", - "testUS37TemplateCanBeSelected" : "frc 8/1/2020 12:33", + "testUS29RemoveNewStructure" : "tok 8/7/2020 17:23", + "testUS37TemplateCanBeSelected" : "tok 8/7/2020 17:22", "testUS37TemplateChangeButtonExists" : "JEH 7/10/2020 14:57", - "testUS41ColorCanBeReset" : "frc 8/7/2020 10:28", - "testUS41ColorIsAssignedToStructure" : "AG 6/21/2019 13:59", - "testUS42FontCanBeReset" : "frc 8/7/2020 10:28", - "testUS42FontIsAppliedToStructure" : "frc 8/7/2020 10:28", - "testUS42FontSizeCanBeAssigned" : "frc 8/7/2020 10:28" } } + "testUS41ColorCanBeReset" : "tok 8/7/2020 17:33", + "testUS41ColorIsAssignedToStructure" : "tok 8/7/2020 17:37", + "testUS42FontCanBeReset" : "tok 8/7/2020 17:33", + "testUS42FontIsAppliedToStructure" : "tok 8/7/2020 17:33", + "testUS42FontSizeCanBeAssigned" : "tok 8/7/2020 17:33" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownLikeStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownLikeStructure.st index cec832f..19fd6bb 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownLikeStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownLikeStructure.st @@ -1,4 +1,4 @@ utilities markdownLikeStructure - +"Markdown template contains a structure named heading4" ^ RichTextStructure new: #heading4 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownTemplateContainsStructureWithName..st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownTemplateContainsStructureWithName..st index 6f13679..778533d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownTemplateContainsStructureWithName..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/markdownTemplateContainsStructureWithName..st @@ -1,5 +1,6 @@ utilities markdownTemplateContainsStructureWithName: aStructureName - ^ RichTextMarkdownTemplate class canUnderstand: (self expectedMethodSymbolForStructure: aStructureName) + ^ RichTextMarkdownTemplate class canUnderstand: + (self expectedMethodSymbolForStructure: aStructureName) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateContainsRequiredStructures.st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateContainsRequiredStructures.st index 4e740d4..bc76f6b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateContainsRequiredStructures.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateContainsRequiredStructures.st @@ -1,5 +1,6 @@ acceptance tests testUS37MarkdownTemplateContainsRequiredStructures - self requiredMarkdownStructures do: [:each | self assert: (self markdownTemplateContainsStructureWithName: each)] + self requiredMarkdownStructures do: [:each | + self assert: (self markdownTemplateContainsStructureWithName: each)] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateExists.st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateExists.st index 2a777eb..65454d9 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateExists.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS37MarkdownTemplateExists.st @@ -1,4 +1,5 @@ acceptance tests testUS37MarkdownTemplateExists - self assert: (RichTextStructureTemplate availableTemplates contains: [:each | each identifier = #markdown]) \ No newline at end of file + self assert: (RichTextStructureTemplate availableTemplates + anySatisfy: [:each | each identifier = RichTextMarkdownTemplate identifier]) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88CustomStructureIsConvertedOnTemplate.st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88CustomStructureIsConvertedOnTemplate.st index 0f79e2b..7f490cb 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88CustomStructureIsConvertedOnTemplate.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88CustomStructureIsConvertedOnTemplate.st @@ -2,6 +2,9 @@ acceptance tests testUS88CustomStructureIsConvertedOnTemplate self document initializeStructure: (self markdownLikeStructure structureIdentifier). - self assert: (self document textStructureSymbols includes: (self markdownLikeStructure structureIdentifier)). + self assert: (self document textStructureSymbols + includes: (self markdownLikeStructure structureIdentifier)). + self document setNewTemplate: RichTextMarkdownTemplate. - self assert: (self document textStructureSymbols includes: (self markdownLikeStructure structureIdentifier)) \ No newline at end of file + self assert: (self document textStructureSymbols + includes: (self markdownLikeStructure structureIdentifier)) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88ExampleStructureIsDeletedOnTemplate.st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88ExampleStructureIsDeletedOnTemplate.st index 2b96f0a..59057a3 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88ExampleStructureIsDeletedOnTemplate.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88ExampleStructureIsDeletedOnTemplate.st @@ -2,6 +2,9 @@ acceptance tests testUS88ExampleStructureIsDeletedOnTemplate self document initializeStructure: (self exampleTextStructure structureIdentifier). - self assert: (self document textStructureSymbols includes: (self exampleTextStructure structureIdentifier)). + self assert: (self document textStructureSymbols + includes: (self exampleTextStructure structureIdentifier)). + self document setNewTemplate: RichTextMarkdownTemplate. - self deny: (self document textStructureSymbols includes: (self exampleTextStructure structureIdentifier)) \ No newline at end of file + self deny: (self document textStructureSymbols + includes: (self exampleTextStructure structureIdentifier)) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88TextRemainsStructured.st b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88TextRemainsStructured.st index fab0d2d..50d83a6 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88TextRemainsStructured.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/instance/testUS88TextRemainsStructured.st @@ -1,7 +1,7 @@ acceptance tests testUS88TextRemainsStructured - self enterStringOntoTextField: 'test'. + self enterExampleStringOntoTextField. self textEditor selectAll. self selectOptionBold. self document setNewTemplate: RichTextMarkdownTemplate. diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/methodProperties.json index f7c12db..f31d90d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTemplateTests.class/methodProperties.json @@ -3,12 +3,12 @@ }, "instance" : { "expectedMethodSymbolForStructure:" : "JEH 7/9/2020 14:25", - "markdownLikeStructure" : "tok 8/7/2020 15:53", - "markdownTemplateContainsStructureWithName:" : "JEH 7/9/2020 14:29", + "markdownLikeStructure" : "tok 8/7/2020 17:25", + "markdownTemplateContainsStructureWithName:" : "tok 8/7/2020 20:20", "requiredMarkdownStructures" : "JEH 7/9/2020 14:20", "testUS37AtLeastOneTemplateIsAvailable" : "JEH 7/9/2020 14:13", - "testUS37MarkdownTemplateContainsRequiredStructures" : "JEH 7/10/2020 15:00", - "testUS37MarkdownTemplateExists" : "JEH 7/10/2020 15:00", - "testUS88CustomStructureIsConvertedOnTemplate" : "frc 8/7/2020 11:03", - "testUS88ExampleStructureIsDeletedOnTemplate" : "frc 8/7/2020 11:03", - "testUS88TextRemainsStructured" : "frc 7/16/2020 17:04" } } + "testUS37MarkdownTemplateContainsRequiredStructures" : "tok 8/7/2020 17:27", + "testUS37MarkdownTemplateExists" : "tok 8/7/2020 20:21", + "testUS88CustomStructureIsConvertedOnTemplate" : "tok 8/7/2020 17:28", + "testUS88ExampleStructureIsDeletedOnTemplate" : "tok 8/7/2020 17:29", + "testUS88TextRemainsStructured" : "tok 8/7/2020 17:30" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/README.md b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/README.md similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/README.md rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/README.md diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/linkTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/linkTextStructure.st similarity index 91% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/linkTextStructure.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/linkTextStructure.st index 75957a6..9e0751b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/linkTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/linkTextStructure.st @@ -1,4 +1,4 @@ -utilities +constants linkTextStructure ^ RichTextStructure hyperlinkTo: 'https://github.com/hpi-swa-teaching/RichTextEditing' \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/listTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/listTextStructure.st similarity index 84% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/listTextStructure.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/listTextStructure.st index bb62e5a..a5a5ff8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/listTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/listTextStructure.st @@ -1,4 +1,4 @@ -utilities +constants listTextStructure ^ RichTextStructure listOnLevel: 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/nullTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/nullTextStructure.st similarity index 82% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/nullTextStructure.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/nullTextStructure.st index f0d0bf5..35b19f4 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/nullTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/nullTextStructure.st @@ -1,4 +1,4 @@ -utilities +constants nullTextStructure ^ RichTextNullStructure new \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testAddMultipleTextStructures.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testAddMultipleTextStructures.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testAddMultipleTextStructures.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testAddMultipleTextStructures.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testExampleStructureIsNotKern.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testExampleStructureIsNotKern.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testExampleStructureIsNotKern.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testExampleStructureIsNotKern.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testLinkTextStructureCanNotDeriveFromPrettyPrint.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testLinkTextStructureCanNotDeriveFromPrettyPrint.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testLinkTextStructureCanNotDeriveFromPrettyPrint.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testLinkTextStructureCanNotDeriveFromPrettyPrint.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testLinkTextStructureMayActOnClick.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testLinkTextStructureMayActOnClick.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testLinkTextStructureMayActOnClick.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testLinkTextStructureMayActOnClick.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testListTextStructureIsNotAlignment.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testListTextStructureIsNotAlignment.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testListTextStructureIsNotAlignment.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testListTextStructureIsNotAlignment.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st new file mode 100644 index 0000000..bcec9dd --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st @@ -0,0 +1,5 @@ +unit-tests +testNullTextStructurestructureIdentifierCanNotBeChanged + + self assert: (self nullTextStructure structureIdentifier: #test) structureIdentifier + equals: #null \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructurestructureIdentifierIsNull.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructurestructureIdentifierIsNull.st new file mode 100644 index 0000000..8c49ebe --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testNullTextStructurestructureIdentifierIsNull.st @@ -0,0 +1,4 @@ +unit-tests +testNullTextStructurestructureIdentifierIsNull + + self assert: self nullTextStructure structureIdentifier equals: #null \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testSerializeExampleStructure.st b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testSerializeExampleStructure.st similarity index 100% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testSerializeExampleStructure.st rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/instance/testSerializeExampleStructure.st diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/methodProperties.json similarity index 81% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/methodProperties.json index 885dd09..ede750b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/methodProperties.json @@ -12,6 +12,6 @@ "testListTextStructureIsNotAlignment" : "frc 7/3/2020 20:36", "testNullTextStructureCantAddAttributes" : "frc 7/30/2020 12:33", "testNullTextStructureCantRemoveAttributes" : "kh 6/21/2020 11:19", - "testNullTextStructurestructureIdentifierCanNotBeChanged" : "kh 6/19/2020 17:43", - "testNullTextStructurestructureIdentifierIsNull" : "tok 6/13/2020 11:01", + "testNullTextStructurestructureIdentifierCanNotBeChanged" : "tok 8/7/2020 20:25", + "testNullTextStructurestructureIdentifierIsNull" : "tok 8/7/2020 20:25", "testSerializeExampleStructure" : "frc 7/3/2020 20:45" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/properties.json b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/properties.json similarity index 84% rename from packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/properties.json rename to packages/RichTextEditing-Tests.package/RichTextStructureTests.class/properties.json index 3a05a90..cf45457 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/properties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureTests.class/properties.json @@ -7,7 +7,7 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "RichTextTextStructureTests", + "name" : "RichTextStructureTests", "pools" : [ ], "super" : "RichTextEditorTestCase", diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st deleted file mode 100644 index a45e0c1..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st +++ /dev/null @@ -1,7 +0,0 @@ -unit-tests -testNullTextStructurestructureIdentifierCanNotBeChanged - - | textStructure | - textStructure := self nullTextStructure structureIdentifier: #test. - - self assert: textStructure structureIdentifier equals: #null \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierIsNull.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierIsNull.st deleted file mode 100644 index 40e4369..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierIsNull.st +++ /dev/null @@ -1,7 +0,0 @@ -unit-tests -testNullTextStructurestructureIdentifierIsNull - - | textStructure | - textStructure := self nullTextStructure. - - self assert: textStructure structureIdentifier equals: #null \ No newline at end of file