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.
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
FIX: Image.renderText() in Xcode 12 beta 5 #32
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
import XCTest | ||
@testable import SwiftGD | ||
|
||
class TestImage: XCTestCase { | ||
/// Trying to create a list that *should* have at least | ||
/// one font for most Swift-compatible platforms. | ||
/// NOTE: Tests might fail on platforms that don’t have | ||
/// one of these fonts installed. E.g.: Docker images | ||
internal static let fontList = [ | ||
"SFCompact", | ||
"ArialMT", | ||
"Arial", | ||
"Roboto", | ||
"Ubuntu", | ||
"Noto", | ||
"Noto Sans", | ||
"SSTPro-Roman" | ||
] | ||
|
||
func testRenderText() throws { | ||
guard let image = Image(width: 640, height: 480) else { | ||
throw Error.invalidImage(reason: "Could not initialize image") | ||
} | ||
let basepoint = Point(x: 320, y: 240) | ||
let renderBounds = image.renderText( | ||
"SwiftGD", | ||
from: basepoint, | ||
fontList: Self.fontList, | ||
color: .red, | ||
size: 50, | ||
angle: .degrees(-15) | ||
) | ||
|
||
XCTAssertFalse(try isEmptyBounds(for: renderBounds), "When text is rendered, it returns NON-zero Points") | ||
} | ||
|
||
func testRenderEmptyText() throws { | ||
guard let image = Image(width: 640, height: 480) else { | ||
throw Error.invalidImage(reason: "Could not initialize image") | ||
} | ||
let renderBounds = image.renderText("", from: .zero, fontList: ["Arial", "Ubuntu", "Roboto"], color: .black, size: 18.0) | ||
|
||
XCTAssertTrue(try isEmptyBounds(for: renderBounds), "Empty `text` values return tuple of zero-value Points") | ||
} | ||
|
||
func testRenderEmptyFontList() throws { | ||
guard let image = Image(width: 640, height: 480) else { | ||
throw Error.invalidImage(reason: "Could not create image") | ||
} | ||
let renderBounds = image.renderText("Hello, World", from: .zero, fontList: [], color: .white, size: 18.0) | ||
|
||
XCTAssertTrue(try isEmptyBounds(for: renderBounds), "Empty fontLists return tuple of zero-value Points") | ||
} | ||
} | ||
|
||
extension TestImage { | ||
private func isEmptyBounds(for resultValues: (upperLeft: Point, upperRight: Point, lowerRight: Point, lowerLeft: Point)) throws -> Bool { | ||
return [ | ||
resultValues.upperLeft, | ||
resultValues.upperRight, | ||
resultValues.lowerRight, | ||
resultValues.lowerLeft | ||
].allSatisfy { | ||
$0 == .zero | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the update!
This edit is not correct:
renderText
returnsupper left, upper right, lower right, and lower left corner.
gdImageStringFT
returnslower left, lower right, upper right, and upper left corner.
The comment is about
gdImageStringFT
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zntfdr @twostraws My apologies. I have a new patch ( #33 ) in to address the mistake.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mcritz Thank you for the quick patch ❤️