@@ -15,54 +15,52 @@
#include "config.h"
#import "TestsAppDelegate.h"
-static OFString *module = @"OFSerialization";
+static OFString *const module = @"OFSerialization";
@implementation TestsAppDelegate (OFSerializationTests)
- (void)serializationTests
{
void *pool = objc_autoreleasePoolPush();
- OFMutableDictionary *d = [OFMutableDictionary dictionary];
- OFMutableArray *a = [OFMutableArray array];
- OFList *l = [OFList list];
- OFData *data;
- OFString *s;
-
- [a addObject: @"Qu\"xbar\ntest"];
- [a addObject: [OFNumber numberWithInt: 1234]];
- [a addObject: [OFNumber numberWithDouble: 1234.5678]];
- [a addObject: [OFMutableString stringWithString: @"asd"]];
- [a addObject: [OFDate dateWithTimeIntervalSince1970: 1234.5678]];
-
- [d setObject: @"Hello"
- forKey: a];
- [d setObject: @"B\"la"
- forKey: @"Blub"];
-
- [l appendObject: @"Hello"];
- [l appendObject: @"Wo\rld!\nHow are you?"];
- [l appendObject: [OFURL URLWithString: @"https://objfw.nil.im/"]];
- [l appendObject:
- [OFXMLElement elementWithXMLString: @""]];
- [l appendObject: [OFSet setWithObjects: @"foo", @"foo", @"bar", nil]];
- [l appendObject:
+ OFMutableDictionary *dict = [OFMutableDictionary dictionary];
+ OFMutableArray *array = [OFMutableArray array];
+ OFList *list = [OFList list];
+ OFData *data;
+ OFString *string;
+
+ [array addObject: @"Qu\"xbar\ntest"];
+ [array addObject: [OFNumber numberWithInt: 1234]];
+ [array addObject: [OFNumber numberWithDouble: 1234.5678]];
+ [array addObject: [OFMutableString stringWithString: @"asd"]];
+ [array addObject: [OFDate dateWithTimeIntervalSince1970: 1234.5678]];
+
+ [dict setObject: @"Hello" forKey: array];
+ [dict setObject: @"B\"la" forKey: @"Blub"];
+
+ [list appendObject: @"Hello"];
+ [list appendObject: @"Wo\rld!\nHow are you?"];
+ [list appendObject: [OFURL URLWithString: @"https://objfw.nil.im/"]];
+ [list appendObject:
+ [OFXMLElement elementWithXMLString: @""]];
+ [list appendObject:
+ [OFSet setWithObjects: @"foo", @"foo", @"bar", nil]];
+ [list appendObject:
[OFCountedSet setWithObjects: @"foo", @"foo", @"bar", nil]];
- [d setObject: @"list"
- forKey: l];
+ [dict setObject: @"list" forKey: list];
data = [OFData dataWithItems: "0123456789:;