Skip to content

Commit f7ebdc1

Browse files
Updated all package versions.
1 parent e63e698 commit f7ebdc1

File tree

65 files changed

+28396
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+28396
-256
lines changed

.vs/config/applicationhost.config

Lines changed: 1027 additions & 0 deletions
Large diffs are not rendered by default.

BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,33 @@
4747
<WarningLevel>4</WarningLevel>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="Autofac">
51-
<HintPath>..\packages\Autofac.3.1.5\lib\net40\Autofac.dll</HintPath>
50+
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
52+
<Private>True</Private>
5253
</Reference>
53-
<Reference Include="FluentMigrator">
54-
<HintPath>..\packages\FluentMigrator.1.0.6.0\lib\40\FluentMigrator.dll</HintPath>
54+
<Reference Include="FluentMigrator, Version=1.6.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
55+
<HintPath>..\packages\FluentMigrator.1.6.1\lib\40\FluentMigrator.dll</HintPath>
56+
<Private>True</Private>
5557
</Reference>
56-
<Reference Include="FluentNHibernate">
57-
<HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>
58+
<Reference Include="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
60+
<Private>True</Private>
5861
</Reference>
59-
<Reference Include="Iesi.Collections">
60-
<HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
62+
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
64+
<Private>True</Private>
6165
</Reference>
62-
<Reference Include="Moq">
63-
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
66+
<Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
68+
<Private>True</Private>
6469
</Reference>
65-
<Reference Include="NHibernate">
66-
<HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
70+
<Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
71+
<HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
72+
<Private>True</Private>
6773
</Reference>
68-
<Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
69-
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
74+
<Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
75+
<HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
76+
<Private>True</Private>
7177
</Reference>
7278
<Reference Include="System" />
7379
<Reference Include="System.Configuration" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
22

33
<connectionStrings>
4-
<add name="BetterModulesTests" connectionString="NO_CONNECTION_STRING" />
4+
<add name="BetterModulesTests" connectionString="Server=(local);Database=BetterModulesTests;Integrated Security=SSPI;" />
55
</connectionStrings>

BetterModules.Core.Database.Tests/DataAccess/DataContext/DefaultUnitOfWorkTests.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ public void Should_Create_Transaction_Successfuly()
4343
}
4444

4545
[Test]
46-
[ExpectedException(typeof(DataException))]
4746
public void Should_Throw_Exception_Creating_Multiple_Transactions()
4847
{
49-
using (var unitOfWork = new DefaultUnitOfWork(Container.Resolve<ISessionFactoryProvider>()))
48+
Assert.Throws<DataException>(() =>
5049
{
51-
unitOfWork.BeginTransaction();
52-
unitOfWork.BeginTransaction();
53-
}
50+
using (var unitOfWork = new DefaultUnitOfWork(Container.Resolve<ISessionFactoryProvider>()))
51+
{
52+
unitOfWork.BeginTransaction();
53+
unitOfWork.BeginTransaction();
54+
}
55+
});
5456
}
5557

5658
[Test]

BetterModules.Core.Database.Tests/DataAccess/DataContext/Interceptors/StaleInterceptorIntegrationTests.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void Should_Increase_Version_If_Dirty()
4444
}
4545

4646
[Test]
47-
[ExpectedException(typeof (ConcurrentDataException))]
4847
public void Should_Throw_Concurrent_Data_Exception_Saving()
4948
{
5049
var model = DatabaseTestDataProvider.ProvideRandomTestItemModel();
@@ -57,12 +56,14 @@ public void Should_Throw_Concurrent_Data_Exception_Saving()
5756
model.Name = TestDataProvider.ProvideRandomString();
5857
model.Version = 3;
5958

60-
Repository.Save(model);
61-
UnitOfWork.Commit();
59+
Assert.Throws<ConcurrentDataException>(() =>
60+
{
61+
Repository.Save(model);
62+
UnitOfWork.Commit();
63+
});
6264
}
6365

6466
[Test]
65-
[ExpectedException(typeof (ConcurrentDataException))]
6667
public void Should_Throw_Concurrent_Data_Exception_Deleting()
6768
{
6869
var model = DatabaseTestDataProvider.ProvideRandomTestItemModel();
@@ -75,8 +76,11 @@ public void Should_Throw_Concurrent_Data_Exception_Deleting()
7576
model.Name = TestDataProvider.ProvideRandomString();
7677
model.Version = 3;
7778

78-
Repository.Delete(model);
79-
UnitOfWork.Commit();
79+
Assert.Throws<ConcurrentDataException>(() =>
80+
{
81+
Repository.Delete(model);
82+
UnitOfWork.Commit();
83+
});
8084
}
8185
}
8286
}

