From 370b73d894d05075ffbddf15587325a301566046 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Sat, 10 May 2014 22:47:47 -0400
Subject: [PATCH] Fix some tests

---
 .../DAL/LogDocs/Logs_IncorrectHeaders.xls     | Bin 38912 -> 38912 bytes
 Web.Tests/DAL/LogImporterTests.cs             |   4 +--
 .../CreateLog/LogImportViewModelTests.cs      |  24 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Web.Tests/DAL/LogDocs/Logs_IncorrectHeaders.xls b/Web.Tests/DAL/LogDocs/Logs_IncorrectHeaders.xls
index 8d2f9a725ea46370fa1ddb24664a5ad4cc05258c..7318c2e1f1f0e672a97137b4a88685567c360622 100644
GIT binary patch
delta 557
zcmZqJz|^pTX+sJNpYL^<&)1~SGb;EiDIdz2T*T7GSU346OE%wzC+p=8<(y|^ke3BZ
zuol6E7MREYg*Ja;En<X=L6mJSVqeS5$T?YoTM-8-G5G*DCs<B`ON3zpBLf2i6NBhv
z2VMy-6NWuZNL)??*MP^FQ50yX$m9+lUMOo7m<7}~`2r6oSWIj(4<9#}CBbEfFj|2d
zWHj6+5Z4C5b>IaV-NLI2)yRdAGT@Pz{Dv1~wgjIdkhJ2HWfa{U!DqqF$Uk|bfViXp
z(6wLxD=;uj5fq%xJ)N6@Wxc`!1`!6q$p=Nn8HFZ)6jGS{Q<R@kcrvG$KBEXo573xE
zF>yvQD7z8J7M~0xCvOm&05sK6TpUP7if?E6dhqk9%_0((n!-_TKx-J-7=klWQ%ek6
z8Tc4-CMP%svwvmu1&YgV-sSj|k(+~oA*8Y(HL*A)ZS#ERD?Ds!ehduXf+lyz&e<#)
z*ulXlvw2?RG-f`KQ49>APzQm@PO;9cO(6^nDx14vSF<oOY&J{U&$%gQ0vj8{n&V2q
KIG$FNr3wJBaEy%r

delta 542
zcmZqJz|^pTX+sJNU*(!xDpiu_85JTcBd$wNE@Ek8ES~(6C7bWUF5P_%APLcm{SA_n
zi&%@`LKgzdfkK-<u@*7H#URQy7qPEpX5^Wyz^#abl$d;gn-eT2!6m{lfsuiMfr&vF
zs6mW}k->yv4-<+2Cqlr0$C(kNPGoWi4=<Fp3d$0je2#}3EGEHahis?>mkEOFz^e#W
zBR08$R~N`y1|}7_B__Y&<plB#cqAtC@qt)C*G&EZHc^5Pq{oU+mQi?f1fK;vqxj^F
z0^*Y=h;j-{5fq%xJ)N6@Wxc`!1`!5<$p=Nn83iYQ6jGS{Q<R@kXfmgmK2R@EIitwr
zKrwMfQ7F3+$QGLnBqwhWn*cP>QCu8IMv8A|nRE3>$z~A=OHE;aH()q0urUN@q^6b_
zwleTBBu-9n3}%1D=nE8=*}Ti~DdXl<&R2NYr2QBeUI$H{7CUFNLSP36BirVck<*y@
zSb)LGz`)4B0)$LVljF1GC+Ebfu$G4~Fi38m8oQc>k$JOY(tgg#1}xm0awf2`HLQ{Y
KMe4MoEL8x@HHx1A

diff --git a/Web.Tests/DAL/LogImporterTests.cs b/Web.Tests/DAL/LogImporterTests.cs
index 34bafd8..61a8f5e 100644
--- a/Web.Tests/DAL/LogImporterTests.cs
+++ b/Web.Tests/DAL/LogImporterTests.cs
@@ -17,14 +17,14 @@ namespace Web.Tests.DAL
 			Assert.That(logs.Count(), Is.GreaterThan(0));
 			var first = logs.First();
 			Assert.That(first.VehicleId, Is.EqualTo("3572"));
-			Assert.That(first.Date, Is.EqualTo("3/4/2013"));
+			Assert.That(first.Date, Is.EqualTo("2/5/2014"));
 		}
 
 		[Test]
 		[ExpectedException(typeof(LogImportException))]
 		public void Import_Incorrect_ColumnHeaders()
 		{
-			LogImporter.Import(LogFolder + "Logs_IncorrectHeaders.xls");
+			LogImporter.Import(LogFolder + "Logs_IncorrectHeaders.xls").ToList();
 		}
 
 		[Test]
diff --git a/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs b/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs
index d7e5382..3c9429d 100644
--- a/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs
+++ b/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs
@@ -24,7 +24,6 @@ namespace Web.Tests.ViewModels.CreateLog
 			};
 		}
 
-		// TODO: probably no longer need getlog
 		[Test]
 		public void GetLog_Correct()
 		{
@@ -32,7 +31,8 @@ namespace Web.Tests.ViewModels.CreateLog
 			var log = vm.GetLog();
 			Assert.That(log.CityName, Is.EqualTo(vm.CityName));
 			Assert.That(log.Date, Is.EqualTo(new DateTime(2010,10,20)));
-			Assert.That(log.Purpose.Purpose, Is.EqualTo("Training"));
+			// NOTE: Purpose is set elsewhere
+			//Assert.That(log.Purpose.Purpose, Is.EqualTo("Training"));
 		}
 
 		[Test]
@@ -44,15 +44,15 @@ namespace Web.Tests.ViewModels.CreateLog
 			vm.GetLog();
 		}
 
-		[Test]
-		[ExpectedException(typeof(AutoMapperMappingException))]
-		public void GetLog_Purpose_NotValid()
-		{
-			var vm = GetTestModel();
-			vm.Purpose = "uh huh nope";
-			var log = vm.GetLog();
-			Assert.That(log.CityName, Is.EqualTo(vm.CityName));
-			Assert.That(log.Date, Is.EqualTo(new DateTime(2010, 10, 20)));
-		}
+		//[Test]
+		//[ExpectedException(typeof(AutoMapperMappingException))]
+		//public void GetLog_Purpose_NotValid()
+		//{
+		//	var vm = GetTestModel();
+		//	vm.Purpose = "uh huh nope";
+		//	var log = vm.GetLog();
+		//	Assert.That(log.CityName, Is.EqualTo(vm.CityName));
+		//	Assert.That(log.Date, Is.EqualTo(new DateTime(2010, 10, 20)));
+		//}
 	}
 }