wrote objc/swift unit tests for the bug that was fixed in version 2.0

aryaxt · aryaxt · commit 4cb15f5d57ee · 2015-06-14T15:17:10.000-07:00
diff --git a/OCMapper.xcodeproj/project.pbxproj b/OCMapper.xcodeproj/project.pbxproj
@@ -67,6 +67,10 @@
 		92514E941B2CC9870098D34D /* Purchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92514E8F1B2CC9870098D34D /* Purchase.swift */; };
 		92514E951B2CC9870098D34D /* Purchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92514E8F1B2CC9870098D34D /* Purchase.swift */; };
 		92514E981B2CC99B0098D34D /* ObjectMapperSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92514E961B2CC99B0098D34D /* ObjectMapperSwiftTests.swift */; };
+		92A297E01B2E32D000B6B2F0 /* ActivationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92A297DF1B2E32D000B6B2F0 /* ActivationStatus.swift */; };
+		92A297E11B2E32D000B6B2F0 /* ActivationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92A297DF1B2E32D000B6B2F0 /* ActivationStatus.swift */; };
+		92A297E41B2E33B700B6B2F0 /* EmailConfirmation.m in Sources */ = {isa = PBXBuildFile; fileRef = 92A297E31B2E33B700B6B2F0 /* EmailConfirmation.m */; };
+		92A297E51B2E33B700B6B2F0 /* EmailConfirmation.m in Sources */ = {isa = PBXBuildFile; fileRef = 92A297E31B2E33B700B6B2F0 /* EmailConfirmation.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -184,6 +188,9 @@
 		92514E961B2CC99B0098D34D /* ObjectMapperSwiftTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectMapperSwiftTests.swift; sourceTree = "<group>"; };
 		92514E9C1B2CC9CA0098D34D /* OCMapper-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMapper-Bridging-Header.h"; sourceTree = "<group>"; };
 		92514E9D1B2CC9CA0098D34D /* OCMapperTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMapperTests-Bridging-Header.h"; sourceTree = "<group>"; };
+		92A297DF1B2E32D000B6B2F0 /* ActivationStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivationStatus.swift; sourceTree = "<group>"; };
+		92A297E21B2E33B700B6B2F0 /* EmailConfirmation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmailConfirmation.h; sourceTree = "<group>"; };
+		92A297E31B2E33B700B6B2F0 /* EmailConfirmation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmailConfirmation.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -410,6 +417,8 @@
 				15E2B971171BEAEB00526C77 /* User.m */,
 				15EA38001866102D005CCEA0 /* SpecialUser.h */,
 				15EA38011866102D005CCEA0 /* SpecialUser.m */,
+				92A297E21B2E33B700B6B2F0 /* EmailConfirmation.h */,
+				92A297E31B2E33B700B6B2F0 /* EmailConfirmation.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -457,6 +466,7 @@
 				92514E8D1B2CC9870098D34D /* Customer.swift */,
 				92514E8E1B2CC9870098D34D /* Location.swift */,
 				92514E8F1B2CC9870098D34D /* Purchase.swift */,
+				92A297DF1B2E32D000B6B2F0 /* ActivationStatus.swift */,
 			);
 			path = Swift;
 			sourceTree = "<group>";
@@ -585,6 +595,7 @@
 				157B309C171E5D32005AAB02 /* CDPost.m in Sources */,
 				157B313E17234A97005AAB02 /* NSDictionary+ObjectMapper.m in Sources */,
 				157B313F17234A97005AAB02 /* NSObject+ObjectMapper.m in Sources */,
+				92A297E41B2E33B700B6B2F0 /* EmailConfirmation.m in Sources */,
 				92514E921B2CC9870098D34D /* Location.swift in Sources */,
 				157B314417234ACB005AAB02 /* ObjectInstanceProvider.m in Sources */,
 				157B314717234ADF005AAB02 /* ManagedObjectInstanceProvider.m in Sources */,
@@ -601,6 +612,7 @@
 				1502B38E17CD985300C095DE /* AFNetworkActivityIndicatorManager.m in Sources */,
 				1502B38F17CD985300C095DE /* AFPropertyListRequestOperation.m in Sources */,
 				1502B39017CD985300C095DE /* AFURLConnectionOperation.m in Sources */,
+				92A297E01B2E32D000B6B2F0 /* ActivationStatus.swift in Sources */,
 				1502B39117CD985300C095DE /* AFXMLRequestOperation.m in Sources */,
 				1502B39217CD985300C095DE /* UIImageView+AFNetworking.m in Sources */,
 				1502B39B17CDA07100C095DE /* OCMapperConfig.m in Sources */,
