Skip to content

Commit 56834f8

Browse files
Ja bist du narrischJa bist du narrisch
authored andcommitted
Use var instead of explicit type
1 parent 4b46f28 commit 56834f8

33 files changed

+403
-405
lines changed

src/Migrator.Tests/JoiningTableTransformationProviderExtensionsTests.cs

Lines changed: 108 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -4,155 +4,154 @@
44
using NUnit.Framework;
55
using Rhino.Mocks;
66

7-
namespace Migrator.Tests
7+
namespace Migrator.Tests;
8+
9+
[TestFixture]
10+
public class JoiningTableTransformationProviderExtensionsTests
811
{
9-
[TestFixture]
10-
public class JoiningTableTransformationProviderExtensionsTests
11-
{
12-
#region Setup/Teardown
12+
#region Setup/Teardown
1313

14-
[SetUp]
15-
public void SetUp()
16-
{
17-
provider = MockRepository.GenerateStub<ITransformationProvider>();
18-
}
14+
[SetUp]
15+
public void SetUp()
16+
{
17+
_provider = MockRepository.GenerateStub<ITransformationProvider>();
18+
}
1919

20-
#endregion
20+
#endregion
2121

22-
ITransformationProvider provider;
22+
private ITransformationProvider _provider;
2323

24-
[Test]
25-
public void AddManyToManyJoiningTable_AddsPrimaryKey()
26-
{
27-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
24+
[Test]
25+
public void AddManyToManyJoiningTable_AddsPrimaryKey()
26+
{
27+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
2828

29-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddPrimaryKey(null, null, null))[0];
29+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddPrimaryKey(null, null, null))[0];
3030

31-
Assert.That("PK_TestScenarioVersions", Is.EqualTo(args[0]));
32-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[1]));
31+
Assert.That("PK_TestScenarioVersions", Is.EqualTo(args[0]));
32+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[1]));
3333

34-
var columns = (string[])args[2];
34+
var columns = (string[])args[2];
3535

36-
Assert.That("TestScenarioId", Does.Contain(columns));
37-
Assert.That("VersionId", Does.Contain(columns));
38-
}
36+
Assert.That("TestScenarioId", Does.Contain(columns));
37+
Assert.That("VersionId", Does.Contain(columns));
38+
}
3939

40-
[Test]
41-
public void AddManyToManyJoiningTable_CreatesLeftHandSideColumn_WithCorrectName()
42-
{
43-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
40+
[Test]
41+
public void AddManyToManyJoiningTable_CreatesLeftHandSideColumn_WithCorrectName()
42+
{
43+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
4444

45-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[])null))[0];
45+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[])null))[0];
4646

47-
Column lhsColumn = ((IDbField[])args[1])[0] as Column;
47+
var lhsColumn = ((IDbField[])args[1])[0] as Column;
4848

49-
Assert.That(lhsColumn.Name, Is.EqualTo("TestScenarioId"));
50-
Assert.That(DbType.Guid, Is.EqualTo(lhsColumn.Type));
51-
Assert.That(ColumnProperty.NotNull, Is.EqualTo(lhsColumn.ColumnProperty));
52-
}
49+
Assert.That(lhsColumn.Name, Is.EqualTo("TestScenarioId"));
50+
Assert.That(DbType.Guid, Is.EqualTo(lhsColumn.Type));
51+
Assert.That(ColumnProperty.NotNull, Is.EqualTo(lhsColumn.ColumnProperty));
52+
}
5353

54-
[Test]
55-
public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectAttributes()
56-
{
57-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
54+
[Test]
55+
public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectAttributes()
56+
{
57+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
5858

59-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[0];
59+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[0];
6060

61-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[1]));
62-
Assert.That("TestScenarioId", Is.EqualTo(args[2]));
63-
Assert.That("dbo.TestScenarios", Is.EqualTo(args[3]));
64-
Assert.That("Id", Is.EqualTo(args[4]));
65-
Assert.That(ForeignKeyConstraintType.NoAction, Is.EqualTo(args[5]));
66-
}
61+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[1]));
62+
Assert.That("TestScenarioId", Is.EqualTo(args[2]));
63+
Assert.That("dbo.TestScenarios", Is.EqualTo(args[3]));
64+
Assert.That("Id", Is.EqualTo(args[4]));
65+
Assert.That(ForeignKeyConstraintType.NoAction, Is.EqualTo(args[5]));
66+
}
6767

68-
[Test]
69-
public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectName()
70-
{
71-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
68+
[Test]
69+
public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectName()
70+
{
71+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
7272

73-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[0];
73+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[0];
7474

75-
Assert.That("FK_Scenarios_ScenarioVersions", Is.EqualTo(args[0]));
76-
}
75+
Assert.That("FK_Scenarios_ScenarioVersions", Is.EqualTo(args[0]));
76+
}
7777

