Skip to content

Commit 0ebee66

Browse files
committed
Work around space in filename style.sh issue
1 parent ebc7edf commit 0ebee66

File tree

3 files changed

+43
-42
lines changed

3 files changed

+43
-42
lines changed

GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
1515
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
1616
DE5CF98E20F686310063FFDD /* GULAppEnvironmentUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE5CF98C20F686290063FFDD /* GULAppEnvironmentUtilTest.m */; };
17+
DE84BBC421D7EC900048A176 /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */; };
18+
DE84BBC521D7EC900048A176 /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */; };
19+
DE84BBC621D7EC900048A176 /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */; };
1720
DEC977D720F68C3300014E20 /* GULReachabilityCheckerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC977D320F68C3300014E20 /* GULReachabilityCheckerTest.m */; };
1821
DEC977D820F68C3300014E20 /* GULMutableDictionaryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC977D520F68C3300014E20 /* GULMutableDictionaryTest.m */; };
1922
DEC977D920F68C3300014E20 /* GULNetworkTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC977D620F68C3300014E20 /* GULNetworkTest.m */; };
@@ -46,9 +49,6 @@
4649
DEC9788720F6E1E000014E20 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DEC9788020F6E1DF00014E20 /* Main.storyboard */; };
4750
DEC9788820F6E1E000014E20 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC9788120F6E1DF00014E20 /* main.m */; };
4851
DEC9788920F6E1E000014E20 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC9788220F6E1DF00014E20 /* AppDelegate.m */; };
49-
ED18C2A0213EDB98009F633D /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED18C29F213EDB98009F633D /* GULUserDefaultsTests.m */; };
50-
ED18C2A1213EDB98009F633D /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED18C29F213EDB98009F633D /* GULUserDefaultsTests.m */; };
51-
ED18C2A2213EDB98009F633D /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED18C29F213EDB98009F633D /* GULUserDefaultsTests.m */; };
5252
EFBE67FA2101401100E756A7 /* GULSwizzlerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EFBE67F02101401100E756A7 /* GULSwizzlerTest.m */; };
5353
EFBE67FB2101401100E756A7 /* GULSwizzlingCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EFBE67F12101401100E756A7 /* GULSwizzlingCacheTest.m */; };
5454
EFBE67FC2101401100E756A7 /* GULRuntimeClassDiffTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EFBE67F22101401100E756A7 /* GULRuntimeClassDiffTests.m */; };
@@ -94,6 +94,7 @@
9494
6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
9595
7BEA793625C8DE7C8EC60006 /* GoogleUtilities.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GoogleUtilities.podspec; path = ../GoogleUtilities.podspec; sourceTree = "<group>"; };
9696
DE5CF98C20F686290063FFDD /* GULAppEnvironmentUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULAppEnvironmentUtilTest.m; sourceTree = "<group>"; };
97+
DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULUserDefaultsTests.m; sourceTree = "<group>"; };
9798
DEC977D320F68C3300014E20 /* GULReachabilityCheckerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULReachabilityCheckerTest.m; sourceTree = "<group>"; };
9899
DEC977D520F68C3300014E20 /* GULMutableDictionaryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULMutableDictionaryTest.m; sourceTree = "<group>"; };
99100
DEC977D620F68C3300014E20 /* GULNetworkTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULNetworkTest.m; sourceTree = "<group>"; };
@@ -129,7 +130,6 @@
129130
DEC9788320F6E1DF00014E20 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
130131
DEC9788420F6E1DF00014E20 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
131132
E0A8D570636E99E7C3396DF8 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
132-
ED18C29F213EDB98009F633D /* GULUserDefaultsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GULUserDefaultsTests.m; sourceTree = "<group>"; };
133133
EFBE67F02101401100E756A7 /* GULSwizzlerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULSwizzlerTest.m; sourceTree = "<group>"; };
134134
EFBE67F12101401100E756A7 /* GULSwizzlingCacheTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULSwizzlingCacheTest.m; sourceTree = "<group>"; };
135135
EFBE67F22101401100E756A7 /* GULRuntimeClassDiffTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULRuntimeClassDiffTests.m; sourceTree = "<group>"; };
@@ -235,7 +235,7 @@
235235
6003F5B5195388D20070C39A /* Tests */ = {
236236
isa = PBXGroup;
237237
children = (
238-
ED18C29E213ED7B9009F633D /* User Defaults */,
238+
DE84BBC221D7EC900048A176 /* UserDefaults */,
239239
EFBE67EF2101401100E756A7 /* Swizzler */,
240240
DEC977DE20F6A7A700014E20 /* Logger */,
241241
DEC977D420F68C3300014E20 /* Network */,
@@ -272,6 +272,14 @@
272272
path = Environment;
273273
sourceTree = "<group>";
274274
};
275+
DE84BBC221D7EC900048A176 /* UserDefaults */ = {
276+
isa = PBXGroup;
277+
children = (
278+
DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */,
279+
);
280+
path = UserDefaults;
281+
sourceTree = "<group>";
282+
};
275283
DEC977D220F68C3300014E20 /* Reachability */ = {
276284
isa = PBXGroup;
277285
children = (
@@ -352,14 +360,6 @@
352360
path = tvOS;
353361
sourceTree = "<group>";
354362
};
355-
ED18C29E213ED7B9009F633D /* User Defaults */ = {
356-
isa = PBXGroup;
357-
children = (
358-
ED18C29F213EDB98009F633D /* GULUserDefaultsTests.m */,
359-
);
360-
path = "User Defaults";
361-
sourceTree = "<group>";
362-
};
363363
EFBE67EF2101401100E756A7 /* Swizzler */ = {
364364
isa = PBXGroup;
365365
children = (
@@ -610,8 +610,8 @@
610610
EFBE67FF2101401100E756A7 /* GULRuntimeDiffTests.m in Sources */,
611611
DEC977DD20F68FE100014E20 /* GTMHTTPServer.m in Sources */,
612612
EFBE68022101401100E756A7 /* GULRuntimeSnapshotTests.m in Sources */,
613-
ED18C2A0213EDB98009F633D /* GULUserDefaultsTests.m in Sources */,
614613
EFBE68002101401100E756A7 /* GULSwizzlerInheritedMethodsSwizzlingTest.m in Sources */,
614+
DE84BBC421D7EC900048A176 /* GULUserDefaultsTests.m in Sources */,
615615
EFBE68012101401100E756A7 /* GULRuntimeStateHelperTests.m in Sources */,
616616
DEC977D820F68C3300014E20 /* GULMutableDictionaryTest.m in Sources */,
617617
DEC977E120F6A7C100014E20 /* GULLoggerTest.m in Sources */,
@@ -643,7 +643,7 @@
643643
DEC9781920F6D38500014E20 /* GULAppEnvironmentUtilTest.m in Sources */,
644644
DEC9781A20F6D38800014E20 /* GULReachabilityCheckerTest.m in Sources */,
645645
DEC9781820F6D37400014E20 /* GULLoggerTest.m in Sources */,
646-
ED18C2A1213EDB98009F633D /* GULUserDefaultsTests.m in Sources */,
646+
DE84BBC521D7EC900048A176 /* GULUserDefaultsTests.m in Sources */,
647647
DEC9781D20F6D39900014E20 /* GTMHTTPServer.m in Sources */,
648648
DEC9781B20F6D39500014E20 /* GULMutableDictionaryTest.m in Sources */,
649649
DEC9781C20F6D39500014E20 /* GULNetworkTest.m in Sources */,
@@ -667,7 +667,7 @@
667667
DEC9786920F6D66300014E20 /* GTMHTTPServer.m in Sources */,
668668
DEC9786B20F6D66300014E20 /* GULNetworkTest.m in Sources */,
669669
DEC9786A20F6D66300014E20 /* GULMutableDictionaryTest.m in Sources */,
670-
ED18C2A2213EDB98009F633D /* GULUserDefaultsTests.m in Sources */,
670+
DE84BBC621D7EC900048A176 /* GULUserDefaultsTests.m in Sources */,
671671
DEC9786C20F6D66700014E20 /* GULReachabilityCheckerTest.m in Sources */,
672672
DEC9786820F6D65B00014E20 /* GULLoggerTest.m in Sources */,
673673
DEC9786D20F6D66B00014E20 /* GULAppEnvironmentUtilTest.m in Sources */,

GoogleUtilities/Example/Tests/User Defaults/GULUserDefaultsTests.m renamed to GoogleUtilities/Example/Tests/UserDefaults/GULUserDefaultsTests.m

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ - (void)testNewUserDefaultsWithStandardUserDefaults {
8383
XCTAssertEqualObjects([userDefaults objectForKey:key3], array);
8484

8585
NSString *key4 = @"DictionaryKey";
86-
NSDictionary *dictionary = @{ @"testing" : @"Hi there!" };
86+
NSDictionary *dictionary = @{@"testing" : @"Hi there!"};
8787
[newUserDefaults setObject:dictionary forKey:key4];
8888
XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary);
8989
XCTAssertEqualObjects([newUserDefaults dictionaryForKey:key4], dictionary);
@@ -115,8 +115,8 @@ - (void)testNewUserDefaultsWithStandardUserDefaults {
115115
XCTAssertNotNil([userDefaults objectForKey:key7]);
116116
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[newUserDefaults objectForKey:key7]],
117117
0.0, sEpsilon);
118-
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[userDefaults objectForKey:key7]],
119-
0.0, sEpsilon);
118+
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[userDefaults objectForKey:key7]], 0.0,
119+
sEpsilon);
120120

