Skip to content
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

Test refactoring #47

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Test refactoring #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5996565
started page size
Jan 13, 2023
ffedac8
page size and margins are now stored as a flexible Measurement<UnitLe…
Jan 16, 2023
890d78c
an attempt at image autosizing
Jan 16, 2023
1d20cb9
some refactoring and documentation for autosizing behaviour. We now r…
Jan 19, 2023
76e2ef8
some changes to PageDefinition to make things more cross-platform com…
Jan 26, 2023
51cc386
Merge branch 'pageSize' into Image_ScaleToFit
Jan 26, 2023
c119d68
Merge branch 'master' into pageSize
Jan 27, 2023
61c5d05
Merge branch 'pageSize' into Image_ScaleToFit
Jan 27, 2023
4c39bc0
Merge branch 'master' into Image_ScaleToFit
Feb 25, 2023
a31096c
Merge branch 'master' into Image_ScaleToFit
Mar 5, 2023
2c15a0b
some refactoring of test targets to remove redundant code
Mar 5, 2023
406fec0
moved files to correct locations
Mar 5, 2023
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
28 changes: 28 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/DocX.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,34 @@
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DocX_DocX"
BuildableName = "DocX_DocX"
BlueprintName = "DocX_DocX"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DocXTestsCommon"
BuildableName = "DocXTestsCommon"
BlueprintName = "DocXTestsCommon"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down
2 changes: 1 addition & 1 deletion .../DocX-Examples.xcodeproj/xcuserdata/morten.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>DocX-Examples-iOS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>DocX-Examples-macOS.xcscheme_^#shared#^_</key>
<dict>
Expand Down
122 changes: 42 additions & 80 deletions DocX-iOS-Tests/DocX_iOS_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ import UniformTypeIdentifiers

@testable import DocX

