Skip to content

Commit

Permalink
support negative number
Browse files Browse the repository at this point in the history
  • Loading branch information
Norbert committed Aug 2, 2017
1 parent 011ff51 commit abd38ae
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 82 deletions.
Binary file modified ...odeproj/project.xcworkspace/xcuserdata/norbert.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion DEMO/VisualHumainNumber/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.8</string>
<string>1.0.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
127 changes: 102 additions & 25 deletions DEMO/VisualHumainNumberTests/VisualHumainNumberTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,46 +23,123 @@ class VisualHumainNumberTests: XCTestCase {
}

func testStringNumber53430345_83() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "53430345.83", separator: ",");
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "53,430,345.83");
let vhn: VisualHumainNumber = VisualHumainNumber(string: "53430345.83", separator: ",")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "53,430,345.83")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53 430 345" );
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53 430 345" )
//XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53,430,345" );
vhn.separator = "."
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "53.4M" );
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "53.4M" )
vhn.separator = "😂"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53😂430😂345" );
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53😂430😂345" )

}

func testStringNumberNegative53430345_83() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "-53430345.83", separator: ",")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "-53,430,345.83")
XCTAssertTrue( vhn.isNegative == true )
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-53 430 345" )
//XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53,430,345" );
vhn.separator = "."
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "-53.4M" )
vhn.separator = "😂"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-53😂430😂345" )

}

// test if - + - = +
func testStringNumberWithServalMinus53430345_83() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "----53430345.83", separator: ",")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "53,430,345.83")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53 430 345" )
//XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53,430,345" );
vhn.separator = "."
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "53.4M" )
vhn.separator = "😂"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53😂430😂345" )

}

// test if - + - + - = -
func testStringNumberWithServalPositive53430345_83() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "---53430345.83", separator: ",")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "-53,430,345.83")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-53 430 345" )
//XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "53,430,345" );
vhn.separator = "."
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "-53.4M" )
vhn.separator = "😂"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-53😂430😂345" )

}


func testStringNumber430345() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "430345");
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "430,345.0");
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "430,345" );
vhn.separator = "!";
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "430!345" );
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "430k" );
let vhn: VisualHumainNumber = VisualHumainNumber(string: "430345")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "430,345.0")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "430,345" )
vhn.separator = "!"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "430!345" )
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "430k" )
}


func testStringNumberNegative430345() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "-430345")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "-430,345.0")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-430,345" )
vhn.separator = "!"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-430!345" )
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "-430k" )
}


func testStringNumber4303453345() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "4303453345");
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "4,303,453,345.0");
vhn.separator = " ";
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "4 303 453 345" );
vhn.separator = ",";
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "4,303,453,345" );
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "4.3B" );
let vhn: VisualHumainNumber = VisualHumainNumber(string: "4303453345")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "4,303,453,345.0")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "4 303 453 345" )
vhn.separator = ","
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "4,303,453,345" )
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "4.3B" )
}

func testStringNumberNegative4303453345() {
let vhn: VisualHumainNumber = VisualHumainNumber(string: "-4303453345")
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "-4,303,453,345.0")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-4 303 453 345" )
vhn.separator = ","
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-4,303,453,345" )
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "-4.3B" )
}



func testIntNumber321445() {
let vhn: VisualHumainNumber = VisualHumainNumber(long: 321445);
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "321,445.0");
vhn.separator = " ";
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "321 445" );
vhn.separator = "~";
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "321~445" );
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "321k" );
let vhn: VisualHumainNumber = VisualHumainNumber(long: 321445)
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "321,445.0")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "321 445" )
vhn.separator = "~"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "321~445" )
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "321k" )
}

func testIntNumberNegative321445() {
let vhn: VisualHumainNumber = VisualHumainNumber(long: -321445);
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundredRounded) == "-321,445.0")
vhn.separator = " "
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-321 445" )
vhn.separator = "~"
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .separatorHundred) == "-321~445" )
XCTAssertTrue( vhn.getVisualHumainNumbers(notation: .simpleHumain) == "-321k" )
}



}
14 changes: 9 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@ To use this vendor add files VisualHumainNumber.swift to your Project or add pod
let vhn = VisualHumainNumber(string: "53430345.83", separator: Character( " " ) )
println(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SeparatorHundred))
print(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SeparatorHundred))
// => 53 430 345
vhn.setSeparator( Character( "," ) )
println(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SeparatorHundred))
print(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SeparatorHundred))
// => 53,430,345
println(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SimpleHumain))
print(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SimpleHumain))
// => 53M
println(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SeparatorHundredRounded))
print(vhn.getVisualHumainNumbers(notation: VisualHumainNumberNotation.SeparatorHundredRounded))
// => 53,430,345.83

print(vhn.isNegative)
// => fasle
## Feature

- [x] Negative number
Loading

0 comments on commit abd38ae

Please sign in to comment.