Skip to content

Commit 676e7a4

Browse files
author
gugmaster
committed
Moved unit tests to Source folder
Made unit test use static lib instead of source direct
1 parent a78f9d6 commit 676e7a4

File tree

5 files changed

+38
-18
lines changed

5 files changed

+38
-18
lines changed

Test/DTLocalizableStringsParserTest.h renamed to Test/Source/DTLocalizableStringsParserTest.h

File renamed without changes.

Test/DTLocalizableStringsParserTest.m renamed to Test/Source/DTLocalizableStringsParserTest.m

File renamed without changes.

Test/UnitTest.h renamed to Test/Source/UnitTest.h

File renamed without changes.

Test/UnitTest.m renamed to Test/Source/UnitTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "DTLocalizableStringAggregator.h"
1111
#import "DTLocalizableStringTable.h"
1212

13-
#import </usr/include/objc/objc-class.h>
13+
#import <objc/objc-class.h>
1414

1515

1616
NSString *testCaseNameFromURL(NSURL *URL, BOOL withSpaces);
@@ -60,7 +60,7 @@ + (void)initialize
6060
[test internalTestCaseWithURL:URL withTempPath:tempPath];
6161
};
6262

63-
IMP myIMP = imp_implementationWithBlock((__bridge void *)impBlock);
63+
IMP myIMP = imp_implementationWithBlock((__bridge id)((__bridge void *)impBlock));
6464

6565
SEL selector = NSSelectorFromString(selectorName);
6666

‎genstrings2.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
A7E19B9F14BF033000493494 /* DTLocalizableStringTable.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E19B9C14BF033000493494 /* DTLocalizableStringTable.m */; };
2828
A7F65DC014C03E980092E2EE /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F65DBF14C03E980092E2EE /* SenTestingKit.framework */; };
2929
A7F65DC114C03E980092E2EE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79AC08914B1A51800489FA3 /* Cocoa.framework */; };
30-
A7F65DD814C03F920092E2EE /* UnitTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A7F65DD614C03F920092E2EE /* UnitTest.m */; };
3130
A7F65DDC14C040D00092E2EE /* Testcases.txt in Resources */ = {isa = PBXBuildFile; fileRef = A7F65DDB14C040D00092E2EE /* Testcases.txt */; };
3231
A7F65DE214C043850092E2EE /* Slashes_and_Quotes.txt in Resources */ = {isa = PBXBuildFile; fileRef = A7F65DE114C043850092E2EE /* Slashes_and_Quotes.txt */; };
33-
A7F65DE414C0465E0092E2EE /* DTLocalizableStringEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 55951CFF14BD3C1700E4A63E /* DTLocalizableStringEntry.m */; };
34-
A7F65DE514C0465E0092E2EE /* DTLocalizableStringScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = A79AC07614B1A48A00489FA3 /* DTLocalizableStringScanner.m */; };
35-
A7F65DE614C0465E0092E2EE /* DTLocalizableStringAggregator.m in Sources */ = {isa = PBXBuildFile; fileRef = A79AC09C14B1A99E00489FA3 /* DTLocalizableStringAggregator.m */; };
3632
A7F65DE714C0465E0092E2EE /* (null) in Sources */ = {isa = PBXBuildFile; };
37-
A7F65DE814C0465E0092E2EE /* NSString+DTLocalizableStringScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = A79AC07A14B1A48A00489FA3 /* NSString+DTLocalizableStringScanner.m */; };
38-
A7F65DE914C0465E0092E2EE /* DTLocalizableStringTable.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E19B9C14BF033000493494 /* DTLocalizableStringTable.m */; };
3933
A7F65DEB14C067990092E2EE /* Multiple_Tables.txt in Resources */ = {isa = PBXBuildFile; fileRef = A7F65DEA14C067980092E2EE /* Multiple_Tables.txt */; };
4034
A7F65DEC14C06C220092E2EE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79AC08E14B1A51800489FA3 /* Foundation.framework */; };
35+
FA35A34A16DFA0F8001CB74A /* DTLocalizableStringsParser.h in Headers */ = {isa = PBXBuildFile; fileRef = FA35A34816DFA0F8001CB74A /* DTLocalizableStringsParser.h */; };
36+
FA35A34B16DFA0F8001CB74A /* DTLocalizableStringsParser.m in Sources */ = {isa = PBXBuildFile; fileRef = FA35A34916DFA0F8001CB74A /* DTLocalizableStringsParser.m */; };
37+
FA35A34D16DFA106001CB74A /* libDTLocalizableStringScanner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A79AC08814B1A51800489FA3 /* libDTLocalizableStringScanner.a */; };
38+
FA35A34F16DFA12A001CB74A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA35A34E16DFA12A001CB74A /* Localizable.strings */; };
39+
FA35A35516DFA1C0001CB74A /* DTLocalizableStringsParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = FA35A35216DFA1C0001CB74A /* DTLocalizableStringsParserTest.m */; };
40+
FA35A35616DFA1C0001CB74A /* UnitTest.m in Sources */ = {isa = PBXBuildFile; fileRef = FA35A35416DFA1C0001CB74A /* UnitTest.m */; };
4141
/* End PBXBuildFile section */
4242