121121
NSString *key8 = @"FloatKey";
122122
[newUserDefaults setFloat:0.99 forKey:key8];
@@ -146,7 +146,7 @@ - (void)testNewUserDefaultsWithStandardUserDefaults {
146146
XCTAssertEqualObjects([newUserDefaults arrayForKey:key3], array2);
147147
XCTAssertEqualObjects([userDefaults objectForKey:key3], array2);
148148

149-
NSDictionary *dictionary2 = @{ @"testing 2" : @3 };
149+
NSDictionary *dictionary2 = @{@"testing 2" : @3};
150150
[newUserDefaults setObject:dictionary2 forKey:key4];
151151
XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary2);
152152
XCTAssertEqualObjects([newUserDefaults dictionaryForKey:key4], dictionary2);
@@ -202,7 +202,7 @@ - (void)testNSUserDefaultsWithNewUserDefaults {
202202
XCTAssertEqualObjects([userDefaults objectForKey:key3], array);
203203

204204
NSString *key4 = @"DictionaryKey";
205-
NSDictionary *dictionary = @{ @"testing" : @"Hi there!" };
205+
NSDictionary *dictionary = @{@"testing" : @"Hi there!"};
206206
[userDefaults setObject:dictionary forKey:key4];
207207
XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary);
208208
XCTAssertEqualObjects([newUserDefaults dictionaryForKey:key4], dictionary);
@@ -234,8 +234,8 @@ - (void)testNSUserDefaultsWithNewUserDefaults {
234234
XCTAssertNotNil([userDefaults objectForKey:key7]);
235235
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[newUserDefaults objectForKey:key7]],
236236
0.0, sEpsilon);
237-
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[userDefaults objectForKey:key7]],
238-
0.0, sEpsilon);
237+
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[userDefaults objectForKey:key7]], 0.0,
238+
sEpsilon);
239239