BetterModules.Core.Database.Tests/DataAccess/DataContext/Migrations/DefaultMigrationTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ namespace BetterModules.Core.Database.Tests.DataAccess.DataContext.Migrations
88
public class DefaultMigrationTests
99
{
1010
[Test]
11-
[ExpectedException(typeof(CoreException))]
1211
public void Should_Throw_Core_Exception_Migrating_Down()
1312
{
14-
var migration = new TestMigration("Test");
15-
migration.Down();
13+
Assert.Throws<CoreException>(() =>
14+
{
15+
var migration = new TestMigration("Test");
16+
migration.Down();
17+
});
1618
}
1719

1820
private class TestMigration : DefaultMigration

BetterModules.Core.Database.Tests/DataAccess/DataContext/QueryOverExtensionsIntegrationTests.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,18 @@ public void Should_Return_First_Element_Successfully()
4949
Assert.IsNotNull(item);
5050
Assert.AreEqual(item.Name, model1.Name);
5151
}
52-
52+
5353
[Test]
54-
[ExpectedException(typeof(EntityNotFoundException))]
5554
public void Should_Throw_EntityNotFound_Exception_Retrieving_First()
5655
{
57-
var guid = Guid.NewGuid();
58-
Repository
59-
.AsQueryOver<TestItemModel>()
60-
.Where(t => t.Id == guid)
61-
.First<TestItemModel, TestItemModel>();
56+
Assert.Throws<EntityNotFoundException>(() =>
57+
{
58+
var guid = Guid.NewGuid();
59+
Repository
60+
.AsQueryOver<TestItemModel>()
61+
.Where(t => t.Id == guid)
62+
.First<TestItemModel, TestItemModel>();
63+
});
6264
}
6365

6466
[Test]

BetterModules.Core.Database.Tests/DataAccess/DefaultRepositoryIntegrationTests.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,12 @@ public void Should_Retrieve_First_Entity_By_Id()
9595
}
9696

9797
[Test]
98-
[ExpectedException(typeof(EntityNotFoundException))]
9998
public void Should_Throw_Exception_Retrieving_First_Entity_By_Id()
10099
{
101-
Repository.First<TestItemModel>(Guid.NewGuid());
100+
Assert.Throws<EntityNotFoundException>(() =>
101+
{
102+
Repository.First<TestItemModel>(Guid.NewGuid());
103+
});
102104
}
103105

104106
[Test]
@@ -111,11 +113,13 @@ public void Should_Retrieve_First_Entity_By_Filter()
111113
}
112114

113115
[Test]
114-
[ExpectedException(typeof(EntityNotFoundException))]
115116
public void Should_Throw_Exception_Retrieving_First_Entity_By_Filter()
116117
{
117-
var guid = Guid.NewGuid();
118-
Repository.First<TestItemModel>(m => m.Id == guid);
118+
Assert.Throws<EntityNotFoundException>(() =>
119+
{
120+
var guid = Guid.NewGuid();
121+
Repository.First<TestItemModel>(m => m.Id == guid);
122+
});
119123
}
120124

121125
[Test]
Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<section name="modulesSettings" type="BetterModules.Core.Configuration.DefaultConfigurationSection, BetterModules.Core" requirePermission="false" />
@@ -7,16 +7,4 @@
77
<connectionStrings configSource="Config\connectionStrings.config" />
88
<modulesSettings configSource="Config\modules.config" />
99

10-
<runtime>
11-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
12-
<dependentAssembly>
13-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
14-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
18-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
19-
</dependentAssembly>
20-
</assemblyBinding>
21-
</runtime>
22-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
10+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.1.5" targetFramework="net45" />
4-
<package id="FluentMigrator" version="1.0.6.0" targetFramework="net45" />
5-
<package id="FluentMigrator.Tools" version="1.0.6.0" targetFramework="net45" />
6-
<package id="FluentNHibernate" version="1.3.0.733" targetFramework="net45" />
7-
<package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net45" />
8-
<package id="Moq" version="4.0.10827" targetFramework="net45" />
9-
<package id="NHibernate" version="3.3.3.4001" targetFramework="net45" />
10-
<package id="NUnit" version="2.6.0.12054" targetFramework="net45" />
3+
<package id="Autofac" version="3.5.2" targetFramework="net45" />
4+
<package id="FluentMigrator" version="1.6.1" targetFramework="net45" />
5+
<package id="FluentMigrator.Tools" version="1.6.1" targetFramework="net45" />
6+
<package id="FluentNHibernate" version="2.0.3.0" targetFramework="net45" />
7+
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
8+
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
9+
<package id="NHibernate" version="4.0.4.4000" targetFramework="net45" />
10+
<package id="NUnit" version="3.0.1" targetFramework="net45" />
1111
</packages>

0 commit comments

Comments
 (0)