4343
/* Begin PBXCopyFilesBuildPhase section */
@@ -85,11 +85,16 @@
8585
A7F65DBF14C03E980092E2EE /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
8686
A7F65DD314C03F920092E2EE /* UnitTest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "UnitTest-Info.plist"; sourceTree = "<group>"; };
8787
A7F65DD414C03F920092E2EE /* UnitTest-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UnitTest-Prefix.pch"; sourceTree = "<group>"; };
88-
A7F65DD514C03F920092E2EE /* UnitTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitTest.h; sourceTree = "<group>"; };
89-
A7F65DD614C03F920092E2EE /* UnitTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnitTest.m; sourceTree = "<group>"; };
9088
A7F65DDB14C040D00092E2EE /* Testcases.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Testcases.txt; sourceTree = "<group>"; };
9189
A7F65DE114C043850092E2EE /* Slashes_and_Quotes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Slashes_and_Quotes.txt; sourceTree = "<group>"; };
9290
A7F65DEA14C067980092E2EE /* Multiple_Tables.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Multiple_Tables.txt; sourceTree = "<group>"; };
91+
FA35A34816DFA0F8001CB74A /* DTLocalizableStringsParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTLocalizableStringsParser.h; sourceTree = "<group>"; };
92+
FA35A34916DFA0F8001CB74A /* DTLocalizableStringsParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTLocalizableStringsParser.m; sourceTree = "<group>"; };
93+
FA35A34E16DFA12A001CB74A /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
94+
FA35A35116DFA1C0001CB74A /* DTLocalizableStringsParserTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTLocalizableStringsParserTest.h; sourceTree = "<group>"; };
95+
FA35A35216DFA1C0001CB74A /* DTLocalizableStringsParserTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTLocalizableStringsParserTest.m; sourceTree = "<group>"; };
96+
FA35A35316DFA1C0001CB74A /* UnitTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitTest.h; sourceTree = "<group>"; };
97+
FA35A35416DFA1C0001CB74A /* UnitTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnitTest.m; sourceTree = "<group>"; };
9398
/* End PBXFileReference section */
9499

