using "secret" consistently for ignoring files
authorDirk Zimmermann <dirk@pep-project.org>
Thu, 08 Mar 2018 10:41:44 +0100
changeset 417218d7a16e25b6
parent 4171 331fac9ce431
child 4173 9e3028b19d4c
using "secret" consistently for ignoring files
.hgignore
README.md
pEpForiOS.xcodeproj/project.pbxproj
pEpForiOSTests/AccountVerificationServiceTests.swift
pEpForiOSTests/Background/FetchMessagesOperationTest.swift
pEpForiOSTests/DecryptImportedMessagesTests.swift
pEpForiOSTests/DecryptionTestsInternal.swift
pEpForiOSTests/FetchFoldersServiceTests.swift
pEpForiOSTests/FetchMessagesServiceTests.swift
pEpForiOSTests/HandshakeTests.swift
pEpForiOSTests/MessageModelTests.swift
pEpForiOSTests/MessagePantomimeTests.swift
pEpForiOSTests/MessageReevalutionTests.swift
pEpForiOSTests/Models/CdMessage+PantomimeTest.swift
pEpForiOSTests/Models/LoginViewModelTests.swift
pEpForiOSTests/NetworkServiceTests.swift
pEpForiOSTests/PEPSessionTest.swift
pEpForiOSTests/ServiceChainExecutorTests.swift
pEpForiOSTests/ServiceFactoryTests.swift
pEpForiOSTests/SimpleOperationsTest.swift
pEpForiOSTests/SmtpSendServiceTests.swift
pEpForiOSTests/SyncExistingMessagesServiceTests.swift
pEpForiOSTests/TestUtils/CoreDataDrivenTestBase.swift
pEpForiOSUITests/NewAccountSetupUITest.swift
scripts/imap_connect.py
     1.1 --- a/.hgignore	Thu Mar 08 10:02:52 2018 +0100
     1.2 +++ b/.hgignore	Thu Mar 08 10:41:44 2018 +0100
     1.3 @@ -5,10 +5,10 @@
     1.4  \.orig$
     1.5  \.git/
     1.6  \.gitkeep
     1.7 -scripts/config.ini$
     1.8  .*~.storyboard$
     1.9  pEpTrustWords\.bundle/system\.db
    1.10 -.*secret.*\.xcconfig$
    1.11 -.*TestData.*\.swift$
    1.12 +.*secret.*
    1.13 +.*Secret.*
    1.14 +.*SECRET.*
    1.15  
    1.16  glob
     2.1 --- a/README.md	Thu Mar 08 10:02:52 2018 +0100
     2.2 +++ b/README.md	Thu Mar 08 10:41:44 2018 +0100
     2.3 @@ -67,19 +67,15 @@
     2.4  
     2.5  ### Unit Tests
     2.6  
     2.7 -The non-existing file referenced in the unit test project, ./pEpForiOSTests/TestUtil/TestData.swift, must be
     2.8 -created, with a class named TestData, derived from TestDataBase. Override populateAccounts().
     2.9 +The non-existing file referenced in the unit test project, ./pEpForiOSTests/TestUtil/SecretTestData.swift, must be
    2.10 +created, with a class named SecretTestData, derived from TestDataBase. Override populateAccounts().
    2.11  
    2.12 -The tests will not compile without a syntactically correct TestData.swift that inherits from TestDataBase.
    2.13 -
    2.14 -```
    2.15 -cp pEpForiOSTests/Util/TestData_sample.swift pEpForiOSTests/Util/TestData.swift
    2.16 -```
    2.17 +The tests will not compile without a syntactically correct SecretTestData.swift that inherits from TestDataBase.
    2.18  
    2.19  ### UI Tests
    2.20  
    2.21  There is a file referenced in the UI test project, UITestData. You need to create it
    2.22 -(./pEpForiOSUITests/UITestData.swift), and implement it according to the protocol UITestDataProtocol.
    2.23 +(./pEpForiOSUITests/SecretUITestData.swift), and implement it according to the protocol UITestDataProtocol.
    2.24  
    2.25  The UI tests will not compile without it.
    2.26  
     3.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Thu Mar 08 10:02:52 2018 +0100
     3.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Thu Mar 08 10:41:44 2018 +0100
     3.3 @@ -20,7 +20,7 @@
     3.4  		151DE7E41FC5D41600CDC273 /* FolderViews.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 151DE7E61FC5D41600CDC273 /* FolderViews.storyboard */; };
     3.5  		151F71D22029FA1B0057C74D /* PantomimeFolderAttribute+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71D12029FA1B0057C74D /* PantomimeFolderAttribute+Extensions.swift */; };
     3.6  		151F71F7202A06760057C74D /* TestDataBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71EC202A06750057C74D /* TestDataBase.swift */; };
     3.7 -		151F71F8202A06760057C74D /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71ED202A06750057C74D /* TestData.swift */; };
     3.8 +		151F71F8202A06760057C74D /* SecretTestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71ED202A06750057C74D /* SecretTestData.swift */; };
     3.9  		151F71F9202A06760057C74D /* NetworkServiceObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71EE202A06750057C74D /* NetworkServiceObserver.swift */; };
    3.10  		151F71FA202A06760057C74D /* DecryptionAttemptCounterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71EF202A06750057C74D /* DecryptionAttemptCounterDelegate.swift */; };
    3.11  		151F71FB202A06760057C74D /* MockBackgrounder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 151F71F0202A06750057C74D /* MockBackgrounder.swift */; };
    3.12 @@ -106,7 +106,7 @@
    3.13  		43088F742046C08000BB5149 /* ComposeMessageBodyTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43088F732046C08000BB5149 /* ComposeMessageBodyTextView.swift */; };
    3.14  		430972661DDEEBB50062E308 /* CdIdentity+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430972651DDEEBB50062E308 /* CdIdentity+Extension.swift */; };
    3.15  		430A2EEC1E81357A00878837 /* CdImapFlags+Pantomime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430A2EEB1E81357A00878837 /* CdImapFlags+Pantomime.swift */; };
    3.16 -		430A6E541DFB08CE006273A5 /* UITestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430A6E531DFB08CE006273A5 /* UITestData.swift */; };
    3.17 +		430A6E541DFB08CE006273A5 /* SecretUITestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430A6E531DFB08CE006273A5 /* SecretUITestData.swift */; };
    3.18  		430BA229203438A3003B041C /* CdMessagePEPMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430BA228203438A3003B041C /* CdMessagePEPMessageTests.swift */; };
    3.19  		430C80D51D0EAB6E00CD4582 /* pEpTrustWords.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 430C80D41D0EAB6E00CD4582 /* pEpTrustWords.bundle */; };
    3.20  		430C80D61D0EAB6E00CD4582 /* pEpTrustWords.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 430C80D41D0EAB6E00CD4582 /* pEpTrustWords.bundle */; };
    3.21 @@ -459,7 +459,7 @@
    3.22  		151DE7E51FC5D41600CDC273 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/FolderViews.storyboard; sourceTree = "<group>"; };
    3.23  		151F71D12029FA1B0057C74D /* PantomimeFolderAttribute+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PantomimeFolderAttribute+Extensions.swift"; sourceTree = "<group>"; };
    3.24  		151F71EC202A06750057C74D /* TestDataBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestDataBase.swift; sourceTree = "<group>"; };
    3.25 -		151F71ED202A06750057C74D /* TestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestData.swift; sourceTree = "<group>"; };
    3.26 +		151F71ED202A06750057C74D /* SecretTestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretTestData.swift; sourceTree = "<group>"; };
    3.27  		151F71EE202A06750057C74D /* NetworkServiceObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkServiceObserver.swift; sourceTree = "<group>"; };
    3.28  		151F71EF202A06750057C74D /* DecryptionAttemptCounterDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecryptionAttemptCounterDelegate.swift; sourceTree = "<group>"; };
    3.29  		151F71F0202A06750057C74D /* MockBackgrounder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockBackgrounder.swift; sourceTree = "<group>"; };
    3.30 @@ -544,7 +544,7 @@
    3.31  		43088F732046C08000BB5149 /* ComposeMessageBodyTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeMessageBodyTextView.swift; sourceTree = "<group>"; };
    3.32  		430972651DDEEBB50062E308 /* CdIdentity+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CdIdentity+Extension.swift"; sourceTree = "<group>"; };
    3.33  		430A2EEB1E81357A00878837 /* CdImapFlags+Pantomime.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CdImapFlags+Pantomime.swift"; sourceTree = "<group>"; };
    3.34 -		430A6E531DFB08CE006273A5 /* UITestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITestData.swift; sourceTree = "<group>"; };
    3.35 +		430A6E531DFB08CE006273A5 /* SecretUITestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretUITestData.swift; sourceTree = "<group>"; };
    3.36  		430BA228203438A3003B041C /* CdMessagePEPMessageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CdMessagePEPMessageTests.swift; sourceTree = "<group>"; };
    3.37  		430C80D41D0EAB6E00CD4582 /* pEpTrustWords.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = pEpTrustWords.bundle; path = ../pEpTrustWords.bundle; sourceTree = "<group>"; };
    3.38  		430C80DF1D0EADC200CD4582 /* PepAdapterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PepAdapterTests.swift; sourceTree = "<group>"; };
    3.39 @@ -940,7 +940,7 @@
    3.40  			isa = PBXGroup;
    3.41  			children = (
    3.42  				151F71EC202A06750057C74D /* TestDataBase.swift */,
    3.43 -				151F71ED202A06750057C74D /* TestData.swift */,
    3.44 +				151F71ED202A06750057C74D /* SecretTestData.swift */,
    3.45  				151F71EE202A06750057C74D /* NetworkServiceObserver.swift */,
    3.46  				151F71EF202A06750057C74D /* DecryptionAttemptCounterDelegate.swift */,
    3.47  				151F71F0202A06750057C74D /* MockBackgrounder.swift */,
    3.48 @@ -1499,7 +1499,7 @@
    3.49  			children = (
    3.50  				43B0443A20067D25007BCE3F /* UITestDataProtocol.swift */,
    3.51  				43B0443820067CC7007BCE3F /* UIAccount.swift */,
    3.52 -				430A6E531DFB08CE006273A5 /* UITestData.swift */,
    3.53 +				430A6E531DFB08CE006273A5 /* SecretUITestData.swift */,
    3.54  				43980E4B1CBD0BCA00A7FC3C /* Info.plist */,
    3.55  				43DA52671CEF1B4F0023D540 /* NewAccountSetupUITest.swift */,
    3.56  				431E65621EEAE65200B8BBFC /* HandshakeUITest.swift */,
    3.57 @@ -2428,7 +2428,7 @@
    3.58  				15BBBC681FD04DFC00B9DCC8 /* ReportingErrorContainerTest.swift in Sources */,
    3.59  				1541D7F01FC81ED900D52A5D /* URL+ExtensionsTest.swift in Sources */,
    3.60  				15BBBC6B1FD0527200B9DCC8 /* DisplayUserErrorTest.swift in Sources */,
    3.61 -				151F71F8202A06760057C74D /* TestData.swift in Sources */,
    3.62 +				151F71F8202A06760057C74D /* SecretTestData.swift in Sources */,
    3.63  				436F8E141D36706A007E9829 /* StringExtensionsTest.swift in Sources */,
    3.64  				151F71FC202A06760057C74D /* CoreDataDrivenTestBase.swift in Sources */,
    3.65  				151F71FF202A06760057C74D /* Message+TestUtils.swift in Sources */,
    3.66 @@ -2471,7 +2471,7 @@
    3.67  			files = (
    3.68  				43B0443920067CC7007BCE3F /* UIAccount.swift in Sources */,
    3.69  				43DA52681CEF1B4F0023D540 /* NewAccountSetupUITest.swift in Sources */,
    3.70 -				430A6E541DFB08CE006273A5 /* UITestData.swift in Sources */,
    3.71 +				430A6E541DFB08CE006273A5 /* SecretUITestData.swift in Sources */,
    3.72  				431E65631EEAE65200B8BBFC /* HandshakeUITest.swift in Sources */,
    3.73  				43B0443B20067D25007BCE3F /* UITestDataProtocol.swift in Sources */,
    3.74  			);
     4.1 --- a/pEpForiOSTests/AccountVerificationServiceTests.swift	Thu Mar 08 10:02:52 2018 +0100
     4.2 +++ b/pEpForiOSTests/AccountVerificationServiceTests.swift	Thu Mar 08 10:41:44 2018 +0100
     4.3 @@ -40,14 +40,14 @@
     4.4      }
     4.5  
     4.6      func testDirectlySuccess() {
     4.7 -        testVerification(account: TestData().createWorkingAccount(),
     4.8 +        testVerification(account: SecretTestData().createWorkingAccount(),
     4.9                           expectedResult: AccountVerificationResult.ok,
    4.10                           testDirectly: true)
    4.11      }
    4.12  
    4.13      func testDirectlyImapFailure() {
    4.14          testVerification(
    4.15 -            account: TestData().createImapTimeOutAccount(),
    4.16 +            account: SecretTestData().createImapTimeOutAccount(),
    4.17              expectedResult: AccountVerificationResult.imapError(
    4.18                  .connectionTimedOut("connectionTimedOut(_:notification:)")),
    4.19              testDirectly: true)
    4.20 @@ -55,21 +55,21 @@
    4.21  
    4.22      func testDirectlySmtpFailure() {
    4.23          testVerification(
    4.24 -            account: TestData().createSmtpTimeOutAccount(),
    4.25 +            account: SecretTestData().createSmtpTimeOutAccount(),
    4.26              expectedResult: AccountVerificationResult.smtpError(
    4.27                  .connectionTimedOut("connectionTimedOut(_:theNotification:)")),
    4.28              testDirectly: true)
    4.29      }
    4.30  
    4.31      func testMessageSyncServiceSuccess() {
    4.32 -        testVerification(account: TestData().createWorkingAccount(),
    4.33 +        testVerification(account: SecretTestData().createWorkingAccount(),
    4.34                           expectedResult: AccountVerificationResult.ok,
    4.35                           testDirectly: false)
    4.36      }
    4.37  
    4.38      func testMessageSyncServiceImapFailures() {
    4.39          testVerification(
    4.40 -            account: TestData().createImapTimeOutAccount(),
    4.41 +            account: SecretTestData().createImapTimeOutAccount(),
    4.42              expectedResult: AccountVerificationResult.imapError(
    4.43                  .connectionTimedOut("connectionTimedOut(_:notification:)")),
    4.44              testDirectly: false)
    4.45 @@ -77,7 +77,7 @@
    4.46  
    4.47      func testMessageSyncServiceSmtpFailures() {
    4.48          testVerification(
    4.49 -            account: TestData().createSmtpTimeOutAccount(),
    4.50 +            account: SecretTestData().createSmtpTimeOutAccount(),
    4.51              expectedResult: AccountVerificationResult.smtpError(
    4.52                  .connectionTimedOut("connectionTimedOut(_:theNotification:)")),
    4.53              testDirectly: false)
     5.1 --- a/pEpForiOSTests/Background/FetchMessagesOperationTest.swift	Thu Mar 08 10:02:52 2018 +0100
     5.2 +++ b/pEpForiOSTests/Background/FetchMessagesOperationTest.swift	Thu Mar 08 10:41:44 2018 +0100
     5.3 @@ -21,7 +21,7 @@
     5.4          cdAccount.createRequiredFoldersAndWait(testCase: self)
     5.5          Record.saveAndWait()
     5.6          
     5.7 -        let cdAccount2 = TestData().createWorkingCdAccount(number: 1)
     5.8 +        let cdAccount2 = SecretTestData().createWorkingCdAccount(number: 1)
     5.9          TestUtil.skipValidation()
    5.10          Record.saveAndWait()
    5.11          cdAccount2.createRequiredFoldersAndWait(testCase: self)
     6.1 --- a/pEpForiOSTests/DecryptImportedMessagesTests.swift	Thu Mar 08 10:02:52 2018 +0100
     6.2 +++ b/pEpForiOSTests/DecryptImportedMessagesTests.swift	Thu Mar 08 10:41:44 2018 +0100
     6.3 @@ -38,7 +38,7 @@
     6.4  
     6.5      func createLocalAccount(ownUserName: String, ownUserID: String,
     6.6                              ownEmailAddress: String) -> CdAccount {
     6.7 -        let cdOwnAccount = TestData().createWorkingCdAccount(number: 0)
     6.8 +        let cdOwnAccount = SecretTestData().createWorkingCdAccount(number: 0)
     6.9          cdOwnAccount.identity?.userName = ownUserName
    6.10          cdOwnAccount.identity?.userID = ownUserID
    6.11          cdOwnAccount.identity?.address = ownEmailAddress
     7.1 --- a/pEpForiOSTests/DecryptionTestsInternal.swift	Thu Mar 08 10:02:52 2018 +0100
     7.2 +++ b/pEpForiOSTests/DecryptionTestsInternal.swift	Thu Mar 08 10:41:44 2018 +0100
     7.3 @@ -35,13 +35,13 @@
     7.4  
     7.5          persistentSetup = PersistentSetup()
     7.6  
     7.7 -        let cdMyAccount = TestData().createWorkingCdAccount(number: 0)
     7.8 +        let cdMyAccount = SecretTestData().createWorkingCdAccount(number: 0)
     7.9          guard let myPepIdentity = pEpIdentity(cdAccount: cdMyAccount) else {
    7.10              fatalError("Error PEPIdentity") //XCTFail() does can not be used here, sorry.
    7.11          }
    7.12          pEpOwnIdentity = myPepIdentity
    7.13  
    7.14 -        let cdSenderAccount = TestData().createWorkingCdAccount(number: 1)
    7.15 +        let cdSenderAccount = SecretTestData().createWorkingCdAccount(number: 1)
    7.16          guard let senderPepIdentity = cdSenderAccount.identity?.pEpIdentity() else {
    7.17              fatalError("Error PEPIdentity") //XCTFail() does can not be used here, sorry.
    7.18          }
     8.1 --- a/pEpForiOSTests/FetchFoldersServiceTests.swift	Thu Mar 08 10:02:52 2018 +0100
     8.2 +++ b/pEpForiOSTests/FetchFoldersServiceTests.swift	Thu Mar 08 10:41:44 2018 +0100
     8.3 @@ -29,12 +29,12 @@
     8.4          super.setUp()
     8.5          persistentSetup = PersistentSetup()
     8.6  
     8.7 -        let cdAccount = TestData().createWorkingCdAccount()
     8.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
     8.9          TestUtil.skipValidation()
    8.10          Record.saveAndWait()
    8.11          self.cdAccount = cdAccount
    8.12  
    8.13 -        let cdDisfunctionalAccount = TestData().createDisfunctionalCdAccount()
    8.14 +        let cdDisfunctionalAccount = SecretTestData().createDisfunctionalCdAccount()
    8.15          TestUtil.skipValidation()
    8.16          Record.saveAndWait()
    8.17          self.cdAccountDisfunctional = cdDisfunctionalAccount
     9.1 --- a/pEpForiOSTests/FetchMessagesServiceTests.swift	Thu Mar 08 10:02:52 2018 +0100
     9.2 +++ b/pEpForiOSTests/FetchMessagesServiceTests.swift	Thu Mar 08 10:41:44 2018 +0100
     9.3 @@ -20,7 +20,7 @@
     9.4          super.setUp()
     9.5          persistentSetup = PersistentSetup()
     9.6  
     9.7 -        let cdAccount = TestData().createWorkingCdAccount()
     9.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
     9.9          TestUtil.skipValidation()
    9.10          Record.saveAndWait()
    9.11          self.cdAccount = cdAccount
    10.1 --- a/pEpForiOSTests/HandshakeTests.swift	Thu Mar 08 10:02:52 2018 +0100
    10.2 +++ b/pEpForiOSTests/HandshakeTests.swift	Thu Mar 08 10:41:44 2018 +0100
    10.3 @@ -22,7 +22,7 @@
    10.4          XCTAssertTrue(PEPUtil.pEpClean())
    10.5          persistentSetup = PersistentSetup()
    10.6  
    10.7 -        let cdMyAccount = TestData().createWorkingCdAccount(number: 0)
    10.8 +        let cdMyAccount = SecretTestData().createWorkingCdAccount(number: 0)
    10.9          cdMyAccount.identity?.userName = "iOS Test 002"
   10.10          cdMyAccount.identity?.userID = "iostest002@peptest.ch_ID"
   10.11          cdMyAccount.identity?.address = "iostest002@peptest.ch"
    11.1 --- a/pEpForiOSTests/MessageModelTests.swift	Thu Mar 08 10:02:52 2018 +0100
    11.2 +++ b/pEpForiOSTests/MessageModelTests.swift	Thu Mar 08 10:41:44 2018 +0100
    11.3 @@ -26,7 +26,7 @@
    11.4      }
    11.5  
    11.6      func testSaveMessageForSending() {
    11.7 -        let testData = TestData()
    11.8 +        let testData = SecretTestData()
    11.9          let cdAccount = testData.createWorkingCdAccount()
   11.10          let account = cdAccount.account()
   11.11          account.save()
    12.1 --- a/pEpForiOSTests/MessagePantomimeTests.swift	Thu Mar 08 10:02:52 2018 +0100
    12.2 +++ b/pEpForiOSTests/MessagePantomimeTests.swift	Thu Mar 08 10:41:44 2018 +0100
    12.3 @@ -70,7 +70,7 @@
    12.4      }
    12.5  
    12.6      func testReferences() {
    12.7 -        let testData = TestData()
    12.8 +        let testData = SecretTestData()
    12.9          let refs = ["ref1", "ref2", "ref3"]
   12.10          let inReplyTo = "ref4"
   12.11          var allRefs = refs
    13.1 --- a/pEpForiOSTests/MessageReevalutionTests.swift	Thu Mar 08 10:02:52 2018 +0100
    13.2 +++ b/pEpForiOSTests/MessageReevalutionTests.swift	Thu Mar 08 10:41:44 2018 +0100
    13.3 @@ -34,7 +34,7 @@
    13.4          persistentSetup = PersistentSetup()
    13.5  
    13.6          // Account
    13.7 -        let cdMyAccount = TestData().createWorkingCdAccount(number: 0)
    13.8 +        let cdMyAccount = SecretTestData().createWorkingCdAccount(number: 0)
    13.9          cdMyAccount.identity?.userName = "iOS Test 002"
   13.10          cdMyAccount.identity?.userID = "iostest002@peptest.ch_ID"
   13.11          cdMyAccount.identity?.address = "iostest002@peptest.ch"
    14.1 --- a/pEpForiOSTests/Models/CdMessage+PantomimeTest.swift	Thu Mar 08 10:02:52 2018 +0100
    14.2 +++ b/pEpForiOSTests/Models/CdMessage+PantomimeTest.swift	Thu Mar 08 10:41:44 2018 +0100
    14.3 @@ -140,7 +140,7 @@
    14.4      }
    14.5  
    14.6      func testInsertOrUpdatePantomimeMessage() {
    14.7 -        let cdAccount = TestData().createWorkingCdAccount()
    14.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
    14.9  
   14.10          let folder = CdFolder.create()
   14.11          folder.account = cdAccount
    15.1 --- a/pEpForiOSTests/Models/LoginViewModelTests.swift	Thu Mar 08 10:02:52 2018 +0100
    15.2 +++ b/pEpForiOSTests/Models/LoginViewModelTests.swift	Thu Mar 08 10:41:44 2018 +0100
    15.3 @@ -93,7 +93,7 @@
    15.4      /// in TestData.createWorkingAccountSettings == Accountsettingsadapter recommended server settings.
    15.5      /// Otherwize the test always succeeds.
    15.6      func testBasic() {
    15.7 -        let td = TestData()
    15.8 +        let td = SecretTestData()
    15.9          let accountSettings = td.createWorkingAccountSettings()
   15.10          guard let passw = accountSettings.password else {
   15.11              XCTFail("expecting password for account")
    16.1 --- a/pEpForiOSTests/NetworkServiceTests.swift	Thu Mar 08 10:02:52 2018 +0100
    16.2 +++ b/pEpForiOSTests/NetworkServiceTests.swift	Thu Mar 08 10:41:44 2018 +0100
    16.3 @@ -114,7 +114,7 @@
    16.4  
    16.5          networkService.sendLayerDelegate = sendLayerDelegate
    16.6  
    16.7 -        _ = TestData().createWorkingCdAccount()
    16.8 +        _ = SecretTestData().createWorkingCdAccount()
    16.9          TestUtil.skipValidation()
   16.10          Record.saveAndWait()
   16.11  
   16.12 @@ -194,7 +194,7 @@
   16.13  
   16.14          let networkService = NetworkService(parentName: #function)
   16.15  
   16.16 -        _ = TestData().createWorkingCdAccount()
   16.17 +        _ = SecretTestData().createWorkingCdAccount()
   16.18          TestUtil.skipValidation()
   16.19          Record.saveAndWait()
   16.20  
   16.21 @@ -253,8 +253,8 @@
   16.22          networkService.unitTestDelegate = del
   16.23          networkService.sendLayerDelegate = sendLayerDelegate
   16.24  
   16.25 -        let cdAccount = useCorrectSmtpAccount ? TestData().createWorkingCdAccount() :
   16.26 -            TestData().createSmtpTimeOutCdAccount()
   16.27 +        let cdAccount = useCorrectSmtpAccount ? SecretTestData().createWorkingCdAccount() :
   16.28 +            SecretTestData().createSmtpTimeOutCdAccount()
   16.29          TestUtil.skipValidation()
   16.30          Record.saveAndWait()
   16.31  
    17.1 --- a/pEpForiOSTests/PEPSessionTest.swift	Thu Mar 08 10:02:52 2018 +0100
    17.2 +++ b/pEpForiOSTests/PEPSessionTest.swift	Thu Mar 08 10:41:44 2018 +0100
    17.3 @@ -32,7 +32,7 @@
    17.4  
    17.5      func testPEPConversion() {
    17.6          Log.info(component: "testPEPConversion", content: "test")
    17.7 -        let account = TestData().createWorkingAccount()
    17.8 +        let account = SecretTestData().createWorkingAccount()
    17.9          account.save()
   17.10  
   17.11          let folder = Folder(name: "inbox", parent: nil, account: account, folderType: .inbox)
   17.12 @@ -73,7 +73,7 @@
   17.13      }
   17.14  
   17.15      func testMessageIDAndReferencesAfterEncrypt() {
   17.16 -        let testData = TestData()
   17.17 +        let testData = SecretTestData()
   17.18          let myself = testData.createWorkingIdentity(number: 0)
   17.19          let mySubject = "Some Subject"
   17.20          let myMessageID = "myID"
   17.21 @@ -125,7 +125,7 @@
   17.22      func testParseMessageHeapBufferOverflow() {
   17.23          CWLogger.setLogger(Log.shared)
   17.24  
   17.25 -        let cdAccount = TestData().createWorkingCdAccount()
   17.26 +        let cdAccount = SecretTestData().createWorkingCdAccount()
   17.27  
   17.28          let folder = CdFolder.create()
   17.29          folder.account = cdAccount
   17.30 @@ -147,7 +147,7 @@
   17.31      }
   17.32  
   17.33      func testDecryptMessageHeapBufferOverflow() {
   17.34 -        let cdAccount = TestData().createWorkingCdAccount()
   17.35 +        let cdAccount = SecretTestData().createWorkingCdAccount()
   17.36  
   17.37          let folder = CdFolder.create()
   17.38          folder.account = cdAccount
   17.39 @@ -174,7 +174,7 @@
   17.40      func testAttachmentsDoNotGetDuplilcated() {
   17.41          CWLogger.setLogger(Log.shared)
   17.42  
   17.43 -        let cdAccount = TestData().createWorkingCdAccount()
   17.44 +        let cdAccount = SecretTestData().createWorkingCdAccount()
   17.45  
   17.46          let folder = CdFolder.create()
   17.47          folder.account = cdAccount
    18.1 --- a/pEpForiOSTests/ServiceChainExecutorTests.swift	Thu Mar 08 10:02:52 2018 +0100
    18.2 +++ b/pEpForiOSTests/ServiceChainExecutorTests.swift	Thu Mar 08 10:41:44 2018 +0100
    18.3 @@ -21,7 +21,7 @@
    18.4          super.setUp()
    18.5          persistentSetup = PersistentSetup()
    18.6  
    18.7 -        let cdAccount = TestData().createWorkingCdAccount()
    18.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
    18.9          TestUtil.skipValidation()
   18.10          Record.saveAndWait()
   18.11          self.cdAccount = cdAccount
    19.1 --- a/pEpForiOSTests/ServiceFactoryTests.swift	Thu Mar 08 10:02:52 2018 +0100
    19.2 +++ b/pEpForiOSTests/ServiceFactoryTests.swift	Thu Mar 08 10:41:44 2018 +0100
    19.3 @@ -21,7 +21,7 @@
    19.4          super.setUp()
    19.5          persistentSetup = PersistentSetup()
    19.6  
    19.7 -        let cdAccount = TestData().createWorkingCdAccount()
    19.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
    19.9  
   19.10          TestUtil.skipValidation()
   19.11          Record.saveAndWait()
    20.1 --- a/pEpForiOSTests/SimpleOperationsTest.swift	Thu Mar 08 10:02:52 2018 +0100
    20.2 +++ b/pEpForiOSTests/SimpleOperationsTest.swift	Thu Mar 08 10:41:44 2018 +0100
    20.3 @@ -645,7 +645,7 @@
    20.4          XCTAssertNotNil(myself.fingerPrint)
    20.5  
    20.6          let id = Identity.from(pEpIdentity: myself)
    20.7 -        let account = TestData().createWorkingAccount()
    20.8 +        let account = SecretTestData().createWorkingAccount()
    20.9          account.user = id
   20.10          account.save()
   20.11  
   20.12 @@ -659,8 +659,8 @@
   20.13      }
   20.14  
   20.15      func testOutgoingMessageColor() {
   20.16 -        let identity = TestData().createWorkingAccount().user
   20.17 -        let account = TestData().createWorkingAccount()
   20.18 +        let identity = SecretTestData().createWorkingAccount().user
   20.19 +        let account = SecretTestData().createWorkingAccount()
   20.20          account.user = identity
   20.21          account.save()
   20.22          self.measure {
   20.23 @@ -676,7 +676,7 @@
   20.24          let (identity, _, _, _, _) = TestUtil.setupSomeIdentities(session)
   20.25  
   20.26          let id = Identity.from(pEpIdentity: identity)
   20.27 -        let account = TestData().createWorkingAccount()
   20.28 +        let account = SecretTestData().createWorkingAccount()
   20.29          account.user = id
   20.30          account.save()
   20.31          self.measure {
    21.1 --- a/pEpForiOSTests/SmtpSendServiceTests.swift	Thu Mar 08 10:02:52 2018 +0100
    21.2 +++ b/pEpForiOSTests/SmtpSendServiceTests.swift	Thu Mar 08 10:41:44 2018 +0100
    21.3 @@ -29,12 +29,12 @@
    21.4          super.setUp()
    21.5          persistentSetup = PersistentSetup()
    21.6  
    21.7 -        let cdAccount = TestData().createWorkingCdAccount()
    21.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
    21.9          TestUtil.skipValidation()
   21.10          Record.saveAndWait()
   21.11          self.cdAccount = cdAccount
   21.12  
   21.13 -        let cdDisfunctionalAccount = TestData().createDisfunctionalCdAccount()
   21.14 +        let cdDisfunctionalAccount = SecretTestData().createDisfunctionalCdAccount()
   21.15          TestUtil.skipValidation()
   21.16          Record.saveAndWait()
   21.17          self.cdAccountDisfunctional = cdDisfunctionalAccount
    22.1 --- a/pEpForiOSTests/SyncExistingMessagesServiceTests.swift	Thu Mar 08 10:02:52 2018 +0100
    22.2 +++ b/pEpForiOSTests/SyncExistingMessagesServiceTests.swift	Thu Mar 08 10:41:44 2018 +0100
    22.3 @@ -20,7 +20,7 @@
    22.4          super.setUp()
    22.5          persistentSetup = PersistentSetup()
    22.6  
    22.7 -        let cdAccount = TestData().createWorkingCdAccount()
    22.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
    22.9          TestUtil.skipValidation()
   22.10          Record.saveAndWait()
   22.11          self.cdAccount = cdAccount
    23.1 --- a/pEpForiOSTests/TestUtils/CoreDataDrivenTestBase.swift	Thu Mar 08 10:02:52 2018 +0100
    23.2 +++ b/pEpForiOSTests/TestUtils/CoreDataDrivenTestBase.swift	Thu Mar 08 10:41:44 2018 +0100
    23.3 @@ -31,7 +31,7 @@
    23.4          
    23.5          persistentSetup = PersistentSetup()
    23.6          
    23.7 -        let cdAccount = TestData().createWorkingCdAccount()
    23.8 +        let cdAccount = SecretTestData().createWorkingCdAccount()
    23.9          TestUtil.skipValidation()
   23.10          Record.saveAndWait()
   23.11          self.cdAccount = cdAccount
    24.1 --- a/pEpForiOSUITests/NewAccountSetupUITest.swift	Thu Mar 08 10:02:52 2018 +0100
    24.2 +++ b/pEpForiOSUITests/NewAccountSetupUITest.swift	Thu Mar 08 10:41:44 2018 +0100
    24.3 @@ -125,7 +125,7 @@
    24.4      }
    24.5  
    24.6      func testInitialAccountSetup() {
    24.7 -        let account = UITestData.workingAccount1
    24.8 +        let account = SecretUITestData.workingAccount1
    24.9          newAccountSetup(account: account)
   24.10          waitForever()
   24.11      }
   24.12 @@ -135,20 +135,20 @@
   24.13          theApp.navigationBars["Inbox"].buttons["Folders"].tap()
   24.14          theApp.tables.buttons["add account"].tap()
   24.15  
   24.16 -        let account = UITestData.workingAccount2
   24.17 +        let account = SecretUITestData.workingAccount2
   24.18          newAccountSetup(account: account)
   24.19          waitForever()
   24.20      }
   24.21  
   24.22      func testTwoInitialAccounts() {
   24.23 -        let account1 = UITestData.workingAccount1
   24.24 +        let account1 = SecretUITestData.workingAccount1
   24.25          newAccountSetup(account: account1)
   24.26  
   24.27          let theApp = app()
   24.28          theApp.navigationBars["Inbox"].buttons["Folders"].tap()
   24.29          theApp.tables.buttons["add account"].tap()
   24.30  
   24.31 -        let account2 = UITestData.workingAccount2
   24.32 +        let account2 = SecretUITestData.workingAccount2
   24.33          newAccountSetup(account: account2)
   24.34          waitForever()
   24.35      }
   24.36 @@ -157,7 +157,7 @@
   24.37      /// wait for alert and click OK manually
   24.38      func testNewAccountSetupManuallyAccountThatDoesNotWorkAutomatically() {
   24.39          let theApp = app()
   24.40 -        let account = UITestData.manualAccount
   24.41 +        let account = SecretUITestData.manualAccount
   24.42          newAccountSetup(account: account)
   24.43  
   24.44          //wait until manual setup button appaers
   24.45 @@ -174,19 +174,19 @@
   24.46      // Note: A working accound must exist already.
   24.47      func testAddYahooAccount() {
   24.48          openAddAccountManualConfiguration()
   24.49 -        let account = UITestData.workingYahooAccount
   24.50 +        let account = SecretUITestData.workingYahooAccount
   24.51          manualNewAccountSetup(account)
   24.52          waitForever()
   24.53      }
   24.54  
   24.55      func testTriggerGmailOauth2() {
   24.56 -        let account = UITestData.gmailOAuth2Account
   24.57 +        let account = SecretUITestData.gmailOAuth2Account
   24.58          newAccountSetup(account: account, enterPassword: false)
   24.59          waitForever()
   24.60      }
   24.61  
   24.62      func testTriggerYahooOauth2() {
   24.63 -        let account = UITestData.yahooOAuth2Account
   24.64 +        let account = SecretUITestData.yahooOAuth2Account
   24.65          newAccountSetup(account: account, enterPassword: false)
   24.66          waitForever()
   24.67      }
    25.1 --- a/scripts/imap_connect.py	Thu Mar 08 10:02:52 2018 +0100
    25.2 +++ b/scripts/imap_connect.py	Thu Mar 08 10:41:44 2018 +0100
    25.3 @@ -9,7 +9,7 @@
    25.4  def open_connection():
    25.5      # Read the config file
    25.6      config = configparser.ConfigParser()
    25.7 -    config.read([os.path.expanduser('config.ini')])
    25.8 +    config.read([os.path.expanduser('secret.ini')])
    25.9  
   25.10      # Connect to the server
   25.11      hostname = config.get('server', 'hostname')