Overview
Context
Changes
Modified src/OFEmbeddedURIHandler.m
from [d66851cc9f]
to [b9239d2145].
︙ | | | ︙ | |
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
}
@implementation OFEmbeddedURIHandler
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
{
const char *path;
if (![URI.scheme isEqual: @"objfw-embedded"] || URI.host.length > 0 ||
URI.port != nil || URI.user != nil || URI.password != nil ||
URI.query != nil || URI.fragment != nil)
@throw [OFInvalidArgumentException exception];
if (![mode isEqual: @"r"])
@throw [OFOpenItemFailedException exceptionWithURI: URI
mode: mode
|
|
|
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
}
@implementation OFEmbeddedURIHandler
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
{
const char *path;
if (![URI.scheme isEqual: @"of-embedded"] || URI.host.length > 0 ||
URI.port != nil || URI.user != nil || URI.password != nil ||
URI.query != nil || URI.fragment != nil)
@throw [OFInvalidArgumentException exception];
if (![mode isEqual: @"r"])
@throw [OFOpenItemFailedException exceptionWithURI: URI
mode: mode
|
︙ | | | ︙ | |
Modified src/OFURIHandler.m
from [896717b5db]
to [b12ed659e0].
︙ | | | ︙ | |
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
handlers = [[OFMutableDictionary alloc] init];
#ifdef OF_HAVE_THREADS
mutex = [[OFMutex alloc] init];
atexit(releaseMutex);
#endif
[self registerClass: [OFEmbeddedURIHandler class]
forScheme: @"objfw-embedded"];
#ifdef OF_HAVE_FILES
[self registerClass: [OFFileURIHandler class] forScheme: @"file"];
#endif
#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
[self registerClass: [OFHTTPURIHandler class] forScheme: @"http"];
[self registerClass: [OFHTTPURIHandler class] forScheme: @"https"];
#endif
|
|
|
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
handlers = [[OFMutableDictionary alloc] init];
#ifdef OF_HAVE_THREADS
mutex = [[OFMutex alloc] init];
atexit(releaseMutex);
#endif
[self registerClass: [OFEmbeddedURIHandler class]
forScheme: @"of-embedded"];
#ifdef OF_HAVE_FILES
[self registerClass: [OFFileURIHandler class] forScheme: @"file"];
#endif
#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
[self registerClass: [OFHTTPURIHandler class] forScheme: @"http"];
[self registerClass: [OFHTTPURIHandler class] forScheme: @"https"];
#endif
|
︙ | | | ︙ | |
Modified tests/Makefile
from [4d4716309a]
to [2482a8a4a6].
︙ | | | ︙ | |
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
IOS_USER ?= mobile
IOS_TMP ?= /tmp/objfw-test
include ../buildsys.mk
serialization_xml.m: serialization.xml
${SHELL} ../utils/objfw-embed serialization.xml /serialization.xml $@
testfile_bin.m: testfile.bin
${SHELL} ../utils/objfw-embed testfile.bin /testfile.bin $@
testfile_ini.m: testfile.ini
${SHELL} ../utils/objfw-embed testfile.ini /testfile.ini $@
.PHONY: run run-on-ios run-on-android
run:
rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
rm -f objfw${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
|
|
|
|
|
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
IOS_USER ?= mobile
IOS_TMP ?= /tmp/objfw-test
include ../buildsys.mk
serialization_xml.m: serialization.xml
${SHELL} ../utils/objfw-embed serialization.xml serialization.xml $@
testfile_bin.m: testfile.bin
${SHELL} ../utils/objfw-embed testfile.bin testfile.bin $@
testfile_ini.m: testfile.ini
${SHELL} ../utils/objfw-embed testfile.ini testfile.ini $@
.PHONY: run run-on-ios run-on-android
run:
rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
rm -f objfw${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
|
︙ | | | ︙ | |
Modified tests/OFHMACTests.m
from [b37a3e3b24]
to [e2caa794c8].
︙ | | | ︙ | |
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
"\x61\xB3\xF9\x1A\xE3\x09\x43\xA6\x5B\x85\xB1\x50\x5B\xCB\x1A\x2E"
"\xB7\xE8\x87\xC1\x73\x19\x63\xF6\xA2\x91\x8D\x7E\x2E\xCC\xEC\x99";
@implementation TestsAppDelegate (OFHMACTests)
- (void)HMACTests
{
void *pool = objc_autoreleasePoolPush();
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFHMAC *HMACMD5, *HMACSHA1, *HMACRMD160;
OFHMAC *HMACSHA256, *HMACSHA384, *HMACSHA512;
TEST(@"+[HMACWithHashClass:] with MD5",
(HMACMD5 = [OFHMAC HMACWithHashClass: [OFMD5Hash class]
allowsSwappableMemory: true]))
|
|
|
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
"\x61\xB3\xF9\x1A\xE3\x09\x43\xA6\x5B\x85\xB1\x50\x5B\xCB\x1A\x2E"
"\xB7\xE8\x87\xC1\x73\x19\x63\xF6\xA2\x91\x8D\x7E\x2E\xCC\xEC\x99";
@implementation TestsAppDelegate (OFHMACTests)
- (void)HMACTests
{
void *pool = objc_autoreleasePoolPush();
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFHMAC *HMACMD5, *HMACSHA1, *HMACRMD160;
OFHMAC *HMACSHA256, *HMACSHA384, *HMACSHA512;
TEST(@"+[HMACWithHashClass:] with MD5",
(HMACMD5 = [OFHMAC HMACWithHashClass: [OFMD5Hash class]
allowsSwappableMemory: true]))
|
︙ | | | ︙ | |
Modified tests/OFINIFileTests.m
from [91b2a5e4f6]
to [69c1fa4176].
︙ | | | ︙ | |
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
OFArray *array;
#if defined(OF_HAVE_FILES) && !defined(OF_NINTENDO_DS)
OFURI *writeURI;
#endif
module = @"OFINIFile";
URI = [OFURI URIWithString: @"objfw-embedded:///testfile.ini"];
TEST(@"+[fileWithURI:encoding:]",
(file = [OFINIFile fileWithURI: URI
encoding: OFStringEncodingCodepage437]))
tests = [file categoryForName: @"tests"];
foobar = [file categoryForName: @"foobar"];
types = [file categoryForName: @"types"];
|
|
|
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
OFArray *array;
#if defined(OF_HAVE_FILES) && !defined(OF_NINTENDO_DS)
OFURI *writeURI;
#endif
module = @"OFINIFile";
URI = [OFURI URIWithString: @"of-embedded:testfile.ini"];
TEST(@"+[fileWithURI:encoding:]",
(file = [OFINIFile fileWithURI: URI
encoding: OFStringEncodingCodepage437]))
tests = [file categoryForName: @"tests"];
foobar = [file categoryForName: @"foobar"];
types = [file categoryForName: @"types"];
|
︙ | | | ︙ | |
Modified tests/OFMD5HashTests.m
from [704091a6f6]
to [aeb9ce5779].
︙ | | | ︙ | |
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
"\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38";
@implementation TestsAppDelegate (OFMD5HashTests)
- (void)MD5HashTests
{
void *pool = objc_autoreleasePoolPush();
OFMD5Hash *MD5, *MD5Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(MD5 = [OFMD5Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
|
|
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
"\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38";
@implementation TestsAppDelegate (OFMD5HashTests)
- (void)MD5HashTests
{
void *pool = objc_autoreleasePoolPush();
OFMD5Hash *MD5, *MD5Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(MD5 = [OFMD5Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
︙ | | | ︙ | |
Modified tests/OFRIPEMD160HashTests.m
from [2822ed07d6]
to [7421f32a5c].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\xE6\x08\x8B";
@implementation TestsAppDelegate (OFRIPEMD160HashTests)
- (void)RIPEMD160HashTests
{
void *pool = objc_autoreleasePoolPush();
OFRIPEMD160Hash *RIPEMD160, *RIPEMD160Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(RIPEMD160 = [OFRIPEMD160Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\xE6\x08\x8B";
@implementation TestsAppDelegate (OFRIPEMD160HashTests)
- (void)RIPEMD160HashTests
{
void *pool = objc_autoreleasePoolPush();
OFRIPEMD160Hash *RIPEMD160, *RIPEMD160Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(RIPEMD160 = [OFRIPEMD160Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
︙ | | | ︙ | |
Modified tests/OFSHA1HashTests.m
from [cda2790802]
to [e2a91910a3].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\x94\xE7\x17";
@implementation TestsAppDelegate (SHA1HashTests)
- (void)SHA1HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA1Hash *SHA1, *SHA1Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA1 = [OFSHA1Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\x94\xE7\x17";
@implementation TestsAppDelegate (SHA1HashTests)
- (void)SHA1HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA1Hash *SHA1, *SHA1Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA1 = [OFSHA1Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
︙ | | | ︙ | |
Modified tests/OFSHA224HashTests.m
from [7bc4a06c89]
to [927be92210].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\x5F\x4F\x20\x02\x4D\x15\xED\x1C\x61\x1F\xF7";
@implementation TestsAppDelegate (SHA224HashTests)
- (void)SHA224HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA224Hash *SHA224, *SHA224Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA224 = [OFSHA224Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\x5F\x4F\x20\x02\x4D\x15\xED\x1C\x61\x1F\xF7";
@implementation TestsAppDelegate (SHA224HashTests)
- (void)SHA224HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA224Hash *SHA224, *SHA224Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA224 = [OFSHA224Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
︙ | | | ︙ | |
Modified tests/OFSHA256HashTests.m
from [f3bd53fc3c]
to [cdbd1a9d12].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\x67\x93\x8F\x0F\x44\x90\xB8\xF5\x35\x89\xF0\x5A\x23\x7F\x69";
@implementation TestsAppDelegate (SHA256HashTests)
- (void)SHA256HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA256Hash *SHA256, *SHA256Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA256 = [OFSHA256Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
"\x67\x93\x8F\x0F\x44\x90\xB8\xF5\x35\x89\xF0\x5A\x23\x7F\x69";
@implementation TestsAppDelegate (SHA256HashTests)
- (void)SHA256HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA256Hash *SHA256, *SHA256Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA256 = [OFSHA256Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
|
︙ | | | ︙ | |
Modified tests/OFSHA384HashTests.m
from [11ce13a89f]
to [41c4f16030].
︙ | | | ︙ | |
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
"\xE9\x1A\xB3\x51\x70\x8C\x1F\x3F\x56\x12\x44\x01\x91\x54";
@implementation TestsAppDelegate (SHA384HashTests)
- (void)SHA384HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA384Hash *SHA384, *SHA384Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA384 = [OFSHA384Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[128];
|
|
|
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
"\xE9\x1A\xB3\x51\x70\x8C\x1F\x3F\x56\x12\x44\x01\x91\x54";
@implementation TestsAppDelegate (SHA384HashTests)
- (void)SHA384HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA384Hash *SHA384, *SHA384Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA384 = [OFSHA384Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[128];
|
︙ | | | ︙ | |
Modified tests/OFSHA512HashTests.m
from [9c59f1aa87]
to [0cc8515cf1].
︙ | | | ︙ | |
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
"\xA1\x8A\x41\x64\x33\x69\x21\x8C\x2A\x44\x6D\xF2\xA0";
@implementation TestsAppDelegate (SHA512HashTests)
- (void)SHA512HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA512Hash *SHA512, *SHA512Copy;
OFURI *URI = [OFURI URIWithString: @"objfw-embedded:///testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA512 = [OFSHA512Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[128];
|
|
|
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
"\xA1\x8A\x41\x64\x33\x69\x21\x8C\x2A\x44\x6D\xF2\xA0";
@implementation TestsAppDelegate (SHA512HashTests)
- (void)SHA512HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA512Hash *SHA512, *SHA512Copy;
OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA512 = [OFSHA512Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[128];
|
︙ | | | ︙ | |
Modified tests/OFSerializationTests.m
from [ae574f4995]
to [5f49396f7c].
︙ | | | ︙ | |
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
UUID = [OFUUID
UUIDWithUUIDString: @"01234567-89AB-CDEF-FEDC-BA9876543210"];
[dict setObject: @"uuid" forKey: UUID];
TEST(@"-[stringBySerializing]",
(string = dict.stringBySerializing) && [string isEqual:
[OFString stringWithContentsOfURI: [OFURI URIWithString:
@"objfw-embedded:///serialization.xml"]]])
TEST(@"-[objectByDeserializing]",
[string.objectByDeserializing isEqual: dict])
objc_autoreleasePoolPop(pool);
}
@end
|
|
|
|
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
UUID = [OFUUID
UUIDWithUUIDString: @"01234567-89AB-CDEF-FEDC-BA9876543210"];
[dict setObject: @"uuid" forKey: UUID];
TEST(@"-[stringBySerializing]",
(string = dict.stringBySerializing) && [string isEqual:
[OFString stringWithContentsOfURI:
[OFURI URIWithString: @"of-embedded:serialization.xml"]]])
TEST(@"-[objectByDeserializing]",
[string.objectByDeserializing isEqual: dict])
objc_autoreleasePoolPop(pool);
}
@end
|