From e49e3cad08385554700f08431e1b164e4bd85b72 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Tue, 2 Nov 2021 22:52:47 +0100
Subject: [PATCH] Fix test inter-dependencies

Cannot depend on another test target?
---
 Package.swift                                 |  5 ++---
 .../DataManipulationTests.swift               |  2 +-
 Tests/TunnelKitCoreTests/RandomTests.swift    |  2 +-
 .../RawPerformanceTests.swift                 |  2 +-
 Tests/TunnelKitCoreTests/RoutingTests.swift   |  2 +-
 .../{TestUtils+Core.swift => TestUtils.swift} |  8 ++-----
 .../TunnelKitLZOTests/CompressionTests.swift  |  2 +-
 .../AppExtensionTests.swift                   |  2 +-
 .../ConfigurationParserTests.swift            |  2 +-
 .../ControlChannelTests.swift                 |  2 +-
 .../DataPathEncryptionTests.swift             |  2 +-
 .../DataPathPerformanceTests.swift            |  3 +--
 .../EncryptionPerformanceTests.swift          |  3 +--
 .../EncryptionTests.swift                     |  2 +-
 Tests/TunnelKitOpenVPNTests/LinkTests.swift   |  3 +--
 Tests/TunnelKitOpenVPNTests/PacketTests.swift |  2 +-
 Tests/TunnelKitOpenVPNTests/PushTests.swift   |  2 +-
 .../StaticKeyTests.swift                      |  2 +-
 ...estUtils+OpenVPN.swift => TestUtils.swift} | 21 +++++++++++++++++--
 19 files changed, 39 insertions(+), 30 deletions(-)
 rename Tests/TunnelKitCoreTests/{TestUtils+Core.swift => TestUtils.swift} (93%)
 rename Tests/TunnelKitOpenVPNTests/{TestUtils+OpenVPN.swift => TestUtils.swift} (87%)

