From 925f52f1262d0d022257ed1259966fb3469e1daf Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Wed, 2 Sep 2020 16:58:43 +0200 Subject: [PATCH] IOSAD-181 Back out: Don't use [PEPSession cleanup] --- pEpObjCTests/PEPSessionProviderTest.m | 4 ++-- pEpObjCTests/PepTests.m | 3 +-- pEpObjCTests/TestUtils/PEPTestUtils.m | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pEpObjCTests/PEPSessionProviderTest.m b/pEpObjCTests/PEPSessionProviderTest.m index db293785..93a65836 100644 --- a/pEpObjCTests/PEPSessionProviderTest.m +++ b/pEpObjCTests/PEPSessionProviderTest.m @@ -20,7 +20,7 @@ - (void)tearDown { - [PEPSessionProvider cleanup]; + [PEPSession cleanup]; } - (void)testSeperatedSessionPerThread { @@ -95,7 +95,7 @@ XCTAssertNotNil(sessionBackground); XCTAssertEqual(sessionMain, sessionMain2, @"The main session stayed the same (was kept \ alive, was not recreated)"); - [PEPSessionProvider cleanup]; + [PEPSession cleanup]; PEPInternalSession *sessionMainAfterCleanup = [PEPSessionProvider session]; XCTAssertNotNil(sessionMainAfterCleanup); XCTAssertNotEqual(sessionMainAfterCleanup, sessionMain, diff --git a/pEpObjCTests/PepTests.m b/pEpObjCTests/PepTests.m index c09e8492..7311d95f 100644 --- a/pEpObjCTests/PepTests.m +++ b/pEpObjCTests/PepTests.m @@ -11,7 +11,6 @@ #import "PEPObjCAdapter.h" #import "PEPSession.h" #import "PEPLanguage.h" -#import "PEPSessionProvider.h" @interface PepTests : XCTestCase @end @@ -25,7 +24,7 @@ - (void)tearDown { - [PEPSessionProvider cleanup]; + [PEPSession cleanup]; } - (void)testSessionFinalization { diff --git a/pEpObjCTests/TestUtils/PEPTestUtils.m b/pEpObjCTests/TestUtils/PEPTestUtils.m index 222208d6..7746fe6c 100644 --- a/pEpObjCTests/TestUtils/PEPTestUtils.m +++ b/pEpObjCTests/TestUtils/PEPTestUtils.m @@ -119,7 +119,7 @@ const NSInteger PEPTestInternalSyncTimeout = 20; + (void)cleanUp { - [PEPSessionProvider cleanup]; + [PEPSession cleanup]; NSString *homeString = [PEPObjCAdapter perUserDirectoryString]; NSURL *homeUrl = [NSURL fileURLWithPath:homeString isDirectory:YES];