Merge pull request ashfurrow#10 from AshFurrow/issue-7

[WIP] Write Tests

Author: ashfurrow

C-41.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		251BA020AC1444D3B79A4119 /* libPods-C-41.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CE0365B9C0E4C89BD732392 /* libPods-C-41.a */; };
+		5E5E69E7187638F0008E9EAE /* CoreDataHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E5E69E6187638F0008E9EAE /* CoreDataHelpers.m */; };
 		5E93AD3C1866695600795C9E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E93AD3B1866695600795C9E /* Foundation.framework */; };
 		5E93AD3E1866695600795C9E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E93AD3D1866695600795C9E /* CoreGraphics.framework */; };
 		5E93AD401866695600795C9E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E93AD3F1866695600795C9E /* UIKit.framework */; };
@@ -63,6 +64,8 @@
 
 /* Begin PBXFileReference section */
 		3CE0365B9C0E4C89BD732392 /* libPods-C-41.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-C-41.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5E5E69E6187638F0008E9EAE /* CoreDataHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreDataHelpers.m; sourceTree = "<group>"; };
+		5E5E69E818763906008E9EAE /* CoreDataHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreDataHelpers.h; sourceTree = "<group>"; };
 		5E93AD381866695600795C9E /* C-41.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "C-41.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5E93AD3B1866695600795C9E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		5E93AD3D1866695600795C9E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -152,6 +155,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		5E5E69E91876390B008E9EAE /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				5E5E69E818763906008E9EAE /* CoreDataHelpers.h */,