diff --git a/Package.swift b/Package.swift
index 7e9b95e..ae9f7f4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -89,13 +89,11 @@ let package = Package(
         .testTarget(
             name: "TunnelKitCoreTests",
             dependencies: [
-                "TunnelKitCore",
-                "_TunnelKitCoreObjC"
+                "TunnelKitCore"
             ]),
         .testTarget(
             name: "TunnelKitOpenVPNTests",
             dependencies: [
-                "TunnelKitCoreTests",
                 "TunnelKitOpenVPN",
                 "_TunnelKitOpenVPNObjC",
                 "TunnelKitLZO"
@@ -106,6 +104,7 @@ let package = Package(
         .testTarget(
             name: "TunnelKitLZOTests",
             dependencies: [
+                "TunnelKitCore",
                 "TunnelKitLZO"
             ]),
     ]
diff --git a/Tests/TunnelKitCoreTests/DataManipulationTests.swift b/Tests/TunnelKitCoreTests/DataManipulationTests.swift
index 914afc1..a5ee129 100644
--- a/Tests/TunnelKitCoreTests/DataManipulationTests.swift
+++ b/Tests/TunnelKitCoreTests/DataManipulationTests.swift
@@ -1,6 +1,6 @@
 //
 //  DataManipulationTests.swift
-//  TunnelKitTests
+//  TunnelKitCoreTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitCoreTests/RandomTests.swift b/Tests/TunnelKitCoreTests/RandomTests.swift
index 91671ac..e4c9e56 100644
--- a/Tests/TunnelKitCoreTests/RandomTests.swift
+++ b/Tests/TunnelKitCoreTests/RandomTests.swift
@@ -1,6 +1,6 @@
 //
 //  RandomTests.swift
-//  TunnelKitTests
+//  TunnelKitCoreTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitCoreTests/RawPerformanceTests.swift b/Tests/TunnelKitCoreTests/RawPerformanceTests.swift
index aa20c77..cd92b40 100644
--- a/Tests/TunnelKitCoreTests/RawPerformanceTests.swift
+++ b/Tests/TunnelKitCoreTests/RawPerformanceTests.swift
@@ -1,6 +1,6 @@
 //
 //  RawPerformanceTests.swift
-//  TunnelKitTests
+//  TunnelKitCoreTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitCoreTests/RoutingTests.swift b/Tests/TunnelKitCoreTests/RoutingTests.swift
index 0ae2b88..76cfaf2 100644
--- a/Tests/TunnelKitCoreTests/RoutingTests.swift
+++ b/Tests/TunnelKitCoreTests/RoutingTests.swift
@@ -1,6 +1,6 @@
 //
 //  RoutingTests.swift
-//  TunnelKitTests
+//  TunnelKitCoreTests
 //
 //  Created by Davide De Rosa on 4/30/19.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitCoreTests/TestUtils+Core.swift b/Tests/TunnelKitCoreTests/TestUtils.swift
similarity index 93%
rename from Tests/TunnelKitCoreTests/TestUtils+Core.swift
rename to Tests/TunnelKitCoreTests/TestUtils.swift
index 267f6d7..c3a9a8f 100644
--- a/Tests/TunnelKitCoreTests/TestUtils+Core.swift
+++ b/Tests/TunnelKitCoreTests/TestUtils.swift
@@ -1,6 +1,6 @@
 //
-//  TestUtils+Core.swift
-//  TunnelKitTests
+//  TestUtils.swift
+//  TunnelKitCoreTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
@@ -38,10 +38,6 @@ import Foundation
 @testable import TunnelKitCore
 
 public class TestUtils {
-    public static func uniqArray(_ v: [Int]) -> [Int] {
-        return v.reduce([]){ $0.contains($1) ? $0 : $0 + [$1] }
-    }
-    
     public static func generateDataSuite(_ size: Int, _ count: Int) -> [Data] {
         var suite = [Data]()
         for _ in 0..<count {
diff --git a/Tests/TunnelKitLZOTests/CompressionTests.swift b/Tests/TunnelKitLZOTests/CompressionTests.swift
index c2113c9..0504714 100644
--- a/Tests/TunnelKitLZOTests/CompressionTests.swift
+++ b/Tests/TunnelKitLZOTests/CompressionTests.swift
@@ -1,6 +1,6 @@
 //
 //  CompressionTests.swift
-//  TunnelKitTests
+//  TunnelKitLZOTests
 //
 //  Created by Davide De Rosa on 3/18/19.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/AppExtensionTests.swift b/Tests/TunnelKitOpenVPNTests/AppExtensionTests.swift
index 2c15ad5..3d25a1b 100644
--- a/Tests/TunnelKitOpenVPNTests/AppExtensionTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/AppExtensionTests.swift
@@ -1,6 +1,6 @@
 //
 //  AppExtensionTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 10/23/17.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/ConfigurationParserTests.swift b/Tests/TunnelKitOpenVPNTests/ConfigurationParserTests.swift
index 52762a0..dd0027e 100644
--- a/Tests/TunnelKitOpenVPNTests/ConfigurationParserTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/ConfigurationParserTests.swift
@@ -1,6 +1,6 @@
 //
 //  ConfigurationParserTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 11/10/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift b/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift
index 9f0d172..87047d2 100644
--- a/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift
@@ -1,6 +1,6 @@
 //
 //  ControlChannelTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 9/10/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift b/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift
index 1809a29..6e679ab 100644
--- a/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift
@@ -1,6 +1,6 @@
 //
 //  DataPathEncryptionTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 7/11/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift b/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift
index 39add8d..81a9cff 100644
--- a/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift
@@ -1,6 +1,6 @@
 //
 //  DataPathPerformanceTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
@@ -38,7 +38,6 @@ import XCTest
 @testable import TunnelKitCore
 @testable import TunnelKitOpenVPN
 import _TunnelKitOpenVPNObjC
-import TunnelKitCoreTests
 
 class DataPathPerformanceTests: XCTestCase {
     private var dataPath: DataPath!
diff --git a/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift b/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift
index 2de3553..ce4f336 100644
--- a/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift
@@ -1,6 +1,6 @@
 //
 //  EncryptionPerformanceTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
@@ -38,7 +38,6 @@ import XCTest
 @testable import TunnelKitCore
 import _TunnelKitCoreObjC
 import _TunnelKitOpenVPNObjC
-import TunnelKitCoreTests
 
 class EncryptionPerformanceTests: XCTestCase {
     private var cbcEncrypter: Encrypter!
diff --git a/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift b/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift
index 3aadac3..976b3e4 100644
--- a/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift
@@ -1,6 +1,6 @@
 //
 //  EncryptionTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/LinkTests.swift b/Tests/TunnelKitOpenVPNTests/LinkTests.swift
index aa4a06b..16755cd 100644
--- a/Tests/TunnelKitOpenVPNTests/LinkTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/LinkTests.swift
@@ -1,6 +1,6 @@
 //
 //  LinkTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
@@ -37,7 +37,6 @@
 import XCTest
 @testable import TunnelKitCore
 @testable import _TunnelKitCoreObjC
-import TunnelKitCoreTests
 
 class LinkTests: XCTestCase {
 
diff --git a/Tests/TunnelKitOpenVPNTests/PacketTests.swift b/Tests/TunnelKitOpenVPNTests/PacketTests.swift
index fbbc9b4..0a2b8d7 100644
--- a/Tests/TunnelKitOpenVPNTests/PacketTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/PacketTests.swift
@@ -1,6 +1,6 @@
 //
 //  PacketTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 9/9/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/PushTests.swift b/Tests/TunnelKitOpenVPNTests/PushTests.swift
index d667991..74ba70e 100644
--- a/Tests/TunnelKitOpenVPNTests/PushTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/PushTests.swift
@@ -1,6 +1,6 @@
 //
 //  PushTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 8/24/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/StaticKeyTests.swift b/Tests/TunnelKitOpenVPNTests/StaticKeyTests.swift
index b890996..885f065 100644
--- a/Tests/TunnelKitOpenVPNTests/StaticKeyTests.swift
+++ b/Tests/TunnelKitOpenVPNTests/StaticKeyTests.swift
@@ -1,6 +1,6 @@
 //
 //  StaticKeyTests.swift
-//  TunnelKitTests
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 9/11/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
diff --git a/Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift b/Tests/TunnelKitOpenVPNTests/TestUtils.swift
similarity index 87%
rename from Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift
rename to Tests/TunnelKitOpenVPNTests/TestUtils.swift
index 9873711..491fa8a 100644
--- a/Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift
+++ b/Tests/TunnelKitOpenVPNTests/TestUtils.swift
@@ -1,6 +1,6 @@
 //
-//  TestUtils+OpenVPN.swift
-//  TunnelKitTests
+//  TestUtils.swift
+//  TunnelKitOpenVPNTests
 //
 //  Created by Davide De Rosa on 7/7/18.
 //  Copyright (c) 2021 Davide De Rosa. All rights reserved.
@@ -39,6 +39,23 @@ import Foundation
 import _TunnelKitCoreObjC
 import _TunnelKitOpenVPNObjC
 
+public class TestUtils {
+    public static func uniqArray(_ v: [Int]) -> [Int] {
+        return v.reduce([]){ $0.contains($1) ? $0 : $0 + [$1] }
+    }
+    
+    public static func generateDataSuite(_ size: Int, _ count: Int) -> [Data] {
+        var suite = [Data]()
+        for _ in 0..<count {
+            suite.append(try! SecureRandom.data(length: size))
+        }
+        return suite
+    }
+    
+    private init() {
+    }
+}
+
 extension Encrypter {
     func encryptData(_ data: Data, flags: UnsafePointer<CryptoFlags>?) throws -> Data {
         let srcLength = data.count