@@ -618,10 +630,12 @@
 			files = (
 				92514E911B2CC9870098D34D /* Customer.swift in Sources */,
 				92514E951B2CC9870098D34D /* Purchase.swift in Sources */,
+				92A297E11B2E32D000B6B2F0 /* ActivationStatus.swift in Sources */,
 				15E2B992171BEAF400526C77 /* ObjectMapperTests.m in Sources */,
 				92514E931B2CC9870098D34D /* Location.swift in Sources */,
 				157B3096171E58C0005AAB02 /* ManagedObjectMapperTest.m in Sources */,
 				92514E981B2CC99B0098D34D /* ObjectMapperSwiftTests.swift in Sources */,
+				92A297E51B2E33B700B6B2F0 /* EmailConfirmation.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/OCMapper/Models/EmailConfirmation.h b/OCMapper/Models/EmailConfirmation.h
@@ -0,0 +1,15 @@
+//
+//  EmailConfirmation.h
+//  OCMapper
+//
+//  Created by Aryan on 6/14/15.
+//  Copyright (c) 2015 Aryan Ghassemi. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface EmailConfirmation : NSObject
+
+@property (nonatomic, strong) NSString *value;
+
+@end
diff --git a/OCMapper/Models/EmailConfirmation.m b/OCMapper/Models/EmailConfirmation.m
@@ -0,0 +1,13 @@
+//
+//  EmailConfirmation.m
+//  OCMapper
+//
+//  Created by Aryan on 6/14/15.
+//  Copyright (c) 2015 Aryan Ghassemi. All rights reserved.
+//
+
+#import "EmailConfirmation.h"
+
+@implementation EmailConfirmation
+
+@end
diff --git a/OCMapper/Models/Swift/ActivationStatus.swift b/OCMapper/Models/Swift/ActivationStatus.swift
@@ -0,0 +1,15 @@
+//
+//  ActivationStatus.swift
+//  OCMapper
+//
+//  Created by Aryan on 6/14/15.
+//  Copyright (c) 2015 Aryan Ghassemi. All rights reserved.
+//
+
+import Foundation
+
+public class ActivationStatus: NSObject {
+	
+	public var value: String?
+	
+}
diff --git a/OCMapper/Models/Swift/Customer.swift b/OCMapper/Models/Swift/Customer.swift
@@ -16,6 +16,7 @@ public class Customer: NSObject {
     public var location: Location?
     public var billing: Location?
     public var home: Location?
+	public var status: ActivationStatus?
     public var purchases: [Purchase]?
     
 }
diff --git a/OCMapper/Models/User.h b/OCMapper/Models/User.h
@@ -27,6 +27,7 @@
 
 #import <Foundation/Foundation.h>
 #import "Address.h"
+#import "EmailConfirmation.h"
 
 @interface User : NSObject
 
@@ -37,6 +38,7 @@
 @property (nonatomic, strong) NSNumber *age;
 @property (nonatomic, strong) Address *address;
 @property (nonatomic, strong) Address *work;
+@property (nonatomic, strong) EmailConfirmation *econfirmed;
 @property (nonatomic, strong) NSMutableArray *comments;
 @property (nonatomic, strong) NSMutableArray *randomKeywords;
 
diff --git a/OCMapperTests/ObjectMapperSwiftTests.swift b/OCMapperTests/ObjectMapperSwiftTests.swift
@@ -86,8 +86,9 @@ class ObjectMapperSwiftTests : XCTestCase {
             "fName":            "Aryan",
             "ageee":            28,
             "dob":              date,
-            "address":          ["name": "SF"],
-            "billing-address":  ["name": "SD"],
+            "address":          ["name":  "SF"],
+            "billing-address":  ["name":  "SD"],
+			"status":			["value": "banned"],
             "orders":           [
                 ["summary": "bla 1", "price": 123.4],
                 ["summary": "bla 2", "price": 55],
@@ -106,7 +107,10 @@ class ObjectMapperSwiftTests : XCTestCase {
         
         XCTAssertNotNil(customer.billing, "FAIL")
         XCTAssertTrue(customer.billing!.name == "SD", "FAIL")
-        
+		
+		XCTAssertNotNil(customer.status, "FAIL")
+		XCTAssertTrue(customer.status!.value == "banned", "FAIL")
+		
         let purchases = customer.valueForKey("purchases") as! NSArray
         
         // Can't access calues directly in unit test target, swift throws exception because it doesn't know which target the models belong to, main target or unit test target. This won't be an issue outside of test environment
diff --git a/OCMapperTests/ObjectMapperTests.m b/OCMapperTests/ObjectMapperTests.m
@@ -521,6 +521,12 @@ - (void)testShouldConvertValuesInDictionaryFromNSNumberToNSStringIfNeeded {
 	XCTAssertTrue([user.firstName isEqualToString:@"123"]);
 }
 
+- (void)testShouldautomaticallyMapClassesWithTwoKeywords {
+	NSDictionary *userDictionary = @{@"econfirmed" : @{@"value" : @"not-confirmed"}};
+	User *user = [self.mapper objectFromSource:userDictionary toInstanceOfClass:[User class]];
+	XCTAssertTrue([user.econfirmed.value isEqualToString:@"not-confirmed"]);
+}
+
 - (void)testObjectInstanceProviderShouldReturnTrueForNSObjectSubclasses
 {
 	ObjectInstanceProvider *instanceProvider = [[ObjectInstanceProvider alloc] init];

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public class Customer: NSObject {`
`16`	`16`	`public var location: Location?`
`17`	`17`	`public var billing: Location?`
`18`	`18`	`public var home: Location?`
	`19`	`+ public var status: ActivationStatus?`
`19`	`20`	`public var purchases: [Purchase]?`
`20`	`21`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,12 @@ - (void)testShouldConvertValuesInDictionaryFromNSNumberToNSStringIfNeeded {`
`521`	`521`	`XCTAssertTrue([user.firstName isEqualToString:@"123"]);`
`522`	`522`	`}`
`523`	`523`
	`524`	`+- (void)testShouldautomaticallyMapClassesWithTwoKeywords {`
	`525`	`+ NSDictionary *userDictionary = @{@"econfirmed" : @{@"value" : @"not-confirmed"}};`
	`526`	`+ User *user = [self.mapper objectFromSource:userDictionary toInstanceOfClass:[User class]];`
	`527`	`+ XCTAssertTrue([user.econfirmed.value isEqualToString:@"not-confirmed"]);`
	`528`	`+}`
	`529`	`+`
`524`	`530`	`- (void)testObjectInstanceProviderShouldReturnTrueForNSObjectSubclasses`
`525`	`531`	`{`
`526`	`532`	`ObjectInstanceProvider *instanceProvider = [[ObjectInstanceProvider alloc] init];`