From af471565570b7e97a984859eb2b048749fb80bd3 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sat, 5 Sep 2020 21:15:07 -0700
Subject: [PATCH] Fixes default initializer of SavingThrow model. Adds tests
 for SavingThrow model.

---
 iOS/MonsterCards.xcodeproj/project.pbxproj    |  4 ++
 iOS/MonsterCards/Models/SavingThrow.m         |  9 +++
 .../Models/SavingThrowTests.m                 | 55 +++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 iOS/MonsterCardsTests/Models/SavingThrowTests.m

diff --git a/iOS/MonsterCards.xcodeproj/project.pbxproj b/iOS/MonsterCards.xcodeproj/project.pbxproj
index 78662b3..4dcce0b 100644
--- a/iOS/MonsterCards.xcodeproj/project.pbxproj
+++ b/iOS/MonsterCards.xcodeproj/project.pbxproj
@@ -33,6 +33,7 @@
 		E2FD91E6250481F300D5E935 /* ActionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91E5250481F300D5E935 /* ActionTests.m */; };
 		E2FD91E82504832A00D5E935 /* DamageTypeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91E72504832A00D5E935 /* DamageTypeTests.m */; };
 		E2FD91EA250493C000D5E935 /* LanguageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91E9250493C000D5E935 /* LanguageTests.m */; };
+		E2FD91EC250496B000D5E935 /* SavingThrowTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91EB250496B000D5E935 /* SavingThrowTests.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -100,6 +101,7 @@
 		E2FD91E5250481F300D5E935 /* ActionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ActionTests.m; sourceTree = "<group>"; };
 		E2FD91E72504832A00D5E935 /* DamageTypeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DamageTypeTests.m; sourceTree = "<group>"; };
 		E2FD91E9250493C000D5E935 /* LanguageTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LanguageTests.m; sourceTree = "<group>"; };
+		E2FD91EB250496B000D5E935 /* SavingThrowTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SavingThrowTests.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -240,6 +242,7 @@
 				E2FD91E5250481F300D5E935 /* ActionTests.m */,
 				E2FD91E72504832A00D5E935 /* DamageTypeTests.m */,
 				E2FD91E9250493C000D5E935 /* LanguageTests.m */,
+				E2FD91EB250496B000D5E935 /* SavingThrowTests.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -400,6 +403,7 @@
 			files = (
 				E2FD91EA250493C000D5E935 /* LanguageTests.m in Sources */,
 				E2FD91E82504832A00D5E935 /* DamageTypeTests.m in Sources */,
+				E2FD91EC250496B000D5E935 /* SavingThrowTests.m in Sources */,
 				E2FD91E6250481F300D5E935 /* ActionTests.m in Sources */,
 				E2FD91E425047C4400D5E935 /* AbilityTests.m in Sources */,
 				E2F7249625005E8A007D87ED /* MonsterCardsTests.m in Sources */,
diff --git a/iOS/MonsterCards/Models/SavingThrow.m b/iOS/MonsterCards/Models/SavingThrow.m
index ef7f635..6d09601 100644
--- a/iOS/MonsterCards/Models/SavingThrow.m
+++ b/iOS/MonsterCards/Models/SavingThrow.m
@@ -10,6 +10,15 @@
 
 @implementation SavingThrow
 
+-(id)init {
+    self = [super init];
+    
+    self.name = @"";
+    self.order = -1;
+    
+    return self;
+}
+
 -(id)initWithName: (NSString*)name andOrder: (int)order {
     self = [super init];
     
diff --git a/iOS/MonsterCardsTests/Models/SavingThrowTests.m b/iOS/MonsterCardsTests/Models/SavingThrowTests.m
new file mode 100644
index 0000000..31e793f
--- /dev/null
+++ b/iOS/MonsterCardsTests/Models/SavingThrowTests.m
@@ -0,0 +1,55 @@
+//
+//  SavingThrowTests.m
+//  MonsterCardsTests
+//
+//  Created by Tom Hicks on 9/5/20.
+//  Copyright © 2020 Tom Hicks. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "SavingThrow.h"
+
+@interface SavingThrowTests : XCTestCase
+
+@end
+
+@implementation SavingThrowTests {
+    SavingThrow *_savingThrow;
+    NSString *_name;
+    int _order;
+}
+
+- (void)setUp {
+    _savingThrow = [[SavingThrow alloc] init];
+    _name = @"str";
+    _order = 9;
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
+- (void)testDefaultInitializer {
+    XCTAssertNotNil(_savingThrow);
+    XCTAssertEqualObjects(@"", _savingThrow.name);
+    XCTAssertEqual(-1, _savingThrow.order);
+}
+
+- (void)testInitWithNameAndOrder {
+    _savingThrow = [[SavingThrow alloc] initWithName:_name andOrder:_order];
+    XCTAssertNotNil(_savingThrow);
+    XCTAssertEqualObjects(_name, _savingThrow.name);
+    XCTAssertEqual(_order, _savingThrow.order);
+}
+
+- (void)testNameGetterAndSetter {
+    _savingThrow.name = _name;
+    XCTAssertEqualObjects(_name, _savingThrow.name);
+}
+
+- (void)testOrderGetterAndSetter {
+    _savingThrow.order = _order;
+    XCTAssertEqual(_order, _savingThrow.order);
+}
+
+@end