diff --git a/Tests/Bundle.swift b/Tests/OpenVPNAdapter/Bundle.swift similarity index 100% rename from Tests/Bundle.swift rename to Tests/OpenVPNAdapter/Bundle.swift diff --git a/Tests/CustomFlow.swift b/Tests/OpenVPNAdapter/CustomFlow.swift similarity index 100% rename from Tests/CustomFlow.swift rename to Tests/OpenVPNAdapter/CustomFlow.swift diff --git a/Tests/OpenVPNAdapterTests.swift b/Tests/OpenVPNAdapter/OpenVPNAdapterTests.swift similarity index 100% rename from Tests/OpenVPNAdapterTests.swift rename to Tests/OpenVPNAdapter/OpenVPNAdapterTests.swift diff --git a/Tests/OpenVPNConfigurationTests.swift b/Tests/OpenVPNAdapter/OpenVPNConfigurationTests.swift similarity index 100% rename from Tests/OpenVPNConfigurationTests.swift rename to Tests/OpenVPNAdapter/OpenVPNConfigurationTests.swift diff --git a/Tests/OpenVPNReachabilityTests.swift b/Tests/OpenVPNAdapter/OpenVPNReachabilityTests.swift similarity index 100% rename from Tests/OpenVPNReachabilityTests.swift rename to Tests/OpenVPNAdapter/OpenVPNReachabilityTests.swift diff --git a/Tests/VPNProfile.swift b/Tests/OpenVPNAdapter/VPNProfile.swift similarity index 100% rename from Tests/VPNProfile.swift rename to Tests/OpenVPNAdapter/VPNProfile.swift diff --git a/Tests/OpenVPNCertificateTests.swift b/Tests/OpenVPNCertificateTests.swift deleted file mode 100644 index 2f47570..0000000 --- a/Tests/OpenVPNCertificateTests.swift +++ /dev/null @@ -1,100 +0,0 @@ -// -// OpenVPNCertificateTests.swift -// OpenVPN Adapter -// -// Created by Sergey Abramchuk on 06.09.17. -// -// - -import XCTest -@testable import OpenVPNAdapter - -class OpenVPNCertificateTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testCertificatePEMandDER() { - guard - let caURL = Bundle.current.url(forResource: "test-ca", withExtension: "crt"), - let caOriginalPEMData = try? Data(contentsOf: caURL) - else { - XCTFail() - return - } - - let certificateFromPEM: OpenVPNCertificate - do { - certificateFromPEM = try OpenVPNCertificate(pem: caOriginalPEMData) - } catch { - XCTFail(error.localizedDescription) - return - } - - let caDERData: Data - do { - caDERData = try certificateFromPEM.derData() - } catch { - XCTFail(error.localizedDescription) - return - } - - let certificateFromDER: OpenVPNCertificate - do { - certificateFromDER = try OpenVPNCertificate(der: caDERData) - } catch { - XCTFail(error.localizedDescription) - return - } - - let caGeneratedPEMData: Data - do { - caGeneratedPEMData = try certificateFromDER.pemData() - } catch { - XCTFail(error.localizedDescription) - return - } - - XCTAssert(caGeneratedPEMData.elementsEqual(caOriginalPEMData)) - } - - func testCertificateFromEmptyPEM() { - let caData = Data(count: 1024) - - do { - let _ = try OpenVPNCertificate(pem: caData) - } catch { - return - } - - XCTFail("Initialization with empty PEM data should fail") - } - - func testReadSerial() { - guard - let caURL = Bundle.current.url(forResource: "test-ca", withExtension: "crt"), - let caOriginalPEMData = try? Data(contentsOf: caURL) - else { - XCTFail() - return - } - - let certificateFromPEM: OpenVPNCertificate - do { - certificateFromPEM = try OpenVPNCertificate(pem: caOriginalPEMData) - } catch { - XCTFail(error.localizedDescription) - return - } - - XCTAssert(!certificateFromPEM.serial.isEmpty) - } - -} diff --git a/Tests/OpenVPNPrivateKeyTests.swift b/Tests/OpenVPNPrivateKeyTests.swift deleted file mode 100644 index ab45614..0000000 --- a/Tests/OpenVPNPrivateKeyTests.swift +++ /dev/null @@ -1,124 +0,0 @@ -// -// OpenVPNPrivateKeyTests.swift -// OpenVPN Adapter -// -// Created by Sergey Abramchuk on 07.09.17. -// -// - -import XCTest -@testable import OpenVPNAdapter - -class OpenVPNPrivateKeyTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testKeyPEMandDERWithoutPassword() { - guard - let caURL = Bundle.current.url(forResource: "keyfile-decrypted", withExtension: "3des"), - let caOriginalPEMData = try? Data(contentsOf: caURL) - else { - XCTFail() - return - } - - let keyFromPEM: OpenVPNPrivateKey - do { - keyFromPEM = try OpenVPNPrivateKey(pem: caOriginalPEMData, password: nil) - } catch { - XCTFail("\(error)") - return - } - - XCTAssert(keyFromPEM.type == .RSA) - - let keyDERData: Data - do { - keyDERData = try keyFromPEM.derData() - } catch { - XCTFail("\(error)") - return - } - - let keyFromDER: OpenVPNPrivateKey - do { - keyFromDER = try OpenVPNPrivateKey(der: keyDERData, password: nil) - } catch { - XCTFail("\(error)") - return - } - - XCTAssert(keyFromDER.type == .RSA) - - let keyGeneratedPEMData: Data - do { - keyGeneratedPEMData = try keyFromDER.pemData() - } catch { - XCTFail("\(error)") - return - } - - XCTAssert(keyGeneratedPEMData.elementsEqual(caOriginalPEMData)) - } - - func testKeyPEMandDERWithPassword() { - guard - let keyURL = Bundle.current.url(forResource: "keyfile-encrypted", withExtension: "3des"), - let keyOriginalPEMData = try? Data(contentsOf: keyURL) - else { - XCTFail() - return - } - - let keyFromPEM: OpenVPNPrivateKey - do { - keyFromPEM = try OpenVPNPrivateKey(pem: keyOriginalPEMData, password: "testkey") - } catch { - XCTFail("\(error)") - return - } - - let keyDERData: Data - do { - keyDERData = try keyFromPEM.derData() - } catch { - XCTFail("\(error)") - return - } - - let keyFromDER: OpenVPNPrivateKey - do { - keyFromDER = try OpenVPNPrivateKey(der: keyDERData, password: nil) - } catch { - XCTFail("\(error)") - return - } - - let keyGeneratedPEMData: Data - do { - keyGeneratedPEMData = try keyFromDER.pemData() - } catch { - XCTFail("\(error)") - return - } - - guard - let keySampleURL = Bundle.current.url(forResource: "keyfile-decrypted", withExtension: "3des"), - let keySamplePEMData = try? Data(contentsOf: keySampleURL) - else { - XCTFail() - return - } - - XCTAssert(keyGeneratedPEMData.elementsEqual(keySamplePEMData)) - } - -} diff --git a/Tests/Resources/keyfile-decrypted.3des b/Tests/Resources/keyfile-decrypted.3des deleted file mode 100644 index f54d47a..0000000 --- a/Tests/Resources/keyfile-decrypted.3des +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDMYfnvWtC8Id5bPKae5yXSxQTt+Zpul6AnnZWfI2TtIarvjHBF -UtXRo96y7hoL4VWOPKGCsRqMFDkrbeUjRrx8iL914/srnyf6sh9c8Zk04xEOpK1y -pvBz+Ks4uZObtjnnitf0NBGdjMKxveTq+VE7BWUIyQjtQ8mbDOsiLLvh7wIDAQAB -AoGAefPIT8MPpAJNjIE/JrfkAMTgsSLrvCurO5gzDBbxhPE+7tsMrsDDpuix3HBo -iEg3ZbzV3obQwV7b0gcr34W4t0CMuJf5b5irHRG8JcZuncmofDy6z7S5Vs75O85z -fVzTIuVUyuHy1rM6rSBYKfsMLVyImUb4wtIXEMHPzdCL9LECQQD3ZfgGqudMWq8v -3BlKhsQ4fsR0vxzNlMZfoRrZzcvBT339Bp1UQ8aUo8xBtHiRwuW1NaPNgYKX6XQ6 -ppuWuTiJAkEA030i493KnFPLRwWypqF/s6ZNlVye+euFN5NF/IeJcvb/GUDRYv9O -pRozRS1jNx4ZB1K2xT7N9MwsPHD6j6K4twJBALdfHTfT9RzjGnae7SAQQ+CcFYFz -JiY6386B2yUVJLFj+j5RaMvMcKQ7xGnvGm7vxtNJrt/j3qg6oavXUfulzgECQQDP -CEVLhCd/+ZeZoz5MWPTGTRrOCKmoRqNW0FlG6PfpD1qSwh04KG44uflO0yu5HUGr -JZG+bcj4x5bWZFMkoUrpAkEAyEgQzesKFqcbt1cqv3pLXJYQBBw6leFXgHk11a7k -+AkexhrPYyq/4tXFO2TLk2hs7tpYgNDOqZCvEu7jtN3RuA== ------END RSA PRIVATE KEY----- diff --git a/Tests/Resources/keyfile-encrypted.3des b/Tests/Resources/keyfile-encrypted.3des deleted file mode 100644 index 638c19a..0000000 --- a/Tests/Resources/keyfile-encrypted.3des +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,BE8274D6692AF2A7 - -9ZXjoF55A9XgJpdaWmF/ZL1sJfbnE1M42N7HHRDwpq1/K+afC9poM0/AdCUbRL7w -uvQERievbAYpNeLdah1EftM6033e1oTxUMivdL4orDKcbb3qDpSQ0o0UbjavbT+d -aruilW8zVP4dz3mYMvGbkgoujgzdT+4wM0T1mTTuYcRKQsHlg7QDy2QrBILNuXA4 -Hmye4GlSXVUSON8vPXT12V4oeubEIZVlnkLTRFGRVA4qz5tby9GBymkeNCBu+LCw -JwJLTbQwMFqozHvioq/2YBaHDcySpTD4X5AwrCjifUNO9BnLWLAmt8dOWr0z+48E -P/yWr5xZl3DrKh9r9EGb9xbTxhum3yHV7bvXLoUH+t9gowmd4Lq3Qjjf8jQXle0P -zoCOVxwN1E1IMhleEUPV7L8mbt26b0JyvrSS5ByrXahGu9vGQyy7qqx9ZANkzgXF -3hPMDuzQXMJiUeG92VsMEdGdA1/8V5ro+ceB5c7Zca5MjMzvx2tihda7BUjj6dSE -cA8Vvksy/NX/nqHSt0aSgphvBmZP8dN6GMcZ+hT7p0fhCq4mSFEykQqueKXiFUfz -0xCUVZC6WzOoEkc8k7xiLWQDlsZZ13Z4yxU1IxJp7llZXpZ8GkwS+678/Nx8h54A -mv5ZlSFWWQrvN5JPQJka7aU2ITu1LUK6mXBu+DoSDOfQuqR4vQytkjOqHK185iHs -JQtBGkFFdElkWgubPX/S8/xxoT8MoQY/c+dr6iwcswyUnSJXh32KLPGNBoqWCCbY -jp/VYmeb117gNpEJKJhcNbrP7DoQrC3/D7JFXnOvTA/z6FOtUmz0rQ== ------END RSA PRIVATE KEY----- diff --git a/Tests/Resources/test-ca.crt b/Tests/Resources/test-ca.crt deleted file mode 100644 index d41a420..0000000 --- a/Tests/Resources/test-ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUjCCAdegAwIBAgIJAMFD4n5iQ8zoMAoGCCqGSM49BAMCMD4xCzAJBgNVBAYT -Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF -QyBDQTAeFw0xMzA5MjQxNTQ5NDhaFw0yMzA5MjIxNTQ5NDhaMD4xCzAJBgNVBAYT -Ak5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBF -QyBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMPaKzRBN1gvh1b+/Im6KUNLTuBu -ww5XUzM5WNRStJGVOQsj318XJGJI/BqVKc4sLYfCiFKAr9ZqqyHduNMcbli4yuiy -aY7zQa0pw7RfdadHb9UZKVVpmlM7ILRmFmAzHqOBoDCBnTAdBgNVHQ4EFgQUnW0g -JEkBPyvLeLUZvH4kydv7NnwwbgYDVR0jBGcwZYAUnW0gJEkBPyvLeLUZvH4kydv7 -NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xhclNTTDEcMBoGA1UE -AxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAwGA1UdEwQFMAMBAf8w -CgYIKoZIzj0EAwIDaQAwZgIxAMO0YnNWKJUAfXgSJtJxexn4ipg+kv4znuR50v56 -t4d0PCu412mUC6Nnd7izvtE2MgIxAP1nnJQjZ8BWukszFQDG48wxCCyci9qpdSMv -uCjn8pwUOkABXK8Mss90fzCfCEOtIA== ------END CERTIFICATE-----