From c14b10a032e1a8f2cf2527989532c081f18b1a68 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sun, 13 Sep 2020 03:16:32 -0700
Subject: [PATCH] Adds strengthScore and strengthModifier to Monster. Adds
 tests for strengthScore and strengthModifier.

---
 iOS/MonsterCards/Models/Monster.m           |  8 ++++++-
 iOS/MonsterCardsTests/Models/MonsterTests.m | 23 ++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/iOS/MonsterCards/Models/Monster.m b/iOS/MonsterCards/Models/Monster.m
index 6f2eb1d..de885cd 100644
--- a/iOS/MonsterCards/Models/Monster.m
+++ b/iOS/MonsterCards/Models/Monster.m
@@ -70,12 +70,17 @@
     self = [self initWithContext:context];
     
     NSDictionary *jsonRoot = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil];
+    NSNumber *tempNumber;
     
     self.name = [jsonRoot objectForKey:@"name"] ?: @"";
     self.size = [jsonRoot objectForKey:@"size"] ?: @"";
     self.type = [jsonRoot objectForKey:@"type"] ?: @"";
     self.subtype = [jsonRoot objectForKey:@"tag"] ?: @"";
     self.alignment = [jsonRoot objectForKey:@"alignment"] ?: @"";
+    tempNumber = [jsonRoot objectForKey:@"strPoints"];
+    if (tempNumber != nil && [tempNumber isKindOfClass:[NSNumber class]]) {
+        self.strengthScore = tempNumber.intValue;
+    }
     
     return self;
 }
@@ -120,7 +125,7 @@
 }
 
 -(int)strengthModifier {
-    @throw [[NSException alloc] initWithName:@"unimplemented" reason:@"Method not implemented." userInfo:nil];
+    return [Monster abilityModifierForScore:self.strengthScore];
 }
 
 -(int)dexterityModifier {
@@ -340,6 +345,7 @@
     self.type = monster.type;
     self.subtype = monster.subtype;
     self.alignment = monster.alignment;
+    self.strengthScore = monster.strengthScore;
 }
 
 @end
diff --git a/iOS/MonsterCardsTests/Models/MonsterTests.m b/iOS/MonsterCardsTests/Models/MonsterTests.m
index 8324113..9e6de72 100644
--- a/iOS/MonsterCardsTests/Models/MonsterTests.m
+++ b/iOS/MonsterCardsTests/Models/MonsterTests.m
@@ -25,7 +25,7 @@
 - (void)setUp {
     _context = nil;
     _monster = [[Monster alloc] initWithContext:_context];
-    _jsonString = @"{\"name\":\"Acolyte\",\"size\":\"medium\",\"type\":\"humanoid\",\"tag\":\"any race\",\"alignment\":\"any alignment\"}";
+    _jsonString = @"{\"name\":\"Acolyte\",\"size\":\"medium\",\"type\":\"humanoid\",\"tag\":\"any race\",\"alignment\":\"any alignment\",\"strPoints\":8}";
     _jsonData = [_jsonString dataUsingEncoding:NSUTF8StringEncoding];
 }
 
@@ -40,6 +40,7 @@
     XCTAssertEqualObjects(@"", _monster.type);
     XCTAssertEqualObjects(@"", _monster.subtype);
     XCTAssertEqualObjects(@"", _monster.alignment);
+    XCTAssertEqual(0, _monster.strengthScore);
 }
 
 - (void)testInitWithJSONString {
@@ -51,6 +52,7 @@
     XCTAssertEqualObjects(@"humanoid", _monster.type);
     XCTAssertEqualObjects(@"any race", _monster.subtype);
     XCTAssertEqualObjects(@"any alignment", _monster.alignment);
+    XCTAssertEqual(8, _monster.strengthScore);
 }
 
 - (void)testInitWithEmptyJSONString {
@@ -62,6 +64,7 @@
     XCTAssertEqualObjects(@"", _monster.type);
     XCTAssertEqualObjects(@"", _monster.subtype);
     XCTAssertEqualObjects(@"", _monster.alignment);
+    XCTAssertEqual(0, _monster.strengthScore);
 }
 - (void)testInitWithJSONData {
     _monster = [[Monster alloc] initWithJSONData:_jsonData andContext:_context];
@@ -72,6 +75,7 @@
     XCTAssertEqualObjects(@"humanoid", _monster.type);
     XCTAssertEqualObjects(@"any race", _monster.subtype);
     XCTAssertEqualObjects(@"any alignment", _monster.alignment);
+    XCTAssertEqual(8, _monster.strengthScore);
 }
 
 - (void)testNameGetterAndSetter {
@@ -113,6 +117,7 @@
     XCTAssertEqualObjects(@"humanoid", _monster.type);
     XCTAssertEqualObjects(@"any race", _monster.subtype);
     XCTAssertEqualObjects(@"any alignment", _monster.alignment);
+    XCTAssertEqual(8, _monster.strengthScore);
 }
 
 - (void)testMetaWithNoFieldsSet {
@@ -231,4 +236,20 @@
     XCTAssertEqual(5, [Monster abilityModifierForScore:20]);
 }
 
+- (void)testStrengthScoreGetterAndSetter {
+    _monster.strengthScore = 11;
+    XCTAssertEqual(11, _monster.strengthScore);
+}
+
+- (void)testStrengthModifier {
+    _monster.strengthScore = 9;
+    XCTAssertEqual(-1, _monster.strengthModifier);
+    
+    _monster.strengthScore = 10;
+    XCTAssertEqual(0, _monster.strengthModifier);
+    
+    _monster.strengthScore = 12;
+    XCTAssertEqual(1, _monster.strengthModifier);
+}
+
 @end