gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-07 15:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix NSXMLParser (strict) tests on Windows

Browse source
This commit is contained in:
Hugo Melder 2022-08-10 17:53:59 +02:00
parent ffe938c49e
commit 1ea722a07a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Tests/base/NSXMLParser/parse.m
View file

@ -2,6 +2,7 @@
#import <Foundation/NSAutoreleasePool.h> #import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSFileManager.h> #import <Foundation/NSFileManager.h>
#import <Foundation/NSStream.h> #import <Foundation/NSStream.h>
#import <Foundation/NSURL.h>
#import <Foundation/NSUserDefaults.h> #import <Foundation/NSUserDefaults.h>
#import <Foundation/NSXMLParser.h> #import <Foundation/NSXMLParser.h>
#include <string.h> #include <string.h>
@ -256,6 +257,12 @@ testParser(NSXMLParser *parser, NSString *expect)
} }
else else
{ {
#if defined(_WIN32)
/* Replace CRLF from result files with LF
*/
expect = [expect stringByReplacingOccurrencesOfString: @"\r\n" withString: @"\n"];
#endif
if (NO == [[handler description] isEqual: expect]) if (NO == [[handler description] isEqual: expect])
{ {
NSLog(@"######## Expected:\n%@\n######## Parsed:\n%@\n########\n", NSLog(@"######## Expected:\n%@\n######## Parsed:\n%@\n########\n",
@ -370,6 +377,8 @@ int main()
{ {
NSString *exp; NSString *exp;
NSString *mgrPath;
NSString *absolutePath;
NSData *dat; NSData *dat;
exp = @"parserDidStartDocument:\n\ exp = @"parserDidStartDocument:\n\
@ -378,10 +387,13 @@ parser:didStartElement:namespaceURI:qualifiedName:attributes: file file {\n}\n\
parserDidEndDocument:\n\ parserDidEndDocument:\n\
"; ";
mgrPath = [[mgr currentDirectoryPath] stringByAppendingPathComponent: @"GNUmakefile"];
absolutePath = [[NSURL fileURLWithPath: mgrPath] absoluteString];
str = [NSString stringWithFormat: str = [NSString stringWithFormat:
@"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" @"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
@"<!DOCTYPE file [<!ENTITY foo SYSTEM \"file://%@/GNUmakefile\">]>\n" @"<!DOCTYPE file [<!ENTITY foo SYSTEM \"%@\">]>\n"
@"<file>&amp;&foo;&#65;</file>", [mgr currentDirectoryPath]]; @"<file>&amp;&foo;&#65;</file>", absolutePath];
dat = [str dataUsingEncoding: NSUTF8StringEncoding]; dat = [str dataUsingEncoding: NSUTF8StringEncoding];
PASS((testParseData(dat, exp, YES)), "external entity (strict)") PASS((testParseData(dat, exp, YES)), "external entity (strict)")