B-Tree Playground & Tests updated to Swift 4

LeslieLee1203 · Jul 31, 2017 · aad5d28 · aad5d28
1 parent 0e0ae64
commit aad5d28
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 44 deletions.
diff --git a/B-Tree/BTree.playground/Contents.swift b/B-Tree/BTree.playground/Contents.swift
@@ -2,6 +2,11 @@
 
 import Foundation
 
+// last checked with Xcode 9.0b4
+#if swift(>=4.0)
+print("Hello, Swift 4!")
+#endif
+
 let bTree = BTree<Int, Int>(order: 1)!
 
 bTree.insert(1, for: 1)
@@ -15,7 +20,7 @@ bTree[3]
 bTree.remove(2)
 
 bTree.traverseKeysInOrder { key in
-  print(key)
+    print(key)
 }
 
 bTree.numberOfKeys

diff --git a/B-Tree/Tests/Tests.xcodeproj/project.pbxproj b/B-Tree/Tests/Tests.xcodeproj/project.pbxproj
@@ -179,6 +179,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -219,6 +220,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -232,7 +234,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = viktorsimko.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -245,7 +247,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = viktorsimko.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/B-Tree/Tests/Tests/BTreeNodeTests.swift b/B-Tree/Tests/Tests/BTreeNodeTests.swift
@@ -9,45 +9,50 @@
 import XCTest
 
 class BTreeNodeTests: XCTestCase {
-
-  let owner = BTree<Int, Int>(order: 2)!
-  var root: BTreeNode<Int, Int>!
-  var leftChild: BTreeNode<Int, Int>!
-  var rightChild: BTreeNode<Int, Int>!
-
-  override func setUp() {
-    super.setUp()
-
-    root = BTreeNode(owner: owner)
-    leftChild = BTreeNode(owner: owner)
-    rightChild = BTreeNode(owner: owner)
-
-    root.insert(1, for: 1)
-    root.children = [leftChild, rightChild]
-  }
-
-  func testIsLeafRoot() {
-    XCTAssertFalse(root.isLeaf)
-  }
-
-  func testIsLeafLeaf() {
-    XCTAssertTrue(leftChild.isLeaf)
-    XCTAssertTrue(rightChild.isLeaf)
-  }
-
-  func testOwner() {
-    XCTAssert(root.owner === owner)
-    XCTAssert(leftChild.owner === owner)
-    XCTAssert(rightChild.owner === owner)
-  }
-
-  func testNumberOfKeys() {
-    XCTAssertEqual(root.numberOfKeys, 1)
-    XCTAssertEqual(leftChild.numberOfKeys, 0)
-    XCTAssertEqual(rightChild.numberOfKeys, 0)
-  }
-
-  func testChildren() {
-    XCTAssertEqual(root.children!.count, 2)
-  }
+
+    let owner = BTree<Int, Int>(order: 2)!
+    var root: BTreeNode<Int, Int>!
+    var leftChild: BTreeNode<Int, Int>!
+    var rightChild: BTreeNode<Int, Int>!
+    func testSwift4() {
+        // last checked with Xcode 9.0b4
+        #if swift(>=4.0)
+            print("Hello, Swift 4!")
+        #endif
+    }
+    override func setUp() {
+        super.setUp()
+
+        root = BTreeNode(owner: owner)
+        leftChild = BTreeNode(owner: owner)
+        rightChild = BTreeNode(owner: owner)
+
+        root.insert(1, for: 1)
+        root.children = [leftChild, rightChild]
+    }
+
+    func testIsLeafRoot() {
+        XCTAssertFalse(root.isLeaf)
+    }
+
+    func testIsLeafLeaf() {
+        XCTAssertTrue(leftChild.isLeaf)
+        XCTAssertTrue(rightChild.isLeaf)
+    }
+
+    func testOwner() {
+        XCTAssert(root.owner === owner)
+        XCTAssert(leftChild.owner === owner)
+        XCTAssert(rightChild.owner === owner)
+    }
+
+    func testNumberOfKeys() {
+        XCTAssertEqual(root.numberOfKeys, 1)
+        XCTAssertEqual(leftChild.numberOfKeys, 0)
+        XCTAssertEqual(rightChild.numberOfKeys, 0)
+    }
+
+    func testChildren() {
+        XCTAssertEqual(root.children!.count, 2)
+    }
 }
diff --git a/B-Tree/Tests/Tests/BTreeTests.swift b/B-Tree/Tests/Tests/BTreeTests.swift
@@ -11,6 +11,13 @@ import XCTest
 class BTreeTests: XCTestCase {
   var bTree: BTree<Int, Int>!
 
+    func testSwift4() {
+        // last checked with Xcode 9.0b4
+        #if swift(>=4.0)
+            print("Hello, Swift 4!")
+        #endif
+    }
+
   override func setUp() {
     super.setUp()
     bTree = BTree<Int, Int>(order: 3)!