78-
[Test]
79-
public void AddManyToManyJoiningTable_CreatesRightHandSideColumn_WithCorrectName()
80-
{
81-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
78+
[Test]
79+
public void AddManyToManyJoiningTable_CreatesRightHandSideColumn_WithCorrectName()
80+
{
81+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
8282

83-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[])null))[0];
83+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[])null))[0];
8484

85-
Column rhsColumn = ((IDbField[])args[1])[1] as Column;
85+
var rhsColumn = ((IDbField[])args[1])[1] as Column;
8686

87-
Assert.That(rhsColumn.Name, Is.EqualTo("VersionId"));
88-
Assert.That(DbType.Guid, Is.EqualTo(rhsColumn.Type));
89-
Assert.That(ColumnProperty.NotNull, Is.EqualTo(rhsColumn.ColumnProperty));
90-
}
87+
Assert.That(rhsColumn.Name, Is.EqualTo("VersionId"));
88+
Assert.That(DbType.Guid, Is.EqualTo(rhsColumn.Type));
89+
Assert.That(ColumnProperty.NotNull, Is.EqualTo(rhsColumn.ColumnProperty));
90+
}
9191

92-
[Test]
93-
public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectAttributes()
94-
{
95-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
92+
[Test]
93+
public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectAttributes()
94+
{
95+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
9696

97-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[1];
97+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[1];
9898

99-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[1]));
100-
Assert.That("VersionId", Is.EqualTo(args[2]));
101-
Assert.That("dbo.Versions", Is.EqualTo(args[3]));
102-
Assert.That("Id", Is.EqualTo(args[4]));
103-
Assert.That(ForeignKeyConstraintType.NoAction, Is.EqualTo(args[5]));
104-
}
99+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[1]));
100+
Assert.That("VersionId", Is.EqualTo(args[2]));
101+
Assert.That("dbo.Versions", Is.EqualTo(args[3]));
102+
Assert.That("Id", Is.EqualTo(args[4]));
103+
Assert.That(ForeignKeyConstraintType.NoAction, Is.EqualTo(args[5]));
104+
}
105105

106-
[Test]
107-
public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectName()
108-
{
109-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
106+
[Test]
107+
public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectName()
108+
{
109+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
110110

111-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[1];
111+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[1];
112112

113-
Assert.That("FK_Versions_ScenarioVersions", Is.EqualTo(args[0]));
114-
}
113+
Assert.That("FK_Versions_ScenarioVersions", Is.EqualTo(args[0]));
114+
}
115115

116-
[Test]
117-
public void AddManyToManyJoiningTable_CreatesTableWithCorrectName()
118-
{
119-
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
116+
[Test]
117+
public void AddManyToManyJoiningTable_CreatesTableWithCorrectName()
118+
{
119+
_provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
120120

121-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[])null))[0];
121+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[])null))[0];
122122

123-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
124-
}
123+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
124+
}
125125

126-
[Test]
127-
public void RemoveManyToManyJoiningTable_RemovesLhsForeignKey()
128-
{
129-
provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
126+
[Test]
127+
public void RemoveManyToManyJoiningTable_RemovesLhsForeignKey()
128+
{
129+
_provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
130130

131-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveForeignKey(null, null))[0];
131+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveForeignKey(null, null))[0];
132132

133-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
134-
Assert.That("FK_Scenarios_ScenarioVersions", Is.EqualTo(args[1]));
135-
}
133+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
134+
Assert.That("FK_Scenarios_ScenarioVersions", Is.EqualTo(args[1]));
135+
}
136136

137-
[Test]
138-
public void RemoveManyToManyJoiningTable_RemovesRhsForeignKey()
139-
{
140-
provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
137+
[Test]
138+
public void RemoveManyToManyJoiningTable_RemovesRhsForeignKey()
139+
{
140+
_provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
141141

142-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveForeignKey(null, null))[1];
142+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveForeignKey(null, null))[1];
143143

144-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
145-
Assert.That("FK_Versions_ScenarioVersions", Is.EqualTo(args[1]));
146-
}
144+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
145+
Assert.That("FK_Versions_ScenarioVersions", Is.EqualTo(args[1]));
146+
}
147147

148-
[Test]
149-
public void RemoveManyToManyJoiningTable_RemovesTable()
150-
{
151-
provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
148+
[Test]
149+
public void RemoveManyToManyJoiningTable_RemovesTable()
150+
{
151+
_provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
152152

153-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveTable(null))[0];
153+
var args = _provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveTable(null))[0];
154154