240240
NSString *key8 = @"FloatKey";
241241
[userDefaults setFloat:0.99 forKey:key8];
@@ -265,7 +265,7 @@ - (void)testNSUserDefaultsWithNewUserDefaults {
265265
XCTAssertEqualObjects([newUserDefaults arrayForKey:key3], array2);
266266
XCTAssertEqualObjects([userDefaults objectForKey:key3], array2);
267267

268-
NSDictionary *dictionary2 = @{ @"testing 2" : @3 };
268+
NSDictionary *dictionary2 = @{@"testing 2" : @3};
269269
[userDefaults setObject:dictionary2 forKey:key4];
270270
XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary2);
271271
XCTAssertEqualObjects([newUserDefaults dictionaryForKey:key4], dictionary2);
@@ -322,7 +322,7 @@ - (void)testNewSharedUserDefaultsWithStandardUserDefaults {
322322
XCTAssertEqualObjects([userDefaults objectForKey:key3], array);
323323

324324
NSString *key4 = @"DictionaryKey";
325-
NSDictionary *dictionary = @{ @"testing" : @"Hi there!" };
325+
NSDictionary *dictionary = @{@"testing" : @"Hi there!"};
326326
[userDefaults setObject:dictionary forKey:key4];
327327
XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary);
328328
XCTAssertEqualObjects([newUserDefaults dictionaryForKey:key4], dictionary);
@@ -354,8 +354,8 @@ - (void)testNewSharedUserDefaultsWithStandardUserDefaults {
354354
XCTAssertNotNil([userDefaults objectForKey:key7]);
355355
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[newUserDefaults objectForKey:key7]],
356356
0.0, sEpsilon);
357-
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[userDefaults objectForKey:key7]],
358-
0.0, sEpsilon);
357+
XCTAssertEqualWithAccuracy([testDate timeIntervalSinceDate:[userDefaults objectForKey:key7]], 0.0,
358+
sEpsilon);
359359

