Skip to content

Commit 18d2380

Browse files
mulotmulot
committed
Add Constants.defaultIPv6to4Mask for 96 bits mask
UI tests are working again
1 parent 5b94853 commit 18d2380

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

‎Base.lproj/MainMenu.xib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@
471471
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
472472
<clipView key="contentView" id="L0l-HJ-flz">
473473
<rect key="frame" x="1" y="1" width="567" height="485"/>
474-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
474+
<autoresizingMask key="autoresizingMask"/>
475475
<subviews>
476476
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="583" id="586">
477477
<rect key="frame" x="0.0" y="0.0" width="567" height="462"/>

‎IPSubnetcalc.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class IPSubnetCalc: NSObject {
2222
//IPv6 constants
2323
static let addr16Full: UInt16 = 0xFFFF
2424
static let addr16Empty: UInt16 = 0x0000
25+
static let defaultIPv6to4Mask: Int = 96
2526
//static let addr128Full: [UInt16] = [addr16Full, addr16Full, addr16Full, addr16Full, addr16Full, addr16Full, addr16Full, addr16Full]
2627
//static let addr128Empty: [UInt16] = [addr16Empty, addr16Empty, addr16Empty, addr16Empty, addr16Empty, addr16Empty, addr16Empty, addr16Empty]
2728
//static let addr16Hex1: UInt16 = 0xF000
@@ -889,7 +890,7 @@ class IPSubnetCalc: NSObject {
889890
self.ipv4Address = ipAddress
890891
self.maskBits = maskbits
891892
self.ipv6Address = IPSubnetCalc.convertIPv4toIPv6(ipAddress: ipAddress)
892-
self.ipv6MaskBits = maskbits + 96
893+
self.ipv6MaskBits = maskbits + Constants.defaultIPv6to4Mask
893894
}
894895
else {
895896
return nil
@@ -920,8 +921,8 @@ class IPSubnetCalc: NSObject {
920921
init?(ipv6: String, maskbits: Int) {
921922
if (IPSubnetCalc.isValidIPv6(ipAddress: ipv6, mask: maskbits)) {
922923
(self.ipv4Address, _) = IPSubnetCalc.convertIPv6toIPv4(ipAddress: ipv6)
923-
if (maskbits >= (96 + Constants.classAbits)) {
924-
self.maskBits = maskbits - 96
924+
if (maskbits >= (Constants.defaultIPv6to4Mask + Constants.classAbits)) {
925+
self.maskBits = maskbits - Constants.defaultIPv6to4Mask
925926
}
926927
else {
927928
self.maskBits = Constants.classAbits

‎SubnetCalcAppDelegate.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
1313
private enum Constants {
1414
static let defaultIP: String = "10.0.0.0"
1515
static let defaultIPv6Mask: String = "64"
16+
static let defaultIPv6to4Mask: Int = 96
1617
static let BUFFER_LINES:Int = 200000000
1718
static let NETWORK_BITS_MIN_CLASSLESS:Int = 1
1819
static let NETWORK_BITS_MIN:Int = 8
@@ -283,8 +284,8 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
283284
ipaddr = ipsc!.ipv4Address
284285
}
285286
if (ipmask != nil) {
286-
if (Int(ipmask!)! >= (96 + 8)) {
287-
ipmask = String(Int(ipmask!)! - 96)
287+
if (Int(ipmask!)! >= (Constants.defaultIPv6to4Mask + 8)) {
288+
ipmask = String(Int(ipmask!)! - Constants.defaultIPv6to4Mask)
288289
}
289290
else {
290291
ipmask = "8"

‎SubnetCalcUITests/SubnetCalcUITest.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class SubnetCalcUITest: XCTestCase {
4343
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetrangetext"].value as! String, "10.32.2.53 - 10.32.2.54")
4444
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetidtext"].value as! String, "10.32.2.52")
4545
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetbroadcasttext"].value as! String, "10.32.2.55")
46-
XCTAssertEqual(subnetcalcWindow.popUpButtons["addrclasstypecell"].value as! String, "Class A : 1.0.0.0 - 126.255.255.255")
46+
XCTAssertEqual(subnetcalcWindow.popUpButtons["addrclasstypecell"].value as! String, "Class A: 1.0.0.0 - 126.255.255.255")
4747
XCTAssertEqual(subnetcalcWindow.staticTexts["classbitmap"].value as! String, "nnnnnnnn.ssssssss.ssssssss.sssssshh")
4848
XCTAssertEqual(subnetcalcWindow.staticTexts["binarymap"].value as! String, "00001010.00100000.00000010.00110100")
4949
XCTAssertEqual(subnetcalcWindow.staticTexts["hexamap"].value as! String, "0A.20.02.34")
@@ -69,7 +69,7 @@ class SubnetCalcUITest: XCTestCase {
6969
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetrangetext"].value as! String, "192.160.0.1 - 192.175.255.254")
7070
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetidtext"].value as! String, "192.160.0.0")
7171
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetbroadcasttext"].value as! String, "192.175.255.255")
72-
XCTAssertEqual(subnetcalcWindow.popUpButtons["addrclasstypecell"].value as! String, "Class C : 192.0.0.0 - 223.255.255.255")
72+
XCTAssertEqual(subnetcalcWindow.popUpButtons["addrclasstypecell"].value as! String, "Class C: 192.0.0.0 - 223.255.255.255")
7373
XCTAssertEqual(subnetcalcWindow.staticTexts["classbitmap"].value as! String, "nnnnnnnn.nnnnhhhh.hhhhhhhh.hhhhhhhh")
7474
XCTAssertEqual(subnetcalcWindow.staticTexts["binarymap"].value as! String, "11000000.10101000.11111110.10000001")
7575
XCTAssertEqual(subnetcalcWindow.staticTexts["hexamap"].value as! String, "C0.A8.FE.81")
@@ -96,7 +96,7 @@ class SubnetCalcUITest: XCTestCase {
9696
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetrangetext"].value as! String, "172.0.0.1 - 172.255.255.254")
9797
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetidtext"].value as! String, "172.0.0.0")
9898
XCTAssertEqual(subnetcalcWindow.staticTexts["subnetbroadcasttext"].value as! String, "172.255.255.255")
99-
XCTAssertEqual(subnetcalcWindow.popUpButtons["addrclasstypecell"].value as! String, "Class B : 128.0.0.0 - 191.255.255.255")
99+
XCTAssertEqual(subnetcalcWindow.popUpButtons["addrclasstypecell"].value as! String, "Class B: 128.0.0.0 - 191.255.255.255")
100100
XCTAssertEqual(subnetcalcWindow.staticTexts["classbitmap"].value as! String, "nnnnnnnn.hhhhhhhh.hhhhhhhh.hhhhhhhh")
101101
XCTAssertEqual(subnetcalcWindow.staticTexts["binarymap"].value as! String, "10101100.00010000.11110010.10000100")
102102
XCTAssertEqual(subnetcalcWindow.staticTexts["hexamap"].value as! String, "AC.10.F2.84")

0 commit comments

Comments
 (0)