Skip to content

Commit 66f4afc

Browse files
authored
Structural setup for SPM GoogleUtilities tests (#5999)
1 parent 096e6c8 commit 66f4afc

28 files changed

+38
-36
lines changed

GoogleUtilities.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ other Google CocoaPods. They're not intended for direct public usage.
129129
s.test_spec 'unit' do |unit_tests|
130130
# All tests require arc except Tests/Network/third_party/GTMHTTPServer.m
131131
unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
132-
unit_tests.source_files = 'GoogleUtilities/Example/Tests/**/*.[mh]'
133-
unit_tests.requires_arc = 'GoogleUtilities/Example/Tests/*/*.[mh]'
132+
unit_tests.source_files = 'GoogleUtilities/Tests/Unit/**/*.[mh]'
133+
unit_tests.requires_arc = 'GoogleUtilities/Tests/Unit/*/*.[mh]'
134134
unit_tests.requires_app_host = true
135135
unit_tests.dependency 'OCMock'
136136
end

GoogleUtilities/Example/Tests/Tests-Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m renamed to GoogleUtilities/Tests/Unit/Environment/GULAppEnvironmentUtilTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// limitations under the License.
1414

1515
#import <Foundation/Foundation.h>
16-
#import <OCMock/OCMock.h>
1716
#import <XCTest/XCTest.h>
17+
#import "OCMock.h"
1818

1919
#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h"
2020

GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m renamed to GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#import <XCTest/XCTest.h>
1818

19-
#import <OCMock/OCMock.h>
2019
#import "FBLPromise+Testing.h"
21-
#import "GoogleUtilities/Example/Tests/Utils/GULTestKeychain.h"
20+
#import "GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.h"
21+
#import "OCMock.h"
2222

2323
#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h"
2424

GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m renamed to GoogleUtilities/Tests/Unit/Logger/GULLoggerTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#ifdef DEBUG
1616
// The tests depend upon library methods only built with #ifdef DEBUG
1717

18-
#import <OCMock/OCMock.h>
1918
#import <XCTest/XCTest.h>
19+
#import "OCMock.h"
2020

2121
#import "GoogleUtilities/Logger/Private/GULLogger.h"
2222

GoogleUtilities/Example/Tests/Network/GULNetworkTest.m renamed to GoogleUtilities/Tests/Unit/Network/GULNetworkTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#import "GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h"
15+
#import "GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h"
1616

17-
#import <OCMock/OCMock.h>
1817
#import <XCTest/XCTest.h>
18+
#import "OCMock.h"
1919

2020
#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h"
2121
#import "GoogleUtilities/Network/Private/GULNetwork.h"

GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.m renamed to GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#import <unistd.h>
5252

5353
#define GTMHTTPSERVER_DEFINE_GLOBALS
54-
#import "GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h"
54+
#import "GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h"
5555

5656
// avoid some of GTM's promiscuous dependencies
5757
#ifndef _GTMDevLog

0 commit comments

Comments
 (0)