@available(iOS 10.0, *)
class DocX_iOS_Tests: XCTestCase {

#if SWIFT_PACKAGE
let bundle=Bundle.module
#else
let bundle=Bundle(for: DocX_iOS_Tests.self)
import DocXTestsCommon
#endif

@available(iOS 10.0, *)
class DocX_iOS_Tests: XCTestCase, DocXTesting {

var tempURL:URL=URL(fileURLWithPath: "")

override func setUp() {
Expand Down Expand Up @@ -66,54 +64,31 @@ class DocX_iOS_Tests: XCTestCase {



func testWriteDocX(attributedString:NSAttributedString){

do{
let url=self.tempURL.appendingPathComponent(UUID().uuidString + "_myDocument_\(attributedString.string.prefix(10))").appendingPathExtension("docx")
try attributedString.writeDocX(to: url)
// var readAttributes:NSDictionary?=nil
// let docXString=try NSAttributedString(url: url, options: [:], documentAttributes: &readAttributes)
// guard let attributes=readAttributes as? [String:Any] else{
// XCTFail()
// return
// }
// XCTAssertEqual(attributes[NSAttributedString.DocumentAttributeKey.documentType.rawValue] as! String, NSAttributedString.DocumentType.officeOpenXML.rawValue)
// let string=docXString.string
// print(string)
// XCTAssertEqual(docXString.string, string)

}
catch let error{
XCTFail(error.localizedDescription)
}
}


func testBlank(){
func testBlank() throws{
let string=""
let attributedString=NSAttributedString(string: string)

testWriteDocX(attributedString: attributedString)
try writeAndValidateDocX(attributedString: attributedString)
}

func test山田Plain() {
func test山田Plain() throws {
let string="山田"
testWriteDocX(attributedString: NSAttributedString(string: string))
try writeAndValidateDocX(attributedString: NSAttributedString(string: string))
}

func test山田Attributed() {
func test山田Attributed() throws {
let string="山田"
let attributed=NSAttributedString(string: string, attributes: [.font:UIFont.systemFont(ofSize: UIFont.systemFontSize)])
testWriteDocX(attributedString: attributed)
try writeAndValidateDocX(attributedString: attributed)
}

func test山田FuriganaAttributed() {
func test山田FuriganaAttributed() throws{
let string="山田"
let furigana="やまだ"
let ruby=CTRubyAnnotationCreateWithAttributes(.auto, .auto, .before, furigana as CFString, [kCTRubyAnnotationSizeFactorAttributeName:0.5] as CFDictionary)
let rubyKey=NSAttributedString.Key(kCTRubyAnnotationAttributeName as String)
let attributed=NSAttributedString(string: string, attributes: [.font:UIFont.systemFont(ofSize: UIFont.systemFontSize), rubyKey:ruby])
testWriteDocX(attributedString: attributed)
try writeAndValidateDocX(attributedString: attributed)
}


Expand All @@ -131,85 +106,79 @@ class DocX_iOS_Tests: XCTestCase {
return attributedString
}

func test山田電気FuriganaAttributed() {
testWriteDocX(attributedString: yamadaDenkiString)
func test山田電気FuriganaAttributed() throws {
try writeAndValidateDocX(attributedString: yamadaDenkiString)

}

func test山田電気FuriganaAttributed_ParagraphStyle() {
func test山田電気FuriganaAttributed_ParagraphStyle() throws {
let attributed=yamadaDenkiString
let style=NSParagraphStyle.default
attributed.addAttribute(.paragraphStyle, value: style, range: NSRange(location: 0, length: attributed.length))
testWriteDocX(attributedString: attributed)

try writeAndValidateDocX(attributedString: attributed)
}

func test山田電気FuriganaAttributed_ParagraphStyle_vertical() {
func test山田電気FuriganaAttributed_ParagraphStyle_vertical() throws {
let attributed=yamadaDenkiString
let style=NSParagraphStyle.default
attributed.addAttribute(.paragraphStyle, value: style, range: NSRange(location: 0, length: attributed.length))
attributed.addAttribute(.verticalForms, value: true, range:NSRange(location: 0, length: attributed.length))
testWriteDocX(attributedString: attributed)
try writeAndValidateDocX(attributedString: attributed)
}

func test山田電気FuriganaAttributed_ParagraphStyle_italic() {
func test山田電気FuriganaAttributed_ParagraphStyle_italic() throws {
let attributed=yamadaDenkiString
let style=NSParagraphStyle.default
attributed.addAttribute(.paragraphStyle, value: style, range: NSRange(location: 0, length: attributed.length))
let boldFont=UIFont.italicSystemFont(ofSize: UIFont.systemFontSize)
attributed.addAttribute(.font, value: boldFont, range: NSRange(location: 0, length: 2))
testWriteDocX(attributedString: attributed)
try writeAndValidateDocX(attributedString: attributed)

}

func testLink(){
func testLink() throws{
let string="楽天 https://www.rakuten-sec.co.jp/"
let attributed=NSMutableAttributedString(string: string)
attributed.addAttributes([.font:NSFont.systemFont(ofSize: NSFont.systemFontSize)], range: NSRange(location: 0, length: attributed.length))
let furigana="らくてん"
let furiganaAnnotation=CTRubyAnnotationCreateWithAttributes(.auto, .auto, .before, furigana as CFString, [kCTRubyAnnotationSizeFactorAttributeName:0.5] as CFDictionary)
attributed.addAttribute(.ruby, value: furiganaAnnotation, range: NSRange(location: 0, length: 2))
attributed.addAttribute(.link, value: URL(string: "https://www.rakuten-sec.co.jp/")!, range: NSRange(location: 3, length: 30))
testWriteDocX(attributedString: attributed)

try writeAndValidateDocX(attributedString: attributed)

}

func test山田電気FuriganaAttributed_ParagraphStyle_underline() {
func test山田電気FuriganaAttributed_ParagraphStyle_underline() throws {
let attributed=yamadaDenkiString
// let style=NSParagraphStyle.default
// attributed.addAttribute(.paragraphStyle, value: style, range: NSRange(location: 0, length: attributed.length))
let underlineStyle:NSUnderlineStyle = [.single,.byWord]
attributed.addAttribute(.underlineStyle, value: underlineStyle.rawValue, range:NSRange(location: 0, length: attributed.length))
testWriteDocX(attributedString: attributed)


try writeAndValidateDocX(attributedString: attributed)
}

func test山田電気FuriganaAttributed_ParagraphStyle_strikethrough() {
func test山田電気FuriganaAttributed_ParagraphStyle_strikethrough() throws {
let attributed=yamadaDenkiString
// let style=NSParagraphStyle.default
// attributed.addAttribute(.paragraphStyle, value: style, range: NSRange(location: 0, length: attributed.length))
let underlineStyle:NSUnderlineStyle = [.single]
attributed.addAttribute(.strikethroughStyle, value: underlineStyle.rawValue, range:NSRange(location: 0, length: attributed.length))
testWriteDocX(attributedString: attributed)

sleep(1)
try writeAndValidateDocX(attributedString: attributed)
}

func test山田電気FuriganaAttributed_ParagraphStyle_backgroundColor() {
func test山田電気FuriganaAttributed_ParagraphStyle_backgroundColor() throws {
let attributed=yamadaDenkiString
let style=NSMutableParagraphStyle()
style.setParagraphStyle(NSParagraphStyle.default)
style.alignment = .center
attributed.addAttribute(.paragraphStyle, value: style, range: NSRange(location: 0, length: attributed.length))

attributed.addAttribute(.backgroundColor, value: NSColor.blue, range:NSRange(location: 0, length: attributed.length))
testWriteDocX(attributedString: attributed)

sleep(1)
try writeAndValidateDocX(attributedString: attributed)

}

func testMultipage(){
func testMultipage() throws{
let longString = """
1. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

Expand All @@ -221,8 +190,8 @@ class DocX_iOS_Tests: XCTestCase {
5. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
"""
let attributed=NSAttributedString(string: longString, attributes: [.font:NSFont.systemFont(ofSize: 20)])
testWriteDocX(attributedString: attributed)
try writeAndValidateDocX(attributedString: attributed)

}


Expand All @@ -231,19 +200,16 @@ class DocX_iOS_Tests: XCTestCase {
let longString = """
1. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
"""
#if SWIFT_PACKAGE
let imageURL=try XCTUnwrap(Bundle.module.url(forResource: "Picture1", withExtension: "png"))
#else
let imageURL=try XCTUnwrap(Bundle(for: DocX_iOS_Tests.self).url(forResource: "Picture1", withExtension: "png"))
#endif

let imageURL=try XCTUnwrap(bundle.url(forResource: "Picture1", withExtension: "png"))
let imageData=try XCTUnwrap(Data(contentsOf: imageURL), "Image not found")
let attachement=NSTextAttachment(data: imageData, ofType: kUTTypePNG as String)
let attributed=NSAttributedString(string: longString, attributes: [.foregroundColor: NSColor.green])
let imageString=NSAttributedString(attachment: attachement)
let result=NSMutableAttributedString()
result.append(attributed)
result.append(imageString)
testWriteDocX(attributedString: result)
try writeAndValidateDocX(attributedString: result)
}


Expand All @@ -254,11 +220,10 @@ class DocX_iOS_Tests: XCTestCase {
att.strokeWidth = -2
att.font = UIFont(name: "Helvetica", size: 12)
att.foregroundColor = .gray
let title=String(att.characters.prefix(10))
let url=self.tempURL.appendingPathComponent(UUID().uuidString + "_myDocument_\(title)").appendingPathExtension("docx")
print(url.absoluteString)

do{
try att.writeDocX(to: url)
let attributed = NSAttributedString(att)
try writeAndValidateDocX(attributedString: attributed)
}
catch let error{
XCTFail(error.localizedDescription)
Expand Down Expand Up @@ -310,8 +275,7 @@ And this is a [link](http://www.example.com).
let font=NSFont(name: "Courier", size: 15)!
string.append(NSAttributedString(string: "E=m•c", attributes: [.font:font]))
string.append(NSAttributedString(string: "2", attributes: [.font:font, .baselineOffset:1]))
let temp=self.tempURL.appendingPathComponent(UUID().uuidString + "_myDocument_\("Subscript")").appendingPathExtension("docx")
try string.writeDocX(to: temp)
try writeAndValidateDocX(attributedString: string)


}
Expand Down Expand Up @@ -345,10 +309,8 @@ And this is a [link](http://www.example.com).
att.append(newLine)
}

let temp=self.tempURL.appendingPathComponent(UUID().uuidString + "_myDocument_\("Attachements")").appendingPathExtension("docx")
try att.writeDocX(to: temp)
try writeAndValidateDocX(attributedString: att)


}

}
Expand Down
Loading