From 56aea9d5eb8a8342997aa081bbb68e5595e12d17 Mon Sep 17 00:00:00 2001
From: Viktoria <Vicky@Kays-Mac.fritz.box>
Date: Tue, 24 Mar 2020 08:54:43 +0100
Subject: [PATCH] wip: build test environment
---
enzevalos_iphone.xcodeproj/project.pbxproj | 3 +-
enzevalos_iphoneTests/GeneratedMocks.swift | 4 +--
.../phishing/MailComparisonTests.swift | 36 ++++++++++---------
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index c0e8dd4a..2197cc64 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -580,7 +580,7 @@
97AACD2324178C230078A68E /* AuthenticationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationModel.swift; sourceTree = "<group>"; };
97C5279E241A9F7B0030BBC9 /* AuthenticationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationTests.swift; sourceTree = "<group>"; };
97C527A0241AA4090030BBC9 /* GeneratedMocks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GeneratedMocks.swift; path = enzevalos_iphoneTests/GeneratedMocks.swift; sourceTree = SOURCE_ROOT; };
- 988C9C5C240D507A006213F0 /* PhishingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhishingTests.swift; sourceTree = "<group>"; };
+ 988C9C5C240D507A006213F0 /* PhishingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PhishingTests.swift; path = ../PhishingTests.swift; sourceTree = "<group>"; };
9A132EDE8BCA06ACDB505C22 /* Pods-enzevalos_iphoneUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneUITests.debug.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.debug.xcconfig"; sourceTree = "<group>"; };
9B3D62838C729BAC6832270A /* Pods-enzevalos_iphone-AdHoc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphone-AdHoc.debug.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone-AdHoc/Pods-enzevalos_iphone-AdHoc.debug.xcconfig"; sourceTree = "<group>"; };
A102AA891EDDB4E80024B457 /* videoOnboarding2.m4v */ = {isa = PBXFileReference; lastKnownFileType = file; path = videoOnboarding2.m4v; sourceTree = "<group>"; };
@@ -1364,7 +1364,6 @@
children = (
71497EC1240FF7FC00B6210F /* phishing */,
97C5279D241A9F690030BBC9 /* authentication */,
- 988C9C5C240D507A006213F0 /* PhishingTests.swift */,
47F0376C22A7278A0005C9DE /* private */,
470709202189C24800DF71A3 /* testKeys */,
470709112189BB4A00DF71A3 /* testMails */,
diff --git a/enzevalos_iphoneTests/GeneratedMocks.swift b/enzevalos_iphoneTests/GeneratedMocks.swift
index 960eb37a..2479bc75 100644
--- a/enzevalos_iphoneTests/GeneratedMocks.swift
+++ b/enzevalos_iphoneTests/GeneratedMocks.swift
@@ -1,4 +1,4 @@
-// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationModel.swift at 2020-03-19 12:36:39 +0000
+// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationModel.swift at 2020-03-24 07:51:56 +0000
//
// AuthenticationModel.swift
@@ -653,7 +653,7 @@ import Foundation
}
-// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationViewModel.swift at 2020-03-19 12:36:39 +0000
+// MARK: - Mocks generated from file: enzevalos_iphone/AuthenticationViewModel.swift at 2020-03-24 07:51:56 +0000
//
// AuthenticationViewModel.swift
diff --git a/enzevalos_iphoneTests/phishing/MailComparisonTests.swift b/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
index e5718926..d7e379ab 100644
--- a/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
+++ b/enzevalos_iphoneTests/phishing/MailComparisonTests.swift
@@ -18,8 +18,6 @@ class MailComparisonTests: XCTestCase {
super.setUp()
pgp.resetKeychains()
datahandler.reset()
- // XCTAssertLessThanOrEqual(datahandler.allFolders.count, 1, "Folder: \(datahandler.allFolders.map{$0.frontendName})")
- XCTAssertEqual(datahandler.findSecretKeys().count, 0)
XCTAssertEqual(datahandler.getContacts().count, 0)
XCTAssertEqual(datahandler.getAddresses().count, 0)
(user, userKeyID) = owner()
@@ -61,10 +59,6 @@ class MailComparisonTests: XCTestCase {
}
var mail: PersistentMail?
mail = datahandler.createMail(id, sender: from, receivers: to, cc: cc, time: date, received: true, subject: subject, body: body, flags: flags, record: nil, autocrypt: nil, decryptedData: cryptoObject, folderPath: folder, secretKey: nil, encryptedBody: cryptoObject?.chiperString)
- XCTAssertNotNil(mail)
- XCTAssertEqual(mail?.body, body)
- XCTAssertEqual(mail?.subject, subject)
- XCTAssertEqual(mail?.folder.name.lowercased(), folder.lowercased())
return mail
}
@@ -80,26 +74,34 @@ class MailComparisonTests: XCTestCase {
}
@NSManaged public var contact: EnzevalosContact
- public func compareSender(_ mail: PersistentMail? = nil) -> Any {
+ public func compareSender(_ mail: PersistentMail? = nil) -> Any {
let senderAddress = mail?.from.mailAddress
- var senderContact = mail?.from.contact
-
- if (senderContact == contact){
- print("joke")
+ let senderIsAlreadyKnown = mail?.from.contact
+// let senderContact = mail?.from.contact?.cnContact?.getMailAddresses()
+
+ if (senderIsAlreadyKnown == contact){
+ print("1")
+ return []
}
-
for addr in addresses {
if senderAddress == addr.mailAddress {
- return true
+ print("2")
+ return []
}
- return false
+ print("3")
+ return []
}
- return "empty"
+ print("4")
+ return []
}
func testCompareSender () {
-
- //XCTAssertNotNil(compareSender(testMail(from: user, to: [user_1], cc: [user_1], bcc: [user_1])))
+// XCTAssertNotNil(compareSender(testMail(from: user, to: [user_1], cc: [user_1], bcc: [user_1])))
+ XCTAssertEqual(testMail(from: user, to: [], cc: [], bcc: [])?.from.mailAddress, userAdr, "got sender")
+ XCTAssertEqual((compareSender(testMail(from: user, to: [], cc: [], bcc: [])) as AnyObject).count, 0 )
+ XCTAssertNotEqual(testMail(from: user, to: [], cc: [], bcc: [])?.from.contact?.cnContact?.getMailAddresses().count, 0 )
+ XCTAssertTrue((testMail(from: user, to: [], cc: [], bcc: [])?.from.contact?.isAddress(mailadr: userAdr))!)
+ XCTAssertTrue((testMail(from: user_1, to: [], cc: [], bcc: [])?.from.contact?.isAddress(mailadr: userAdr_1))!)
}
}
--
GitLab