155-
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
156-
}
155+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
157156
}
158157
}

src/Migrator.Tests/MigrationLoaderTest.cs

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,74 @@
44
using NUnit.Framework;
55
using NUnit.Mocks;
66

7-
namespace Migrator.Tests
7+
namespace Migrator.Tests;
8+
9+
[TestFixture]
10+
public class MigrationLoaderTest
811
{
9-
[TestFixture]
10-
public class MigrationLoaderTest
12+
#region Setup/Teardown
13+
14+
[SetUp]
15+
public void SetUp()
1116
{
12-
#region Setup/Teardown
17+
SetUpCurrentVersion(0, false);
18+
}
1319

14-
[SetUp]
15-
public void SetUp()
16-
{
17-
SetUpCurrentVersion(0, false);
18-
}
20+
#endregion
1921

20-
#endregion
22+
private MigrationLoader _migrationLoader;
2123

22-
MigrationLoader _migrationLoader;
24+
private void SetUpCurrentVersion(int version, bool assertRollbackIsCalled)
25+
{
26+
var providerMock = new DynamicMock(typeof(ITransformationProvider));
2327

24-
void SetUpCurrentVersion(int version, bool assertRollbackIsCalled)
28+
providerMock.SetReturnValue("get_CurrentVersion", version);
29+
providerMock.SetReturnValue("get_Logger", new Logger(false));
30+
if (assertRollbackIsCalled)
2531
{
26-
var providerMock = new DynamicMock(typeof(ITransformationProvider));
27-
28-
providerMock.SetReturnValue("get_CurrentVersion", version);
29-
providerMock.SetReturnValue("get_Logger", new Logger(false));
30-
if (assertRollbackIsCalled)
31-
providerMock.Expect("Rollback");
32-
else
33-
providerMock.ExpectNoCall("Rollback");
34-
35-
_migrationLoader = new MigrationLoader((ITransformationProvider)providerMock.MockInstance, Assembly.GetExecutingAssembly(), true);
36-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.FirstMigration));
37-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.SecondMigration));
38-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.ThirdMigration));
39-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.ForthMigration));
40-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.BadMigration));
41-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.SixthMigration));
42-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.NonIgnoredMigration));
32+
providerMock.Expect("Rollback");
4333
}
44-
45-
[Test]
46-
public void CheckForDuplicatedVersion()
34+
else
4735
{
48-
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.FirstMigration));
49-
Assert.Throws<DuplicatedVersionException>(() =>
50-
{
51-
_migrationLoader.CheckForDuplicatedVersion();
52-
});
36+
providerMock.ExpectNoCall("Rollback");
5337
}
5438

55-
[Test]
56-
public void LastVersion()
57-
{
58-
Assert.That(7, Is.EqualTo(_migrationLoader.LastVersion));
59-
}
39+
_migrationLoader = new MigrationLoader((ITransformationProvider)providerMock.MockInstance, Assembly.GetExecutingAssembly(), true);
40+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.FirstMigration));
41+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.SecondMigration));
42+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.ThirdMigration));
43+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.ForthMigration));
44+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.BadMigration));
45+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.SixthMigration));
46+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.NonIgnoredMigration));
47+
}
6048

61-
[Test]
62-
public void NullIfNoMigrationForVersion()
49+
[Test]
50+
public void CheckForDuplicatedVersion()
51+
{
52+
_migrationLoader.MigrationsTypes.Add(typeof(MigratorTest.FirstMigration));
53+
Assert.Throws<DuplicatedVersionException>(() =>
6354
{
64-
Assert.That(_migrationLoader.GetMigration(99999999), Is.Null);
65-
}
55+
_migrationLoader.CheckForDuplicatedVersion();
56+
});
57+
}
6658

67-
[Test]
68-
public void ZeroIfNoMigrations()
69-
{
70-
_migrationLoader.MigrationsTypes.Clear();
71-
Assert.That(0, Is.EqualTo(_migrationLoader.LastVersion));
72-
}
59+
[Test]
60+
public void LastVersion()
61+
{
62+
Assert.That(7, Is.EqualTo(_migrationLoader.LastVersion));
63+
}
64+
65+
[Test]
66+
public void NullIfNoMigrationForVersion()
67+
{
68+
Assert.That(_migrationLoader.GetMigration(99999999), Is.Null);
69+
}
70+
71+
[Test]
72+
public void ZeroIfNoMigrations()
73+
{
74+
_migrationLoader.MigrationsTypes.Clear();
75+
Assert.That(0, Is.EqualTo(_migrationLoader.LastVersion));
7376
}
7477
}

0 commit comments

Comments
 (0)