Skip to content

Commit 45955ae

Browse files
committed
more test restructuring
1 parent 2865c72 commit 45955ae

File tree

3 files changed

+19
-52
lines changed

3 files changed

+19
-52
lines changed

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
1C686BEE1F869B02007D8627 /* SocketAckManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD61F869AF1007D8627 /* SocketAckManagerTest.swift */; };
2929
1C686BEF1F869B02007D8627 /* SocketParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD71F869AF1007D8627 /* SocketParserTest.swift */; };
3030
1C686BF01F869B02007D8627 /* SocketNamespacePacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD81F869AF1007D8627 /* SocketNamespacePacketTest.swift */; };
31-
1C686BF51F869CC9007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BF41F869CA9007D8627 /* SocketObjectiveCTest.m */; };
32-
1C686BF61F869D54007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BF41F869CA9007D8627 /* SocketObjectiveCTest.m */; };
33-
1C686BF71F869D5A007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BF41F869CA9007D8627 /* SocketObjectiveCTest.m */; };
31+
1C686BFF1F869EA9007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BFE1F869E9D007D8627 /* SocketObjectiveCTest.m */; };
32+
1C686C001F869EAE007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BFE1F869E9D007D8627 /* SocketObjectiveCTest.m */; };
33+
1C686C011F869EB6007D8627 /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BFE1F869E9D007D8627 /* SocketObjectiveCTest.m */; };
3434
572EF21F1B51F16C00EEBB58 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 572EF21E1B51F16C00EEBB58 /* SocketIO.h */; settings = {ATTRIBUTES = (Public, ); }; };
3535
572EF2251B51F16C00EEBB58 /* SocketIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 572EF2191B51F16C00EEBB58 /* SocketIO.framework */; };
3636
572EF23D1B51F18A00EEBB58 /* SocketIO-Mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 572EF23C1B51F18A00EEBB58 /* SocketIO-Mac.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -163,7 +163,7 @@
163163
1C686BD61F869AF1007D8627 /* SocketAckManagerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocketAckManagerTest.swift; sourceTree = "<group>"; };
164164
1C686BD71F869AF1007D8627 /* SocketParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocketParserTest.swift; sourceTree = "<group>"; };
165165
1C686BD81F869AF1007D8627 /* SocketNamespacePacketTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocketNamespacePacketTest.swift; sourceTree = "<group>"; };
166-
1C686BF41F869CA9007D8627 /* SocketObjectiveCTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocketObjectiveCTest.m; sourceTree = "<group>"; };
166+
1C686BFE1F869E9D007D8627 /* SocketObjectiveCTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocketObjectiveCTest.m; sourceTree = "<group>"; };
167167
572EF2191B51F16C00EEBB58 /* SocketIO.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketIO.framework; sourceTree = BUILT_PRODUCTS_DIR; };
168168
572EF21D1B51F16C00EEBB58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
169169
572EF21E1B51F16C00EEBB58 /* SocketIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocketIO.h; sourceTree = "<group>"; };
@@ -172,7 +172,6 @@
172172
572EF23B1B51F18A00EEBB58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
173173
572EF23C1B51F18A00EEBB58 /* SocketIO-Mac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SocketIO-Mac.h"; sourceTree = "<group>"; };
174174
572EF2421B51F18A00EEBB58 /* SocketIO-MacTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SocketIO-MacTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
175-
572EF2481B51F18A00EEBB58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
176175
57634A161BD9B46A00E19CD7 /* SocketIO.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SocketIO.framework; sourceTree = BUILT_PRODUCTS_DIR; };
177176
57634A3B1BD9B46D00E19CD7 /* SocketIO-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SocketIO-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
178177
6CA08A951D615C040061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
@@ -284,15 +283,24 @@
284283
path = Tests/TestSocketIO;
285284
sourceTree = "<group>";
286285
};
286+
1C686BFD1F869E9D007D8627 /* TestSocketIOObjc */ = {
287+
isa = PBXGroup;
288+
children = (
289+
1C686BFE1F869E9D007D8627 /* SocketObjectiveCTest.m */,
290+
);
291+
name = TestSocketIOObjc;
292+
path = Tests/TestSocketIOObjc;
293+
sourceTree = "<group>";
294+
};
287295
572EF20D1B51F12F00EEBB58 = {
288296
isa = PBXGroup;
289297
children = (
290298
1C686BD11F869AF1007D8627 /* TestSocketIO */,
299+
1C686BFD1F869E9D007D8627 /* TestSocketIOObjc */,
291300
6CA08A9B1D615C190061FD2A /* Frameworks */,
292301
572EF21A1B51F16C00EEBB58 /* Products */,
293302
572EF21B1B51F16C00EEBB58 /* SocketIO-iOS */,
294303
572EF2391B51F18A00EEBB58 /* SocketIO-Mac */,
295-
572EF2461B51F18A00EEBB58 /* SocketIO-MacTests */,
296304
5764DF7B1B51F24A004FF46E /* Source */,
297305
);
298306
sourceTree = "<group>";
@@ -344,23 +352,6 @@
344352
name = "Supporting Files";
345353
sourceTree = "<group>";
346354
};
347-
572EF2461B51F18A00EEBB58 /* SocketIO-MacTests */ = {
348-
isa = PBXGroup;
349-
children = (
350-
1C686BF41F869CA9007D8627 /* SocketObjectiveCTest.m */,
351-
572EF2471B51F18A00EEBB58 /* Supporting Files */,
352-
);
353-
path = "SocketIO-MacTests";
354-
sourceTree = "<group>";
355-
};
356-
572EF2471B51F18A00EEBB58 /* Supporting Files */ = {
357-
isa = PBXGroup;
358-
children = (
359-
572EF2481B51F18A00EEBB58 /* Info.plist */,
360-
);
361-
name = "Supporting Files";
362-
sourceTree = "<group>";
363-
};
364355
5764DF7B1B51F24A004FF46E /* Source */ = {
365356
isa = PBXGroup;
366357
children = (
@@ -768,7 +759,7 @@
768759
isa = PBXSourcesBuildPhase;
769760
buildActionMask = 2147483647;
770761
files = (
771-
1C686BF61F869D54007D8627 /* SocketObjectiveCTest.m in Sources */,
762+
1C686BFF1F869EA9007D8627 /* SocketObjectiveCTest.m in Sources */,
772763
1C686BEA1F869B02007D8627 /* SocketIOClientConfigurationTest.swift in Sources */,
773764
1C686BEB1F869B02007D8627 /* SocketEngineTest.swift in Sources */,
774765
1C686BEC1F869B02007D8627 /* SocketSideEffectTest.swift in Sources */,
@@ -813,7 +804,7 @@
813804
isa = PBXSourcesBuildPhase;
814805
buildActionMask = 2147483647;
815806
files = (
816-
1C686BF51F869CC9007D8627 /* SocketObjectiveCTest.m in Sources */,
807+
1C686C001F869EAE007D8627 /* SocketObjectiveCTest.m in Sources */,
817808
1C686BE21F869AFD007D8627 /* SocketIOClientConfigurationTest.swift in Sources */,
818809
1C686BE31F869AFD007D8627 /* SocketEngineTest.swift in Sources */,
819810
1C686BE41F869AFD007D8627 /* SocketSideEffectTest.swift in Sources */,
@@ -858,7 +849,7 @@
858849
isa = PBXSourcesBuildPhase;
859850
buildActionMask = 2147483647;
860851
files = (
861-
1C686BF71F869D5A007D8627 /* SocketObjectiveCTest.m in Sources */,
852+
1C686C011F869EB6007D8627 /* SocketObjectiveCTest.m in Sources */,
862853
1C686BDA1F869AF9007D8627 /* SocketIOClientConfigurationTest.swift in Sources */,
863854
1C686BDB1F869AF9007D8627 /* SocketEngineTest.swift in Sources */,
864855
1C686BDC1F869AF9007D8627 /* SocketSideEffectTest.swift in Sources */,
@@ -1364,7 +1355,7 @@
13641355
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13651356
GCC_WARN_UNUSED_FUNCTION = YES;
13661357
GCC_WARN_UNUSED_VARIABLE = YES;
1367-
INFOPLIST_FILE = "SocketIO-MacTests/Info.plist";
1358+
INFOPLIST_FILE = "SocketIO-Mac/Info.plist";
13681359
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
13691360
LIBRARY_SEARCH_PATHS = (
13701361
"$(inherited)",
@@ -1419,7 +1410,7 @@
14191410
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14201411
GCC_WARN_UNUSED_FUNCTION = YES;
14211412
GCC_WARN_UNUSED_VARIABLE = YES;
1422-
INFOPLIST_FILE = "SocketIO-MacTests/Info.plist";
1413+
INFOPLIST_FILE = "SocketIO-Mac/Info.plist";
14231414
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
14241415
LIBRARY_SEARCH_PATHS = (
14251416
"$(inherited)",

SocketIO-MacTests/Info.plist

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

0 commit comments

Comments
 (0)