360360
// Remove all of the objects from the normal NSUserDefaults. The values from the new user
361361
// defaults must also be cleared!
@@ -380,7 +380,7 @@ - (void)testNewSharedUserDefaultsWithStandardUserDefaults {
380380
XCTAssertEqualObjects([newUserDefaults arrayForKey:key3], array2);
381381
XCTAssertEqualObjects([userDefaults objectForKey:key3], array2);
382382

383-
NSDictionary *dictionary2 = @{ @"testing 2" : @3 };
383+
NSDictionary *dictionary2 = @{@"testing 2" : @3};
384384
[userDefaults setObject:dictionary2 forKey:key4];
385385
XCTAssertEqualObjects([newUserDefaults objectForKey:key4], dictionary2);
386386
XCTAssertEqualObjects([userDefaults objectForKey:key4], dictionary2);
@@ -413,10 +413,10 @@ - (void)testUserDefaultNotifications {
413413
};
414414

415415
id observer =
416-
[[NSNotificationCenter defaultCenter] addObserverForName:NSUserDefaultsDidChangeNotification
417-
object:nil
418-
queue:nil
419-
usingBlock:callBlock];
416+
[[NSNotificationCenter defaultCenter] addObserverForName:NSUserDefaultsDidChangeNotification
417+
object:nil
418+
queue:nil
419+
usingBlock:callBlock];
420420
NSString *suiteName = @"test_suite_notification";
421421
GULUserDefaults *newUserDefaults = [[GULUserDefaults alloc] initWithSuiteName:suiteName];
422422
[newUserDefaults setObject:@"134" forKey:@"test-another"];
@@ -453,7 +453,8 @@ - (void)testSynchronizeToDisk {
453453
[newUserDefaults setObject:@"134" forKey:@"test-another"];
454454
[newUserDefaults synchronize];
455455

456-
XCTAssertTrue([fileManager fileExistsAtPath:filePath], @"The user defaults file was not synchronized to disk.");
456+
XCTAssertTrue([fileManager fileExistsAtPath:filePath],
457+
@"The user defaults file was not synchronized to disk.");
457458

458459
// Now get the file directly from disk.
459460
XCTAssertTrue([fileManager fileExistsAtPath:filePath]);
@@ -564,7 +565,7 @@ - (void)testNewUserDefaultsThreadSafeAddingObjects {
564565
XCTestExpectation *expectation = [self expectationForPredicate:dictionarySize
565566
evaluatedWithObject:dictionary
566567
handler:nil];
567-
[self waitForExpectations:@[expectation] timeout:kGULTestCaseTimeoutInterval];
568+
[self waitForExpectations:@[ expectation ] timeout:kGULTestCaseTimeoutInterval];
568569

569570
for (int i = 0; i < itemCount; i++) {
570571
NSString *key = [NSString stringWithFormat:@"%d", i];
@@ -608,7 +609,7 @@ - (void)testNewUserDefaultsRemovingObjects {
608609
XCTestExpectation *expectation = [self expectationForPredicate:emptyDictionary
609610
evaluatedWithObject:dictionary
610611
handler:nil];
611-
[self waitForExpectations:@[expectation] timeout:kGULTestCaseTimeoutInterval];
612+
[self waitForExpectations:@[ expectation ] timeout:kGULTestCaseTimeoutInterval];
612613

613614
for (int i = 0; i < itemCount; i++) {
614615
NSString *key = [NSString stringWithFormat:@"%d", i];
@@ -649,7 +650,7 @@ - (void)testNewUserDefaultsRemovingSomeObjects {
649650
XCTestExpectation *expectation = [self expectationForPredicate:dictionarySize
650651
evaluatedWithObject:dictionary
651652
handler:nil];
652-
[self waitForExpectations:@[expectation] timeout:kGULTestCaseTimeoutInterval];
653+
[self waitForExpectations:@[ expectation ] timeout:kGULTestCaseTimeoutInterval];
653654

654655
// Check the remaining of the user defaults.
655656
for (int i = 0; i < itemCount; i++) {
@@ -691,7 +692,7 @@ - (void)testBothUserDefaultsThreadSafeAddingObjects {
691692
XCTestExpectation *expectation = [self expectationForPredicate:dictionarySize
692693
evaluatedWithObject:dictionary
693694
handler:nil];
694-
[self waitForExpectations:@[expectation] timeout:kGULTestCaseTimeoutInterval];
695+
[self waitForExpectations:@[ expectation ] timeout:kGULTestCaseTimeoutInterval];
695696

696697
for (int i = 0; i < itemCount; i++) {
697698
NSString *key = [NSString stringWithFormat:@"%d", i];
@@ -739,7 +740,7 @@ - (void)testBothUserDefaultsRemovingSomeObjects {
739740
XCTestExpectation *expectation = [self expectationForPredicate:dictionarySize
740741
evaluatedWithObject:dictionary
741742
handler:nil];
742-
[self waitForExpectations:@[expectation] timeout:kGULTestCaseTimeoutInterval];
743+
[self waitForExpectations:@[ expectation ] timeout:kGULTestCaseTimeoutInterval];
743744

744745
// Check the remaining of the user defaults.
745746
for (int i = 0; i < itemCount; i++) {
@@ -828,10 +829,8 @@ - (NSString *)filePathForPreferencesName:(NSString *)preferencesName {
828829
XCTFail(@"Library directory not found - NSSearchPath results are empty.");
829830
}
830831
NSArray *components = @[
831-
paths.lastObject,
832-
@"Preferences",
833-
[preferencesName stringByAppendingPathExtension:@"plist"]
834-
];
832+
paths.lastObject, @"Preferences", [preferencesName stringByAppendingPathExtension:@"plist"]
833+
];
835834
return [NSString pathWithComponents:components];
836835
}
837836

scripts/style.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ else
104104
clang_options+=(-i)
105105
fi
106106

107+
#TODO(#2223) - Find a way to handle spaces in filenames
108+
107109
files=$(
108110
(
109111
if [[ $# -gt 0 ]]; then

0 commit comments

Comments
 (0)