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

Jump to bottom

Add extension of UIlabel for adding line spacing with the method of n… #438

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

Add extension of UIlabel for adding line spacing with the method of n… #438

Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cd810e5
Add extension of UIlabel for adding line spacing with the method of n…
OsamaBinBashir Jul 11, 2017
6a55e8f
Add extension of UIlabel for adding line spacing with the method of n…
OsamaBinBashir Jul 11, 2017
f949239
Update CHANGELOG.md
osama10 Jul 12, 2017
d4b9474
Update CHANGELOG.md
osama10 Jul 12, 2017
2d20dac
Update CHANGELOG.md
osama10 Jul 13, 2017
d59ca01
Added testForLineSpacing
osama10 Aug 25, 2017
c4d58e0
Merge branch 'master' of https://github.com/osama10/EZSwiftExtensions
osama10 Aug 25, 2017
638c472
Merge branch 'master' into master
osama10 Aug 25, 2017
61f701b
Removed unnecessary linespacing in testLineSpacing function
osama10 Aug 28, 2017
e5f55c5
Merge branch 'master' of https://github.com/osama10/EZSwiftExtensions
osama10 Aug 30, 2017
c00d920
Update the UILabel test class
osama10 Aug 30, 2017
277316f
Update CHANGELOG.md
osama10 Aug 30, 2017
fac501a
Merge branch 'master' into master
osama10 Aug 30, 2017
13b1dcc
Update CHANGELOG.md
osama10 Aug 30, 2017
f3047f8
Update the testOfLineSpacing
osama10 Aug 30, 2017
e736d02
Rebased
osama10 Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
94 changes: 52 additions & 42 deletions EZSwiftExtensionsTests/UILabelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
//

#if os(iOS) || os(tvOS)
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have unresolved merge commits here.

=======

import XCTest
@testable import EZSwiftExtensions
Expand All @@ -22,59 +24,67 @@ class UILabelTests: XCTestCase {
XCTAssertEqual(label2.font.pointSize, 20)
XCTAssertEqual(label.font.pointSize, 17)
}
>>>>>>> 638c47200b16776d978dc4598237109396915878
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an unresolved merge, please collapse your commits into one idempotent change.

I cannot even begin to tell you how much I despise non fast forward merges. Rebase your changes and replay them on top of the current HEAD commit.


func testSet() {
import XCTest
@testable import EZSwiftExtensions
class UILabelTests: XCTestCase {

let label = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 50))
label.set(text: "EZSwiftExtensions✅", duration: 1)
XCTAssertEqual(label.text, "EZSwiftExtensions✅")

label.text = ""
label.set(text: "EZSwiftExtensions🚀", duration: 0)
XCTAssertEqual(label.text, "EZSwiftExtensions🚀")

label.text = ""
label.set(text: "EZSwiftExtensions❤️", duration: 1)
XCTAssertEqual(label.text, "EZSwiftExtensions❤️")
}

func testSetLineSpacing(){

let textForTesting = "I am testing test Set line spacing method"
var paragraphStyle : NSMutableParagraphStyle?
func testInit() {

let label = UILabel(x: 0, y: 0, w: 200, h: 50)
let expected = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 50))
let label2 = UILabel(x: 0, y: 0, w: 200, h: 50, fontSize: 20)

XCTAssertEqual(label.frame, expected.frame)
XCTAssertEqual(label2.font.pointSize, 20)
}

let label = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 50))
label.text = textForTesting
label.setLineSpacing(lineSpacing: 1.5)
func testSet() {

let label = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 50))
label.set(text: "EZSwiftExtensions✅", duration: 1)
XCTAssertEqual(label.text, "EZSwiftExtensions✅")

label.text = ""
label.set(text: "EZSwiftExtensions🚀", duration: 0)
XCTAssertEqual(label.text, "EZSwiftExtensions🚀")

label.text = ""
label.set(text: "EZSwiftExtensions❤️", duration: 1)
XCTAssertEqual(label.text, "EZSwiftExtensions❤️")
}

label.attributedText?.enumerateAttribute(NSParagraphStyleAttributeName , in: NSMakeRange(0, (label.attributedText?.length)!), options: [.longestEffectiveRangeNotRequired]) { value, range, isStop in
func testSetLineSpacing(){

let textForTesting = "I am testing test Set line spacing method"
var paragraphStyle : NSMutableParagraphStyle?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick : too many empty lines here are there that do not serve a purpose.

let label = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 50))
label.text = textForTesting
label.setLineSpacing(lineSpacing: 1.5)

if let value = value {

paragraphStyle = value as! NSMutableParagraphStyle

label.attributedText?.enumerateAttribute(NSParagraphStyleAttributeName , in: NSMakeRange(0, (label.attributedText?.length)!), options: [.longestEffectiveRangeNotRequired]) { value, range, isStop in
if let value = value {
paragraphStyle = value as NSMutableParagraphStyle
}
}

XCTAssertEqual(paragraphStyle?.lineHeightMultiple, 1.5)
}

XCTAssertEqual(paragraphStyle?.lineHeightMultiple, 1.5)
var waitExpectation: XCTestExpectation?


func wait(duration: TimeInterval) {
waitExpectation = expectation(description: "wait")
Timer.scheduledTimer(timeInterval: duration, target: self,
selector: #selector(UILabelTests.onTimer), userInfo: nil, repeats: false)
waitForExpectations(timeout: duration + 3, handler: nil)
}

func onTimer() {
waitExpectation?.fulfill()
}
}

var waitExpectation: XCTestExpectation?

func wait(duration: TimeInterval) {
waitExpectation = expectation(description: "wait")
Timer.scheduledTimer(timeInterval: duration, target: self,
selector: #selector(UILabelTests.onTimer), userInfo: nil, repeats: false)
waitForExpectations(timeout: duration + 3, handler: nil)
}

func onTimer() {
waitExpectation?.fulfill()
}
}

#endif