Various test tweaks

Author: lukaskubanek

Tests/InterposeKitTests/ClassHookTests.swift

@@ -2,7 +2,7 @@
 import XCTest
 
 fileprivate class ExampleClass: NSObject {
-    @objc dynamic func foo() {}
+    @objc dynamic func doSomething() {}
 }
 
 fileprivate class ExampleSubclass: ExampleClass {}
@@ -12,7 +12,7 @@ final class ClassHookTests: InterposeKitTestCase {
     func testSuccess_applyHook() throws {
         let hook = try Interpose.applyHook(
             on: ExampleClass.self,
-            for: #selector(ExampleClass.foo),
+            for: #selector(ExampleClass.doSomething),
             methodSignature: (@convention(c) (NSObject, Selector) -> Void).self,
             hookSignature: (@convention(block) (NSObject) -> Void).self
         ) { hook in
@@ -22,22 +22,22 @@ final class ClassHookTests: InterposeKitTestCase {
         XCTAssertEqual(hook.state, .active)
         XCTAssertMatchesRegex(
             hook.debugDescription,
-            #"^Active hook for -\[ExampleClass foo\] \(originalIMP: 0x[0-9a-fA-F]+\)$"#
+            #"^Active hook for -\[ExampleClass doSomething\] \(originalIMP: 0x[0-9a-fA-F]+\)$"#
         )
 
         try hook.revert()
 
         XCTAssertEqual(hook.state, .pending)
         XCTAssertMatchesRegex(
             hook.debugDescription,
-            #"^Pending hook for -\[ExampleClass foo\]$"#
+            #"^Pending hook for -\[ExampleClass doSomething\]$"#
         )
     }
 
     func testSuccess_prepareHook() throws {
         let hook = try Interpose.prepareHook(
             on: ExampleClass.self,
-            for: #selector(ExampleClass.foo),
+            for: #selector(ExampleClass.doSomething),
             methodSignature: (@convention(c) (NSObject, Selector) -> Void).self,
             hookSignature: (@convention(block) (NSObject) -> Void).self
         ) { hook in
@@ -47,39 +47,39 @@ final class ClassHookTests: InterposeKitTestCase {
         XCTAssertEqual(hook.state, .pending)
         XCTAssertMatchesRegex(
             hook.debugDescription,
-            #"^Pending hook for -\[ExampleClass foo\]$"#
+            #"^Pending hook for -\[ExampleClass doSomething\]$"#
         )
 
         try hook.apply()
 
         XCTAssertEqual(hook.state, .active)
         XCTAssertMatchesRegex(
             hook.debugDescription,
-            #"^Active hook for -\[ExampleClass foo\] \(originalIMP: 0x[0-9a-fA-F]+\)$"#
+            #"^Active hook for -\[ExampleClass doSomething\] \(originalIMP: 0x[0-9a-fA-F]+\)$"#
         )
 
         try hook.revert()
 
         XCTAssertEqual(hook.state, .pending)
         XCTAssertMatchesRegex(
             hook.debugDescription,
-            #"^Pending hook for -\[ExampleClass foo\]$"#
+            #"^Pending hook for -\[ExampleClass doSomething\]$"#
         )
     }
 
     func testValidationFailure_methodNotFound() throws {
         XCTAssertThrowsError(
             try Interpose.prepareHook(
                 on: ExampleClass.self,
-                for: Selector(("bar")),
+                for: Selector(("doSomethingNotFound")),
                 methodSignature: (@convention(c) (NSObject, Selector) -> Void).self,
                 hookSignature: (@convention(block) (NSObject) -> Void).self
             ) { hook in
                 return { `self` in }
             },
             expected: InterposeError.methodNotFound(
                 class: ExampleClass.self,
-                selector: Selector(("bar"))
+                selector: Selector(("doSomethingNotFound"))
             )
         )
     }
@@ -88,23 +88,23 @@ final class ClassHookTests: InterposeKitTestCase {
         XCTAssertThrowsError(
             try Interpose.prepareHook(
                 on: ExampleSubclass.self,
-                for: #selector(ExampleClass.foo),
+                for: #selector(ExampleClass.doSomething),
                 methodSignature: (@convention(c) (NSObject, Selector) -> Void).self,
                 hookSignature: (@convention(block) (NSObject) -> Void).self
             ) { hook in
                 return { `self` in }
             },
             expected: InterposeError.methodNotDirectlyImplemented(
                 class: ExampleSubclass.self,
-                selector: #selector(ExampleClass.foo)
+                selector: #selector(ExampleClass.doSomething)
             )
         )
     }
 
     func testRevertFailure_corrupted() throws {
         let hook = try Interpose.applyHook(
             on: ExampleClass.self,
-            for: #selector(ExampleClass.foo),
+            for: #selector(ExampleClass.doSomething),
             methodSignature: (@convention(c) (NSObject, Selector) -> Void).self,
             hookSignature: (@convention(block) (NSObject) -> Void).self
         ) { hook in
@@ -116,15 +116,15 @@ final class ClassHookTests: InterposeKitTestCase {
         // in which it cannot restore the original implementation.
         let method = try XCTUnwrap(class_getInstanceMethod(
             ExampleClass.self,
-            #selector(ExampleClass.foo)
+            #selector(ExampleClass.doSomething)
         ))
 
         let externalBlock: @convention(block) (NSObject) -> Void = { _ in }
         let externalIMP = imp_implementationWithBlock(externalBlock)
 
         XCTAssertNotNil(class_replaceMethod(
             ExampleClass.self,
-            #selector(ExampleClass.foo),
+            #selector(ExampleClass.doSomething),
             externalIMP,
             method_getTypeEncoding(method)
         ))
@@ -133,15 +133,15 @@ final class ClassHookTests: InterposeKitTestCase {
             try hook.revert(),
             expected: InterposeError.revertCorrupted(
                 class: ExampleClass.self,
-                selector: #selector(ExampleClass.foo),
+                selector: #selector(ExampleClass.doSomething),
                 imp: externalIMP
             )
         )
 
         XCTAssertEqual(hook.state, .failed)
         XCTAssertMatchesRegex(
             hook.debugDescription,
-            #"^Failed hook for -\[ExampleClass foo\]$"#
+            #"^Failed hook for -\[ExampleClass doSomething\]$"#
         )
     }
 

Tests/InterposeKitTests/ToBePolished/InterposeKitTests.swift

@@ -3,10 +3,6 @@ import XCTest
 
 final class InterposeKitTests: InterposeKitTestCase {
 
-    override func setUpWithError() throws {
-        Interpose.isLoggingEnabled = true
-    }
-
     func testClassOverrideAndRevert() throws {
         let testObj = TestClass()
         XCTAssertEqual(testObj.sayHi(), testClassHi)

Tests/InterposeKitTests/ToBePolished/KVOTests.swift

@@ -26,7 +26,8 @@ final class KVOTests: InterposeKitTestCase {
         let testObj = TestClass()
 
         // KVO before hooking works, but hooking will fail
-        try withExtendedLifetime(TestClassObserver()) { observer in
+        do {
+            let observer = TestClassObserver()
             observer.observe(obj: testObj)
             XCTAssertEqual(testObj.age, 1)
             testObj.age = 2
@@ -61,7 +62,8 @@ final class KVOTests: InterposeKitTestCase {
         XCTAssertEqual(testObj.age, 3)
 
         // Now we KVO after hooking!
-        withExtendedLifetime(TestClassObserver()) { observer in
+        do {
+            let observer = TestClassObserver()
             observer.observe(obj: testObj)
             XCTAssertEqual(testObj.age, 3)
             // Setter is fine but won't change outcome