+				5E5E69E6187638F0008E9EAE /* CoreDataHelpers.m */,
+			);
+			name = Helpers;
+			sourceTree = "<group>";
+		};
 		5E93AD2F1866695600795C9E = {
 			isa = PBXGroup;
 			children = (
@@ -195,12 +207,12 @@
 			children = (
 				5E93AD4C1866695600795C9E /* ASHAppDelegate.h */,
 				5E93AD4D1866695600795C9E /* ASHAppDelegate.m */,
+				C02D7C5F186814F9002E9D79 /* ASHCoreDataStack.h */,
+				C02D7C60186814F9002E9D79 /* ASHCoreDataStack.m */,
 				5E93AD5B1866695600795C9E /* Images.xcassets */,
 				5E93AD801866718700795C9E /* View Controllers */,
 				5E93AD7F1866717D00795C9E /* Models */,
 				5E93AD441866695600795C9E /* Supporting Files */,
-				C02D7C5F186814F9002E9D79 /* ASHCoreDataStack.h */,
-				C02D7C60186814F9002E9D79 /* ASHCoreDataStack.m */,
 			);
 			path = "C-41";
 			sourceTree = "<group>";
@@ -219,6 +231,7 @@
 		5E93AD691866695600795C9E /* C-41Tests */ = {
 			isa = PBXGroup;
 			children = (
+				5E5E69E91876390B008E9EAE /* Helpers */,
 				5E93AD851866782600795C9E /* ASHMasterViewModelTests.m */,
 				5EC0E85B186FBE3200289440 /* ASHDetailViewModelTests.m */,
 				5EC0E85D186FBE3E00289440 /* ASHTimerViewModelTests.m */,
@@ -518,6 +531,7 @@
 				5E93AD861866782600795C9E /* ASHMasterViewModelTests.m in Sources */,
 				5EC0E860186FBE4E00289440 /* ASHEditStepViewModelTests.m in Sources */,
 				5EC0E85E186FBE3E00289440 /* ASHTimerViewModelTests.m in Sources */,
+				5E5E69E7187638F0008E9EAE /* CoreDataHelpers.m in Sources */,
 				5E93AD8818672BE200795C9E /* ASHRecipe.m in Sources */,
 				5EC0E85C186FBE3200289440 /* ASHDetailViewModelTests.m in Sources */,
 				5E93AD8718672BA200795C9E /* ASHMasterViewModel.m in Sources */,

C-41/ASHAppDelegate.m

@@ -17,5 +17,6 @@
 @property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
 
 - (void)saveContext;
+- (void)ensureInitialLoad;
 
 @end

C-41/ASHCoreDataStack.h

@@ -11,22 +11,47 @@
 #define EXP_SHORTHAND
 #import <Expecta/Expecta.h>
 #import <OCMock/OCMock.h>
+#import "CoreDataHelpers.h"
 
 #import "ASHDetailViewModel.h"
+#import "ASHTimerViewModel.h"
+
 
 SpecBegin(ASHDetailViewModel)
 
 describe(@"ASHDetailViewModel", ^{
-    pending (@"should have the correctly mapped properties", ^{
+    static ASHRecipe *recipe;
+    
+    beforeEach(^{
+        NSManagedObjectContext *context = [[ASHCoreDataStack defaultStack] managedObjectContext];
+        [context reset];
 
+        recipe = setupRecipe(context);
     });
 
-    pending (@"should return the correct title/subtitle for steps", ^{
+    it (@"should have the correctly mapped properties", ^{
+        ASHDetailViewModel *viewModel = [[ASHDetailViewModel alloc] initWithModel:recipe];
 
+        expect(viewModel.recipeName).to.equal(recipe.name);
+        expect(viewModel.recipeDescription).to.equal(recipe.blurb);
+        expect(viewModel.recipeFilmTypeString).to.equal(@"Colour Negative");
     });
 
-    pending (@"should return a correctly instantiated timer view model", ^{
+    it (@"should return the correct title/subtitle for steps", ^{
+        ASHDetailViewModel *viewModel = [[ASHDetailViewModel alloc] initWithModel:recipe];
+        
+        NSString *durationString = @"1:00";
+        
+        expect([viewModel titleForStepAtIndex:0]).to.equal([recipe.steps[0] name]);
+        expect([viewModel subtitleForStepAtIndex:0]).to.equal(durationString);
+    });
+    
+    it (@"should return a correctly instantiated timer view model", ^{
+        ASHDetailViewModel *viewModel = [[ASHDetailViewModel alloc] initWithModel:recipe];
+        
+        ASHTimerViewModel *timerViewModel = [viewModel timerViewModel];
 
+        expect(timerViewModel.model).to.equal(viewModel.model);
     });
 });
 

C-41/ASHCoreDataStack.m

@@ -13,12 +13,63 @@
 #import <OCMock/OCMock.h>
 
 #import "ASHTimerViewModel.h"
+#import "CoreDataHelpers.h"
+
+@interface ASHTimerViewModel ()
+
+-(void)clockTick:(NSTimer *)timer;
+
+@property (nonatomic, assign) NSInteger currentStepIndex;
+@property (nonatomic, assign) CFTimeInterval currentStepTimeRemaining;
+
+@property (nonatomic, weak) NSTimer *timer;
+
+@end
 
 SpecBegin(ASHTimerViewModel)
 
 describe(@"ASHTimerViewModel", ^{
-    pending(@"should map recipeName correctly", ^{
+    static ASHRecipe *recipe;
+    
+    beforeEach(^{
+        NSManagedObjectContext *context = [[ASHCoreDataStack defaultStack] managedObjectContext];
+        [context reset];
+        
+        recipe = setupRecipe(context);
+    });
+
+    it(@"should map recipeName correctly", ^{
+        ASHTimerViewModel *viewModel = [[ASHTimerViewModel alloc] initWithModel:recipe];
+        
+        expect(viewModel.currentStepIndex).to.equal(0);
+        expect(viewModel.currentStepTimeRemaining).to.equal([(ASHStep *)[[recipe steps] objectAtIndex:0] duration]);
+        expect(viewModel.recipeName).to.equal(recipe.name);
+        expect(viewModel.currentStepString).to.equal(@"Prewash – 39℃");
+        expect(viewModel.nextStepString).to.equal(@"Developer");
+        expect(viewModel.timeRemainingString).to.equal(@"1:00");
+        expect(viewModel.complete).to.beFalsy();
+        expect(viewModel.running).to.beFalsy();
+    });
+    
+    it(@"perform math correctly", ^{
+        ASHTimerViewModel *viewModel = [[ASHTimerViewModel alloc] initWithModel:recipe];
+        
+        expect(viewModel.timer).to.beNil();
+        [viewModel resume];
+        expect(viewModel.timer).notTo.beNil();
+        [viewModel pause];
+        expect(viewModel.timer).to.beNil();
+        
+        viewModel.currentStepTimeRemaining = 60;
+        viewModel.currentStepIndex = 0;
+        [viewModel clockTick:viewModel.timer];
+        
+        expect(viewModel.currentStepTimeRemaining).to.equal(60 - 1);
 
+        viewModel.currentStepTimeRemaining = 0;
+        [viewModel clockTick:viewModel.timer];
+        expect(viewModel.currentStepIndex).to.equal(1);
+        expect(viewModel.currentStepTimeRemaining).to.equal([(ASHStep *)(recipe.steps[1]) duration]);
     });
 });
 

C-41Tests/ASHDetailViewModelTests.m

@@ -0,0 +1,13 @@
+//
+//  CoreDataHelpers.h
+//  C-41
+//
+//  Created by Ash Furrow on 1/2/2014.
+//  Copyright (c) 2014 Ash Furrow. All rights reserved.
+//
+
+#import "ASHCoreDataStack.h"
+#import "ASHRecipe.h"
+#import "ASHStep.h"
+
+ASHRecipe *setupRecipe (NSManagedObjectContext *context);

C-41Tests/ASHTimerViewModelTests.m

@@ -0,0 +1,61 @@
+//
+//  CoreDataHelpers.c
+//  C-41
+//
+//  Created by Ash Furrow on 1/2/2014.
+//  Copyright (c) 2014 Ash Furrow. All rights reserved.
+//
+
+#import "CoreDataHelpers.h"
+
+ASHRecipe *setupRecipe (NSManagedObjectContext *context) {
+    
+    ASHRecipe *c41Recipe = [NSEntityDescription insertNewObjectForEntityForName:@"ASHRecipe" inManagedObjectContext:context];
+    c41Recipe.name = NSLocalizedString(@"C-41 Colour Process", @"Initial setup title");
+    c41Recipe.blurb = NSLocalizedString(@"Standard C-41 colour negative film recipe.", @"Initial setup subtitle");
+    c41Recipe.filmType = ASHRecipeFilmTypeColourNegative;
+    
+    ASHStep *prewashStep = [NSEntityDescription insertNewObjectForEntityForName:@"ASHStep" inManagedObjectContext:context];
+    prewashStep.recipe = c41Recipe;
+    prewashStep.name = NSLocalizedString(@"Prewash", @"C-41 Prewash step name");
+    prewashStep.blurb = NSLocalizedString(@"Water", @"C-41 prewas step description");
+    prewashStep.temperatureC = 39;
+    prewashStep.duration = 60;
+    
+    ASHStep *developerStep = [NSEntityDescription insertNewObjectForEntityForName:@"ASHStep" inManagedObjectContext:context];
+    developerStep.recipe = c41Recipe;
+    developerStep.name = NSLocalizedString(@"Developer", @"C-41 developer step name");
+    developerStep.temperatureC = 39;
+    developerStep.agitationDuration = 10;
+    developerStep.agitationFrequency = 60;
+    developerStep.duration = 210;
+    
+    ASHStep *blixStep = [NSEntityDescription insertNewObjectForEntityForName:@"ASHStep" inManagedObjectContext:context];
+    blixStep.recipe = c41Recipe;
+    blixStep.name = NSLocalizedString(@"Blix", @"C-41 blix step name");
+    blixStep.temperatureC = 39;
+    blixStep.agitationDuration = 10;
+    blixStep.agitationFrequency = 60;
+    blixStep.duration = 390;
+    
+    ASHStep *washStep = [NSEntityDescription insertNewObjectForEntityForName:@"ASHStep" inManagedObjectContext:context];
+    washStep.recipe = c41Recipe;
+    washStep.name = NSLocalizedString(@"Wash", @"C-41 wash step name");
+    washStep.blurb = NSLocalizedString(@"Water", @"C-41 was step description");
+    washStep.temperatureC = 23;
+    washStep.agitationDuration = 0;
+    washStep.agitationFrequency = 0;
+    washStep.duration = 180;
+    
+    ASHStep *stabilizerStep = [NSEntityDescription insertNewObjectForEntityForName:@"ASHStep" inManagedObjectContext:context];
+    stabilizerStep.recipe = c41Recipe;
+    stabilizerStep.name = NSLocalizedString(@"Stabilizer", @"C-41 stabilizer step name");
+    stabilizerStep.temperatureC = 23;
+    stabilizerStep.agitationDuration = 15;
+    stabilizerStep.agitationFrequency = 60;
+    stabilizerStep.duration = 60;
+    
+    c41Recipe.steps = [NSOrderedSet orderedSetWithArray:@[prewashStep, developerStep, blixStep, washStep, stabilizerStep]];
+    
+    return c41Recipe;
+}

C-41Tests/CoreDataHelpers.h

@@ -1,16 +1,12 @@
 # Uncomment this line to define a global platform for your project
 # platform :ios, "6.0"
 
-def import_pods
-  pod 'libextobjc', '0.3'
-  pod 'ReactiveCocoa', '2.1.8'
-  pod 'ReactiveViewModel', '0.1.1'
-end
 
 target "C-41" do
 
-  import_pods
-
+  pod 'ReactiveCocoa', '2.1.8'
+  pod 'libextobjc', '0.3'
+  pod 'ReactiveViewModel', '0.1.1'
   pod 'UIColor-Utilities', '1.0.1'
 
   inhibit_all_warnings!
@@ -19,8 +15,6 @@ end
 
 target "C-41Tests" do
 
-  import_pods
-
   pod 'Specta',      '~> 0.2.1'
   pod 'Expecta',     '~> 0.2.3'
   pod 'OCMock',      '~> 2.2.1'