Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nearing feature complete for driver auth

Browse Source
This commit is contained in:
James Kolpack
2013-01-09 21:33:57 -05:00
parent 0b4c7914b3
commit bc019923d2
49 changed files with 609 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web.Tests/Utility/AlgorithmsTests.cs
+13 -13
View File
@@ -7,15 +7,15 @@ namespace Web.Tests.Utility
[TestFixture]
public class AlgorithmsTests
{
private const int _existingNumber = 2;
private const int ExistingNumber = 2;
private readonly DateTime _existingDate = DateTime.Today.AddDays(-1);
[Test]
public void IsChronological_True_If_Greater_And_After()
{
var date = _existingDate.AddDays(1);
const int number = _existingNumber + 1;
var result = Algorithms.IsChronological(_existingDate, _existingNumber, date, number);
const int number = ExistingNumber + 1;
var result = Algorithms.IsChronological(_existingDate, ExistingNumber, date, number);
Assert.That(result);
}
@@ -24,8 +24,8 @@ namespace Web.Tests.Utility
public void IsChronological_False_If_LessThan_And_After()
{
var date = _existingDate.AddDays(1);
const int number = _existingNumber - 1;
var result = Algorithms.IsChronological(_existingDate, _existingNumber, date, number);
const int number = ExistingNumber - 1;
var result = Algorithms.IsChronological(_existingDate, ExistingNumber, date, number);
Assert.That(result, Is.False);
}
@@ -34,8 +34,8 @@ namespace Web.Tests.Utility
public void IsChronological_True_If_LessThan_And_Before()
{
var date = _existingDate.AddDays(-1);
const int number = _existingNumber - 1;
var result = Algorithms.IsChronological(_existingDate, _existingNumber, date, number);
const int number = ExistingNumber - 1;
var result = Algorithms.IsChronological(_existingDate, ExistingNumber, date, number);
Assert.That(result, Is.True);
}
@@ -44,8 +44,8 @@ namespace Web.Tests.Utility
public void IsChronological_False_If_GreaterThan_And_Before()
{
var date = _existingDate.AddDays(-1);
const int number = _existingNumber + 1;
var result = Algorithms.IsChronological(_existingDate, _existingNumber, date, number);
const int number = ExistingNumber + 1;
var result = Algorithms.IsChronological(_existingDate, ExistingNumber, date, number);
Assert.That(result, Is.False);
}
@@ -54,8 +54,8 @@ namespace Web.Tests.Utility
public void IsChronological_True_If_Same_And_Before()
{
var date = _existingDate.AddDays(-1);
const int number = _existingNumber;
var result = Algorithms.IsChronological(_existingDate, _existingNumber, date, number);
const int number = ExistingNumber;
var result = Algorithms.IsChronological(_existingDate, ExistingNumber, date, number);
Assert.That(result, Is.True);
}
@@ -65,8 +65,8 @@ namespace Web.Tests.Utility
public void IsChronological_True_If_Greater_And_SameTime()
{
var date = _existingDate;
const int number = _existingNumber + 1;
var result = Algorithms.IsChronological(_existingDate, _existingNumber, date, number);
const int number = ExistingNumber + 1;
var result = Algorithms.IsChronological(_existingDate, ExistingNumber, date, number);
Assert.That(result, Is.True);
}
Web.Tests/Utility/CustomExtensionsTests.cs
-3
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using MileageTraker.Web.Utility;
using NUnit.Framework;
Web.Tests/ViewModels/CreateLogViewModelTests.cs → Web.Tests/ViewModels/CreateLog/CreateLogViewModelTests.cs
View File
Web.Tests/ViewModels/Log/LogViewModelTests.cs
+137
View File
@@ -0,0 +1,137 @@
using System;
using MileageTraker.Web.Models;
using MileageTraker.Web.ViewModels.Log;
using NUnit.Framework;
namespace Web.Tests.ViewModels.Log
{
[TestFixture]
public class LogViewModelTests
{
[Test]
public void GetLog_Converts_To_Log()
{
var logId = 1;
var cityName = "My Town";
var date = DateTime.Today;
var endOdometer = "1234";
var driver = "name";
var ethraId = "4567";
string gasPurchased = "2.546";
var mileageLogType = new MileageLogTypeWrapper { Enum = MileageLogType.Commuting };
var viewModel =
new LogViewModel
{
LogId = logId,
CityName = cityName,
Date = date,
EndOdometer = endOdometer,
UserFullName = driver,
VehicleId = ethraId,
GasPurchased = gasPurchased,
LogType = mileageLogType
};
var log = viewModel.GetLog();
Assert.That(log.LogId, Is.EqualTo(logId));
Assert.That(log.CityName, Is.EqualTo(cityName));
Assert.That(log.Date, Is.EqualTo(date));
Assert.That(log.EndOdometer.ToString(), Is.EqualTo(endOdometer));
Assert.That(log.VehicleId, Is.EqualTo(ethraId));
Assert.That(log.GasPurchased.ToString(), Is.EqualTo(gasPurchased));
Assert.That(log.LogType.Enum, Is.EqualTo(mileageLogType.Enum));
}
[Test]
public void UpdateLog_Converts_To_Log()
{
var viewModelLogId = 1;
var viewModelCityName = "My Town";
var viewModelDate = DateTime.Today;
var viewModelEndOdometer = "1234";
var viewModelDriver = "name";
var viewModelVehicleId = "4567";
string viewModelGasPurchased = "2.546";
var viewModelLogType = new MileageLogTypeWrapper { Enum = MileageLogType.Commuting };
var viewModel =
new LogViewModel
{
LogId = viewModelLogId,
CityName = viewModelCityName,
Date = viewModelDate,
EndOdometer = viewModelEndOdometer,
UserFullName = viewModelDriver,
VehicleId = viewModelVehicleId,
GasPurchased = viewModelGasPurchased,
LogType = viewModelLogType
};
var logUser = new User{Username = "log"};
var logSource = "here";
var log =
new MileageTraker.Web.Models.Log
{
LogId = 2,
CityName = "Different Town",
Date = DateTime.MinValue,
EndOdometer = 1,
VehicleId = "1",
GasPurchased = 1.0,
LogType = new MileageLogTypeWrapper { Enum = MileageLogType.GasPurchase },
User = logUser,
Source = logSource
};
viewModel.UpdateLog(log);
Assert.That(log.LogId, Is.EqualTo(viewModelLogId));
Assert.That(log.CityName, Is.EqualTo(viewModelCityName));
Assert.That(log.Date, Is.EqualTo(viewModelDate));
Assert.That(log.EndOdometer.ToString(), Is.EqualTo(viewModelEndOdometer));
Assert.That(log.VehicleId, Is.EqualTo(viewModelVehicleId));
Assert.That(log.GasPurchased.ToString(), Is.EqualTo(viewModelGasPurchased));
Assert.That(log.LogType.Enum, Is.EqualTo(viewModelLogType.Enum));
Assert.That(log.User, Is.EqualTo(logUser));
Assert.That(log.Source, Is.EqualTo(logSource));
}
[Test]
public void Constructor_FromLog()
{
var logId = 1;
var cityName = "My Town";
var date = DateTime.Today;
var endOdometer = 1234;
var driver = "name";
var ethraId = "4567";
var gasPurchased = 2.546;
var mileageLogType = new MileageLogTypeWrapper { Enum = MileageLogType.Commuting };
var log =
new MileageTraker.Web.Models.Log
{
LogId = logId,
CityName = cityName,
Date = date,
EndOdometer = endOdometer,
VehicleId = ethraId,
GasPurchased = gasPurchased,
LogType = mileageLogType
};
var viewModel = new LogViewModel(log);
Assert.That(viewModel.LogId, Is.EqualTo(logId));
Assert.That(viewModel.CityName, Is.EqualTo(cityName));
Assert.That(viewModel.Date, Is.EqualTo(date));
Assert.That(viewModel.EndOdometer, Is.EqualTo(endOdometer.ToString()));
Assert.That(viewModel.VehicleId, Is.EqualTo(ethraId));
Assert.That(viewModel.GasPurchased, Is.EqualTo(gasPurchased.ToString()));
Assert.That(viewModel.LogType.Enum, Is.EqualTo(mileageLogType.Enum));
}
}
}
Web.Tests/ViewModels/CreateUserViewModelTests.cs → Web.Tests/ViewModels/User/CreateUserViewModelTests.cs
View File
Web.Tests/ViewModels/EditUserViewModelTests.cs → Web.Tests/ViewModels/User/EditUserViewModelTests.cs
-1
View File
@@ -34,7 +34,6 @@ namespace Web.Tests.ViewModels
var email = vm.Email = "bob@dobalina.com";
var username = vm.Username = "bobdobalina";
var fullName = vm.FullName = "Bob Dobalina";
var roles = vm.Roles = new [] {"Administrator", "Developer"};
var userId = vm.UserId = Guid.NewGuid();
vm.UserId = Guid.NewGuid();
Web.Tests/Web.Tests.csproj
+4 -3
View File
@@ -89,9 +89,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utility\AlgorithmsTests.cs" />
<Compile Include="Utility\CustomExtensionsTests.cs" />
<Compile Include="ViewModels\CreateLogViewModelTests.cs" />
<Compile Include="ViewModels\CreateUserViewModelTests.cs" />
<Compile Include="ViewModels\EditUserViewModelTests.cs" />
<Compile Include="ViewModels\CreateLog\CreateLogViewModelTests.cs" />
<Compile Include="ViewModels\Log\LogViewModelTests.cs" />
<Compile Include="ViewModels\User\CreateUserViewModelTests.cs" />
<Compile Include="ViewModels\User\EditUserViewModelTests.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="DAL\Vehicles.xls">