Author: rfm
Date: Mon Jun 15 11:26:52 2015
New Revision: 38638
URL: http://svn.gna.org/viewcvs/gnustep?rev=38638&view=rev
Log:
fixup to ignore newlines
Modified:
libs/base/trunk/Tests/base/NSData/base64.m
Modified: libs/base/trunk/Tests/base/NSData/base64.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSData/base64.m?rev=38638&r1=38637&r2=38638&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSData/base64.m (original)
+++ libs/base/trunk/Tests/base/NSData/base64.m Mon Jun 15 11:26:52 2015
@@ -77,42 +77,46 @@
[data release];
str1 = @"In principio creavit Deus caelum et terram.\nTerra autem erat
inanis et vacua, et tenebrae super faciem abyssi, et spiritus Dei ferebatur
super aquas.\nDixitque Deus: \"Fiat lux\". Et facta est lux.";
- data = [str1 dataUsingEncoding:NSASCIIStringEncoding];
+ data = [str1 dataUsingEncoding: NSASCIIStringEncoding];
strEnc = [data base64EncodedStringWithOptions:0];
- data = [[NSData alloc] initWithBase64EncodedString:strEnc options: 0];
- str2 = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+ data = [[NSData alloc] initWithBase64EncodedString: strEnc options: 0];
+ str2 = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
PASS_EQUAL(str1, str2, "Encode / Decode no lines")
[str2 release];
str1 = @"In principio creavit Deus caelum et terram.\nTerra autem erat
inanis et vacua, et tenebrae super faciem abyssi, et spiritus Dei ferebatur
super aquas.\nDixitque Deus: \"Fiat lux\". Et facta est lux.";
- data = [str1 dataUsingEncoding:NSASCIIStringEncoding];
- strEnc = [data
base64EncodedStringWithOptions:(NSDataBase64Encoding64CharacterLineLength |
NSDataBase64EncodingEndLineWithLineFeed)];
- data = [[NSData alloc] initWithBase64EncodedString:strEnc options: 0];
- str2 = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+ data = [str1 dataUsingEncoding: NSASCIIStringEncoding];
+ strEnc = [data base64EncodedStringWithOptions:
(NSDataBase64Encoding64CharacterLineLength |
NSDataBase64EncodingEndLineWithLineFeed)];
+ data = [[NSData alloc] initWithBase64EncodedString: strEnc
+ options: NSDataBase64DecodingIgnoreUnknownCharacters];
+ str2 = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
PASS_EQUAL(str1, str2, "Encode / Decode 64 - LF")
[str2 release];
str1 = @"In principio creavit Deus caelum et terram.\nTerra autem erat
inanis et vacua, et tenebrae super faciem abyssi, et spiritus Dei ferebatur
super aquas.\nDixitque Deus: \"Fiat lux\". Et facta est lux.";
- data = [str1 dataUsingEncoding:NSASCIIStringEncoding];
- strEnc = [data
base64EncodedStringWithOptions:(NSDataBase64Encoding76CharacterLineLength |
NSDataBase64EncodingEndLineWithLineFeed)];
- data = [[NSData alloc] initWithBase64EncodedString:strEnc options: 0];
- str2 = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+ data = [str1 dataUsingEncoding: NSASCIIStringEncoding];
+ strEnc = [data base64EncodedStringWithOptions:
(NSDataBase64Encoding76CharacterLineLength |
NSDataBase64EncodingEndLineWithLineFeed)];
+ data = [[NSData alloc] initWithBase64EncodedString: strEnc
+ options: NSDataBase64DecodingIgnoreUnknownCharacters];
+ str2 = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
PASS_EQUAL(str1, str2, "Encode / Decode 76 - LF")
[str2 release];
str1 = @"In principio creavit Deus caelum et terram.\nTerra autem erat
inanis et vacua, et tenebrae super faciem abyssi, et spiritus Dei ferebatur
super aquas.\nDixitque Deus: \"Fiat lux\". Et facta est lux.";
- data = [str1 dataUsingEncoding:NSASCIIStringEncoding];
- strEnc = [data
base64EncodedStringWithOptions:(NSDataBase64Encoding64CharacterLineLength |
NSDataBase64EncodingEndLineWithCarriageReturn)];
- data = [[NSData alloc] initWithBase64EncodedString:strEnc options:0];
- str2 = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+ data = [str1 dataUsingEncoding: NSASCIIStringEncoding];
+ strEnc = [data base64EncodedStringWithOptions:
(NSDataBase64Encoding64CharacterLineLength |
NSDataBase64EncodingEndLineWithCarriageReturn)];
+ data = [[NSData alloc] initWithBase64EncodedString: strEnc
+ options: NSDataBase64DecodingIgnoreUnknownCharacters];
+ str2 = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
PASS_EQUAL(str1, str2, "Encode / Decode 64 - CR")
[str2 release];
str1 = @"In principio creavit Deus caelum et terram.\nTerra autem erat
inanis et vacua, et tenebrae super faciem abyssi, et spiritus Dei ferebatur
super aquas.\nDixitque Deus: \"Fiat lux\". Et facta est lux.";
- data = [str1 dataUsingEncoding:NSASCIIStringEncoding];
- strEnc = [data
base64EncodedStringWithOptions:NSDataBase64Encoding64CharacterLineLength];
- data = [[NSData alloc] initWithBase64EncodedString:strEnc options:0];
- str2 = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
+ data = [str1 dataUsingEncoding: NSASCIIStringEncoding];
+ strEnc = [data base64EncodedStringWithOptions:
NSDataBase64Encoding64CharacterLineLength];
+ data = [[NSData alloc] initWithBase64EncodedString: strEnc
+ options: NSDataBase64DecodingIgnoreUnknownCharacters];
+ str2 = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
PASS_EQUAL(str1, str2, "Encode / Decode 64 - implicit CR LF")
[str2 release];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
