removed linux thread safety tests, regenerate test manifest

AliSoftware · Jun 30, 2019 · de7ad3a · de7ad3a
1 parent 40ad490
commit de7ad3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 94 deletions.
diff --git a/Tests/DipTests/ThreadSafetyTests.swift b/Tests/DipTests/ThreadSafetyTests.swift
@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 //
 
+#if canImport(ObjectiveC)
 import XCTest
 @testable import Dip
 
@@ -62,22 +63,6 @@ private var resolvedClients = Array<ClientImp>()
 
 private var container: DependencyContainer!
 
-#if os(Linux)
-import Glibc
-
-private var runningThreads: Int = 0
-private var lock: pthread_spinlock_t = 0
-
-private let resolveClientSync: () -> Client? = {
-  let pointer = dispatch_sync { _ in
-    let resolved = try! container.resolve() as Client
-    return UnsafeMutableRawPointer(Unmanaged.passRetained(resolved as! ClientImp).toOpaque())
-  }
-  guard let clientPointer = pointer else { return nil }
-  return Unmanaged<ClientImp>.fromOpaque(clientPointer).takeRetainedValue()
-}
-
-#else
 let queue = OperationQueue()
 let lock = RecursiveLock()
 
@@ -88,42 +73,23 @@ private let resolveClientSync: () -> Client? = {
   }
   return client
 }