95100
/* Begin PBXFrameworksBuildPhase section */
@@ -113,6 +118,7 @@
113118
isa = PBXFrameworksBuildPhase;
114119
buildActionMask = 2147483647;
115120
files = (
121+
FA35A34D16DFA106001CB74A /* libDTLocalizableStringScanner.a in Frameworks */,
116122
A7F65DEC14C06C220092E2EE /* Foundation.framework in Frameworks */,
117123
A7F65DC014C03E980092E2EE /* SenTestingKit.framework in Frameworks */,
118124
A7F65DC114C03E980092E2EE /* Cocoa.framework in Frameworks */,
@@ -167,6 +173,8 @@
167173
A79AC07414B1A48A00489FA3 /* Source */ = {
168174
isa = PBXGroup;
169175
children = (
176+
FA35A34816DFA0F8001CB74A /* DTLocalizableStringsParser.h */,
177+
FA35A34916DFA0F8001CB74A /* DTLocalizableStringsParser.m */,
170178
55951CFE14BD3C1700E4A63E /* DTLocalizableStringEntry.h */,
171179
55951CFF14BD3C1700E4A63E /* DTLocalizableStringEntry.m */,
172180
A79AC07514B1A48A00489FA3 /* DTLocalizableStringScanner.h */,
@@ -221,18 +229,18 @@
221229
A7E19B4214BD938E00493494 /* Test */ = {
222230
isa = PBXGroup;
223231
children = (
232+
FA35A35016DFA1C0001CB74A /* Source */,
224233
A7F65DDA14C040D00092E2EE /* Resources */,
225234
A7F65DD314C03F920092E2EE /* UnitTest-Info.plist */,
226235
A7F65DD414C03F920092E2EE /* UnitTest-Prefix.pch */,
227-
A7F65DD514C03F920092E2EE /* UnitTest.h */,
228-
A7F65DD614C03F920092E2EE /* UnitTest.m */,
229236
);
230237
path = Test;
231238
sourceTree = "<group>";
232239
};
233240
A7F65DDA14C040D00092E2EE /* Resources */ = {
234241
isa = PBXGroup;
235242
children = (
243+
FA35A34E16DFA12A001CB74A /* Localizable.strings */,
236244
A79499CE14C3052500A8CCDE /* CustomPrefix.txt */,
237245
A79499D114C30B0300A8CCDE /* CustomPrefix.plist */,
238246
A79499AC14C0D35500A8CCDE /* NSPredicateEditor.txt */,
@@ -245,6 +253,17 @@
245253
path = Resources;
246254
sourceTree = "<group>";
247255
};
256+
FA35A35016DFA1C0001CB74A /* Source */ = {
257+
isa = PBXGroup;
258+
children = (
259+
FA35A35116DFA1C0001CB74A /* DTLocalizableStringsParserTest.h */,
260+
FA35A35216DFA1C0001CB74A /* DTLocalizableStringsParserTest.m */,
261+
FA35A35316DFA1C0001CB74A /* UnitTest.h */,
262+
FA35A35416DFA1C0001CB74A /* UnitTest.m */,
263+
);
264+
path = Source;
265+
sourceTree = "<group>";
266+
};
248267
/* End PBXGroup section */
249268

250269
/* Begin PBXHeadersBuildPhase section */
@@ -257,6 +276,7 @@
257276
A79AC0AB14B4A36100489FA3 /* NSString+DTLocalizableStringScanner.h in Headers */,
258277
A79AC0AD14B4A3D100489FA3 /* DTLocalizableStringScanner-Prefix.pch in Headers */,
259278
A7E19B9D14BF033000493494 /* DTLocalizableStringTable.h in Headers */,
279+
FA35A34A16DFA0F8001CB74A /* DTLocalizableStringsParser.h in Headers */,
260280
);
261281
runOnlyForDeploymentPostprocessing = 0;
262282
};
@@ -356,6 +376,7 @@
356376
A79499D214C30B0400A8CCDE /* CustomPrefix.plist in Resources */,
357377
A7D74C6B14C43D7300F15340 /* Unicode.txt in Resources */,
358378
A7D74C7114C4697B00F15340 /* Unicode.plist in Resources */,
379+
FA35A34F16DFA12A001CB74A /* Localizable.strings in Resources */,
359380
);
360381
runOnlyForDeploymentPostprocessing = 0;
361382
};
@@ -395,20 +416,17 @@
395416
A79AC0A814B4A35800489FA3 /* NSString+DTLocalizableStringScanner.m in Sources */,
396417
A7E19B4A14BDBD0500493494 /* DTLocalizableStringEntry.m in Sources */,
397418
A7E19B9F14BF033000493494 /* DTLocalizableStringTable.m in Sources */,
419+
FA35A34B16DFA0F8001CB74A /* DTLocalizableStringsParser.m in Sources */,
398420
);
399421
runOnlyForDeploymentPostprocessing = 0;
400422
};
401423
A7F65DB914C03E980092E2EE /* Sources */ = {
402424
isa = PBXSourcesBuildPhase;
403425
buildActionMask = 2147483647;
404426
files = (
405-
A7F65DD814C03F920092E2EE /* UnitTest.m in Sources */,
406-
A7F65DE414C0465E0092E2EE /* DTLocalizableStringEntry.m in Sources */,
407-
A7F65DE514C0465E0092E2EE /* DTLocalizableStringScanner.m in Sources */,
408-
A7F65DE614C0465E0092E2EE /* DTLocalizableStringAggregator.m in Sources */,
409427
A7F65DE714C0465E0092E2EE /* (null) in Sources */,
410-
A7F65DE814C0465E0092E2EE /* NSString+DTLocalizableStringScanner.m in Sources */,
411-
A7F65DE914C0465E0092E2EE /* DTLocalizableStringTable.m in Sources */,
428+
FA35A35516DFA1C0001CB74A /* DTLocalizableStringsParserTest.m in Sources */,
429+
FA35A35616DFA1C0001CB74A /* UnitTest.m in Sources */,
412430
);
413431
runOnlyForDeploymentPostprocessing = 0;
414432
};
@@ -524,6 +542,7 @@
524542
GCC_PRECOMPILE_PREFIX_HEADER = YES;
525543
GCC_PREFIX_HEADER = "Test/UnitTest-Prefix.pch";
526544
INFOPLIST_FILE = "Test/UnitTest-Info.plist";
545+
OTHER_LDFLAGS = "-ObjC";
527546
PRODUCT_NAME = "$(TARGET_NAME)";
528547
WRAPPER_EXTENSION = octest;
529548
};
@@ -537,6 +556,7 @@
537556
GCC_PRECOMPILE_PREFIX_HEADER = YES;
538557
GCC_PREFIX_HEADER = "Test/UnitTest-Prefix.pch";
539558
INFOPLIST_FILE = "Test/UnitTest-Info.plist";
559+
OTHER_LDFLAGS = "-ObjC";
540560
PRODUCT_NAME = "$(TARGET_NAME)";
541561
WRAPPER_EXTENSION = octest;
542562
};

0 commit comments

Comments
 (0)