From 70ddeeb5f1b9ba9ff3219560b90f1591e6fe4a15 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sat, 5 Sep 2020 20:01:53 -0700 Subject: [PATCH] Fixes default initializer of DamageType model. Adds tests for DamageType model. --- iOS/MonsterCards.xcodeproj/project.pbxproj | 4 ++ iOS/MonsterCards/Models/DamageType.m | 10 +++ .../Models/DamageTypeTests.m | 61 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 iOS/MonsterCardsTests/Models/DamageTypeTests.m diff --git a/iOS/MonsterCards.xcodeproj/project.pbxproj b/iOS/MonsterCards.xcodeproj/project.pbxproj index af0cbc4..2d07625 100644 --- a/iOS/MonsterCards.xcodeproj/project.pbxproj +++ b/iOS/MonsterCards.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ E2F724A125005E8A007D87ED /* MonsterCardsUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2F724A025005E8A007D87ED /* MonsterCardsUITests.m */; }; E2FD91E425047C4400D5E935 /* AbilityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91E325047C4400D5E935 /* AbilityTests.m */; }; E2FD91E6250481F300D5E935 /* ActionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91E5250481F300D5E935 /* ActionTests.m */; }; + E2FD91E82504832A00D5E935 /* DamageTypeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2FD91E72504832A00D5E935 /* DamageTypeTests.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -96,6 +97,7 @@ E2F724A225005E8A007D87ED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E2FD91E325047C4400D5E935 /* AbilityTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AbilityTests.m; sourceTree = ""; }; E2FD91E5250481F300D5E935 /* ActionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ActionTests.m; sourceTree = ""; }; + E2FD91E72504832A00D5E935 /* DamageTypeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DamageTypeTests.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -234,6 +236,7 @@ children = ( E2FD91E325047C4400D5E935 /* AbilityTests.m */, E2FD91E5250481F300D5E935 /* ActionTests.m */, + E2FD91E72504832A00D5E935 /* DamageTypeTests.m */, ); path = Models; sourceTree = ""; @@ -392,6 +395,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E2FD91E82504832A00D5E935 /* DamageTypeTests.m in Sources */, E2FD91E6250481F300D5E935 /* ActionTests.m in Sources */, E2FD91E425047C4400D5E935 /* AbilityTests.m in Sources */, E2F7249625005E8A007D87ED /* MonsterCardsTests.m in Sources */, diff --git a/iOS/MonsterCards/Models/DamageType.m b/iOS/MonsterCards/Models/DamageType.m index 309be76..a148f4c 100644 --- a/iOS/MonsterCards/Models/DamageType.m +++ b/iOS/MonsterCards/Models/DamageType.m @@ -10,6 +10,16 @@ @implementation DamageType +-(id)init { + self = [super init]; + + self.name = @""; + self.note = @""; + self.type = @""; + + return self; +} + -(id)initWithName: (NSString*)name note: (NSString*)note andType: (NSString*)type{ self = [super init]; diff --git a/iOS/MonsterCardsTests/Models/DamageTypeTests.m b/iOS/MonsterCardsTests/Models/DamageTypeTests.m new file mode 100644 index 0000000..25b3f48 --- /dev/null +++ b/iOS/MonsterCardsTests/Models/DamageTypeTests.m @@ -0,0 +1,61 @@ +// +// DamageTypeTests.m +// MonsterCardsTests +// +// Created by Tom Hicks on 9/5/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import +#import "DamageType.h" + +@interface DamageTypeTests : XCTestCase { + DamageType *_damageType; + NSString *_name; + NSString *_note; + NSString *_type; +} + +@end + +@implementation DamageTypeTests + +- (void)setUp { + _damageType = [[DamageType alloc] init]; + _name = @"My Damage Type"; + _note = @"A note"; + _type = @"A type"; +} + +- (void)tearDown {} + +- (void)testDefaultInitializer { + XCTAssertEqualObjects(@"", _damageType.name); + XCTAssertEqualObjects(@"", _damageType.note); + XCTAssertEqualObjects(@"", _damageType.type); +} + +- (void)testInitWithNameNoteAndType { + _damageType = [[DamageType alloc] initWithName:_name note:_note andType:_type]; + + XCTAssertEqualObjects(_name, _damageType.name); + XCTAssertEqualObjects(_note, _damageType.note); + XCTAssertEqualObjects(_type, _damageType.type); +} + +- (void)testNameGetterAndSetter { + _damageType.name = _name; + XCTAssertEqualObjects(_name, _damageType.name); +} + +- (void)testNoteGetterAndSetter { + _damageType.note = _note; + XCTAssertEqualObjects(_note, _damageType.note); +} + +- (void)testTypeGetterAndSetter { + _damageType.type = _type; + XCTAssertEqualObjects(_type, _damageType.type); +} + +@end