Skip to content

Make tests run in Pharo 9 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bpieber wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make tests run in Pharo 9 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Tabular/TabularDOCXExperimentalExport3.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TabularDOCXExperimentalExport3 class >> example1Write [
aStream := self tabularTestTable readStream.
archive := ZipArchive new readFrom: aStream.

archive writeToFileNamed: (FileLocator home / 'testExport3Write1.docx')
archive writeToFile: (FileLocator home / 'testExport3Write1.docx')

]

Expand Down
6 changes: 3 additions & 3 deletions src/Tabular/TabularDOCXExperimentalExportTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ theString := '<?xml version="1.0" encoding="UTF-8"?>

zip:= ZipArchive new.
zip addString: theString as: '[Content_Types].xml'.
zip writeToFileNamed: fname1 .
zip writeToFile: fname1 .

]

Expand All @@ -82,7 +82,7 @@ theContentString :='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
zip:= ZipArchive new.
zip addString: theString as: '[Content_Types].xml'.
zip addString: theContentString as: 'word/document.xml'.
zip writeToFileNamed: fname2 .
zip writeToFile: fname2 .
]

{ #category : #'as yet unclassified' }
Expand Down Expand Up @@ -115,5 +115,5 @@ zip:= ZipArchive new.
zip addString: theString as: '[Content_Types].xml'.
zip addString: (theContentString convertToEncoding: 'utf-8') as: 'word/document.xml'.
zip addString: theRelsString as: '_rels/.rels'.
zip writeToFileNamed: fname3 .
zip writeToFile: fname3 .
]
2 changes: 1 addition & 1 deletion src/Tabular/TabularDOCXExperimentalExportTest2.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,6 @@ zip addString: self settingsString as: 'word/settings.xml'.
zip addString: self numberingString as: 'word/numbering.xml'.
zip addString: self fontTableString as: 'word/fontTable.xml'.
zip addString: self document_xml_rels as: 'word/_rels/document.xml.rels'.
zip writeToFileNamed: fname6 .
zip writeToFile: fname6 .

]
10 changes: 5 additions & 5 deletions src/Tabular/TabularDOCXExperimentalExportTest3.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ archive := ZipArchive new

archive addString: TabularWorksheetWriterWordML document_xml_example1 as: 'word/document.xml'.

archive writeToFileNamed: (FileLocator home / 'testExport3Write4.docx')
archive writeToFile: (FileLocator home / 'testExport3Write4.docx')
]

{ #category : #'as yet unclassified' }
Expand All @@ -84,7 +84,7 @@ aWorksheet := TabularWorksheet new.
documentString := ((TabularWorksheetWriterWordML for: aWorksheet) convertToEncoding: 'utf-8').
archive addString: documentString as: 'word/document.xml'.

archive writeToFileNamed: (FileLocator home / 'testExport3Write5.docx')
archive writeToFile: (FileLocator home / 'testExport3Write5.docx')
]

{ #category : #'as yet unclassified' }
Expand All @@ -96,7 +96,7 @@ aWorksheet := self sampleWorksheetWith2RowsAnd3Columns.
documentString := ((TabularWorksheetWriterWordML for: aWorksheet) convertToEncoding: 'utf-8').

archive addString: documentString as: 'word/document.xml'.
archive writeToFileNamed: (FileLocator home / 'testExport3Write6.docx')
archive writeToFile: (FileLocator home / 'testExport3Write6.docx')
]

{ #category : #'as yet unclassified' }
Expand Down Expand Up @@ -149,7 +149,7 @@ TabularDOCXExperimentalExportTest3 class >> write [
aStream := self tabularTestTable readStream.
archive := ZipArchive new readFrom: aStream.

archive writeToFileNamed: (FileLocator home / 'test.docx')
archive writeToFile: (FileLocator home / 'test.docx')

]

Expand All @@ -163,7 +163,7 @@ archive := ZipArchive new readFrom: aStream.
"archive removeMember: 'word/document.xml'."
archive addString: (self documentString convertToEncoding: 'utf-8') as: 'word/document.xml'.

archive writeToFileNamed: (FileLocator home / 'test.docx')
archive writeToFile: (FileLocator home / 'test.docx')

]

Expand Down
2 changes: 1 addition & 1 deletion src/Tabular/TabularExport.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,5 @@ TabularExport >> workbook: anObject [
{ #category : #'as yet unclassified' }
TabularExport >> writeZip [

zip writeToFileNamed: workbook filename
zip writeToFile: workbook filename
]
4 changes: 2 additions & 2 deletions src/Tabular/TabularExportImportTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ TabularExportImportTest >> testExport8ExportManyWorksheets [
wbk := TabularWorkbook new.
rnd := Random new.
sheetNames := (1 to: 10) collect: [ :i | 'Sheet ', i printString].
values := (1 to: 10) collect: [ :i | i even ifTrue: [rnd nextInt: 1000] ifFalse: [ (rnd nextInt: 100) printStringRadix: 16 ] ].
cellPositions := (1 to: 10) collect: [ :i | (rnd nextInt: 5) @ (rnd nextInt: 10) ].
values := (1 to: 10) collect: [ :i | i even ifTrue: [rnd nextInteger: 1000] ifFalse: [ (rnd nextInteger: 100) printStringRadix: 16 ] ].
cellPositions := (1 to: 10) collect: [ :i | (rnd nextInteger: 5) @ (rnd nextInteger: 10) ].
1 to: 10 do: [ :i |
wsheet := TabularWorksheet new.
wsheet name: (sheetNames at: i).
Expand Down
1 change: 0 additions & 1 deletion src/Tabular/TabularWorksheetWriterWordML.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,3 @@ TabularWorksheetWriterWordML >> renderWorksheet [
ifTrue: [ self renderSheetData ]
"self renderMergeCells"
]