-
-#endif
 
 let resolveServerAsync = {
   let server = try! container.resolve() as Server
   lock.lock()
   resolvedServers.insert(server as! ServerImp)
-
-  #if os(Linux)
-    runningThreads -= 1
-  #endif
-
   lock.unlock()
 }
 
 let resolveClientAsync = {
   let client = try! container.resolve() as Client
   lock.lock()
   resolvedClients.append(client as! ClientImp)
-
-  #if os(Linux)
-    runningThreads -= 1
-  #endif
-
   lock.unlock()
 }
 
 class ThreadSafetyTests: XCTestCase {
 
-  #if os(Linux)
-  required init(name: String, testClosure: @escaping (XCTestCase) throws -> Void) {
-    pthread_spin_init(&lock, 0)
-    super.init(name: name, testClosure: testClosure)
-  }
-  #endif
-
   override func setUp() {
     Dip.logLevel = .Verbose
     container = DependencyContainer()
@@ -138,25 +104,10 @@ class ThreadSafetyTests: XCTestCase {
     container.register(.singleton) { ServerImp() as Server }
 
     for _ in 0..<100 {
-      #if os(Linux)
-      lock.lock()
-      runningThreads += 1
-      lock.unlock()
-
-      dispatch_async { _ in
-        resolveServerAsync()
-        return nil
-      }
-      #else
       queue.addOperation(resolveServerAsync)
-      #endif
     }
 
-    #if os(Linux)
-    while runningThreads > 0 { sleep(1) }
-    #else
     queue.waitUntilAllOperationsAreFinished()
-    #endif
 
     XCTAssertEqual(resolvedServers.count, 1, "Should create only one instance")
   }
@@ -166,25 +117,10 @@ class ThreadSafetyTests: XCTestCase {
     container.register { ServerImp() as Server }
 
     for _ in 0..<100 {
-      #if os(Linux)
-      lock.lock()
-      runningThreads += 1
-      lock.unlock()
-
-      dispatch_async { _ in
-        resolveServerAsync()
-        return nil
-      }
-      #else
       queue.addOperation(resolveServerAsync)
-      #endif
     }
 
-    #if os(Linux)
-    while runningThreads > 0 { sleep(1) }
-    #else
     queue.waitUntilAllOperationsAreFinished()
-    #endif
 
     XCTAssertEqual(resolvedServers.count, 100, "All instances should be different")
   }
@@ -201,25 +137,10 @@ class ThreadSafetyTests: XCTestCase {
     }
 
     for _ in 0..<100 {
-      #if os(Linux)
-      lock.lock()
-      runningThreads += 1
-      lock.unlock()
-
-      dispatch_async { _ in
-        resolveClientAsync()
-        return nil
-      }
-      #else
       queue.addOperation(resolveClientAsync)
-      #endif
     }
 
-    #if os(Linux)
-    while runningThreads > 0 { sleep(1) }
-    #else
     queue.waitUntilAllOperationsAreFinished()
-    #endif
 
     XCTAssertEqual(resolvedClients.count, 100, "Instances should be not reused in different object graphs")
     for client in resolvedClients {
@@ -230,5 +151,4 @@ class ThreadSafetyTests: XCTestCase {
   }
 
 }
-
-
+#endif
diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -7,8 +7,11 @@ extension AutoInjectionTests {
     // to regenerate.
     static let __allTests__AutoInjectionTests = [
         ("testThatItAutoInjectsPropertyWithCollaboratingContainer", testThatItAutoInjectsPropertyWithCollaboratingContainer),
+        ("testThatItAutoInjectsWhenOverridenInDefinition", testThatItAutoInjectsWhenOverridenInDefinition),
         ("testThatItCallsDidInjectOnAutoInjectedProperty", testThatItCallsDidInjectOnAutoInjectedProperty),
         ("testThatItCallsResolveDependencyBlockWhenAutoInjecting", testThatItCallsResolveDependencyBlockWhenAutoInjecting),
+        ("testThatItDoesNotAutoInjectIfDisabledInContainer", testThatItDoesNotAutoInjectIfDisabledInContainer),
+        ("testThatItDoesNotAutoInjectIfDisabledInDefinition", testThatItDoesNotAutoInjectIfDisabledInDefinition),
         ("testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag", testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag),
         ("testThatItPassesTagToAutoInjectedProperty", testThatItPassesTagToAutoInjectedProperty),
         ("testThatItResolvesAutoInjectedDependencies", testThatItResolvesAutoInjectedDependencies),
@@ -113,6 +116,7 @@ extension DipTests {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__DipTests = [
+        ("test_weak_mirror_regression", test_weak_mirror_regression),
         ("testItCallsResolveDependenciesOnResolableInstance", testItCallsResolveDependenciesOnResolableInstance),
         ("testThatCollaboratingContainersAreWeakReferences", testThatCollaboratingContainersAreWeakReferences),
         ("testThatCollaboratingContainersReuseInstancesResolvedByAnotherContainer", testThatCollaboratingContainersReuseInstancesResolvedByAnotherContainer),
@@ -162,17 +166,6 @@ extension RuntimeArgumentsTests {
     ]
 }
 
-extension ThreadSafetyTests {
-    // DO NOT MODIFY: This is autogenerated, use:
-    //   `swift test --generate-linuxmain`
-    // to regenerate.
-    static let __allTests__ThreadSafetyTests = [
-        ("testCircularReferenceThreadSafety", testCircularReferenceThreadSafety),
-        ("testFactoryThreadSafety", testFactoryThreadSafety),
-        ("testSingletonThreadSafety", testSingletonThreadSafety),
-    ]
-}
-
 extension TypeForwardingTests {
     // DO NOT MODIFY: This is autogenerated, use:
     //   `swift test --generate-linuxmain`
@@ -189,6 +182,7 @@ extension TypeForwardingTests {
         ("testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType", testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType),
         ("testThatItResolvesInstanceByTypeForwarding", testThatItResolvesInstanceByTypeForwarding),
         ("testThatItReusesInstanceResolvedByTypeForwarding", testThatItReusesInstanceResolvedByTypeForwarding),
+        ("testThatItReusesInstancesResolvedForOptionalType", testThatItReusesInstancesResolvedForOptionalType),
         ("testThatItThrowsErrorWhenResolvingNotImplementedTypeWithTypeForwarding", testThatItThrowsErrorWhenResolvingNotImplementedTypeWithTypeForwarding),
     ]
 }
@@ -202,7 +196,6 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(DefinitionTests.__allTests__DefinitionTests),
         testCase(DipTests.__allTests__DipTests),
         testCase(RuntimeArgumentsTests.__allTests__RuntimeArgumentsTests),
-        //testCase(ThreadSafetyTests.__allTests__ThreadSafetyTests),
         testCase(TypeForwardingTests.__allTests__TypeForwardingTests),
     ]
 }