ObjFW  Check-in [d3b3fd8845]

Overview
Comment:Migrate OFTCPSocketTests to ObjFWTest
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | objfwtest
Files: files | file ages | folders
SHA3-256: d3b3fd8845befe0f3a0fc839debb9ca3e342ae61d0f90f55a35302a96a9c2ee7
User & Date: js on 2024-02-13 23:02:02
Other Links: branch diff | manifest | tags
Context
2024-02-13
23:12
Migrate OFUDPSocketTests to ObjFWTest check-in: 4e06901c84 user: js tags: objfwtest
23:02
Migrate OFTCPSocketTests to ObjFWTest check-in: d3b3fd8845 user: js tags: objfwtest
22:49
OTOrderedDictionary: Remove debug statement check-in: 251b8a6c5f user: js tags: objfwtest
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified new_tests/Makefile from [fedbcb8a8a] to [39562aeab7].

︙
44
45
46
47
48
49
50
51


52
53
54
55
56
57
58

44
45
46
47
48
49
50

51
52
53
54
55
56
57
58
59








-
+
+








       ${USE_SRCS_SOCKETS}		\
       ${USE_SRCS_SUBPROCESSES}		\
       ${USE_SRCS_THREADS}		\
       testfile_bin.m			\
       testfile_ini.m
SRCS_PLUGINS = OFPluginTests.m
SRCS_SOCKETS = OFDNSResolverTests.m	\
	       OFSocketTests.m
	       OFSocketTests.m		\
	       OFTCPSocketTests.m
SRCS_SUBPROCESSES = OFSubprocessTests.m
SRCS_THREADS = OFThreadTests.m

include ../buildsys.mk

testfile_bin.m: testfile.bin
	${SHELL} ../utils/objfw-embed testfile.bin testfile.bin $@
︙

Renamed and modified tests/OFTCPSocketTests.m [4cfbc85ac3] to new_tests/OFTCPSocketTests.m [5aca96f5ad].

︙
13
14
15
16
17
18
19
20


21
22


23
24
25


26
27
28

29
30
31
32
33


34
35
36

37
38

39
40
41
42


43
44

45
46
47
48


49
50

51
52
53
54


55
56
57
58

13
14
15
16
17
18
19

20
21
22

23
24
25


26
27
28


29
30
31
32


33
34
35


36


37
38



39
40
41

42




43
44
45

46
47



48
49


50
51








-
+
+

-
+
+

-
-
+
+

-
-
+



-
-
+
+

-
-
+
-
-
+

-
-
-
+
+

-
+
-
-
-
-
+
+

-
+

-
-
-
+
+
-
-



 * file.
 */

#include "config.h"

#include <string.h>

#import "TestsAppDelegate.h"
#import "ObjFW.h"
#import "ObjFWTest.h"

static OFString *const module = @"OFTCPSocket";
@interface OFTCPSocketTests: OTTestCase
@end

@implementation TestsAppDelegate (OFTCPSocketTests)
- (void)TCPSocketTests
@implementation OFTCPSocketTests
- (void)testTCPSocket
{
	void *pool = objc_autoreleasePoolPush();
	OFTCPSocket *server, *client = nil, *accepted;
	OFTCPSocket *server, *client, *accepted;
	OFSocketAddress address;
	char buffer[6];

	TEST(@"+[socket]", (server = [OFTCPSocket socket]) &&
	    (client = [OFTCPSocket socket]))
	server = [OFTCPSocket socket];
	client = [OFTCPSocket socket];

	TEST(@"-[bindToHost:port:]",
	    R(address = [server bindToHost: @"127.0.0.1" port: 0]))
	address = [server bindToHost: @"127.0.0.1" port: 0];

	TEST(@"-[listen]", R([server listen]))
	[server listen];

	TEST(@"-[connectToHost:port:]",
	    R([client connectToHost: @"127.0.0.1"
			       port: OFSocketAddressIPPort(&address)]))
	[client connectToHost: @"127.0.0.1"
			 port: OFSocketAddressIPPort(&address)];

	TEST(@"-[accept]", (accepted = [server accept]))
	accepted = [server accept];

	TEST(@"-[remoteAddress]",
	    [OFSocketAddressString(accepted.remoteAddress)
	    isEqual: @"127.0.0.1"])
	OTAssertEqualObjects(OFSocketAddressString(accepted.remoteAddress),
	    @"127.0.0.1");

	TEST(@"-[writeString:]", R([client writeString: @"Hello!"]))
	[client writeString: @"Hello!"];

	TEST(@"-[readIntoBuffer:length:]",
	    [accepted readIntoBuffer: buffer length: 6] &&
	    !memcmp(buffer, "Hello!", 6))
	[accepted readIntoBuffer: buffer exactLength: 6];
	OTAssertEqual(memcmp(buffer, "Hello!", 6), 0);

	objc_autoreleasePoolPop(pool);
}
@end

Modified tests/Makefile from [f8156751e7] to [04f2449df8].

︙
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

30
31
32
33
34
35
36

37
38
39
40
41
42
43








-








       ${USE_SRCS_FILES}		\
       ${USE_SRCS_SOCKETS}		\
       ${USE_SRCS_WINDOWS}
SRCS_SOCKETS = ${OF_HTTP_CLIENT_TESTS_M}	\
	       OFHTTPCookieTests.m		\
	       OFHTTPCookieManagerTests.m	\
	       OFKernelEventObserverTests.m	\
	       OFTCPSocketTests.m		\
	       OFUDPSocketTests.m		\
	       ${USE_SRCS_APPLETALK}		\
	       ${USE_SRCS_IPX}			\
	       ${USE_SRCS_UNIX_SOCKETS}
SRCS_APPLETALK = OFDDPSocketTests.m
SRCS_IPX = OFIPXSocketTests.m		\
	   OFSPXSocketTests.m		\
︙

Modified tests/TestsAppDelegate.h from [d6a2aa82e5] to [982bac2ab3].

︙
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140

123
124
125
126
127
128
129




130
131
132
133
134
135
136








-
-
-
-








- (void)streamTests;
@end

@interface TestsAppDelegate (OFStringTests)
- (void)stringTests;
@end

@interface TestsAppDelegate (OFTCPSocketTests)
- (void)TCPSocketTests;
@end

@interface TestsAppDelegate (OFUDPSocketTests)
- (void)UDPSocketTests;
@end

@interface TestsAppDelegate (OFUNIXDatagramSocketTests)
- (void)UNIXDatagramSocketTests;
@end
︙

Modified tests/TestsAppDelegate.m from [ee0c79f148] to [9816b74668].

︙
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393

379
380
381
382
383
384
385

386
387
388
389
390
391
392








-








	[self dictionaryTests];
	[self listTests];
	[self valueTests];
	[self streamTests];
	[self memoryStreamTests];
	[self notificationCenterTests];
#ifdef OF_HAVE_SOCKETS
	[self TCPSocketTests];
	[self UDPSocketTests];
# ifdef OF_HAVE_UNIX_SOCKETS
	[self UNIXDatagramSocketTests];
	[self UNIXStreamSocketTests];
# endif
# ifdef OF_HAVE_IPX
	[self IPXSocketTests];
︙