Skip to content

Commit 850967c

Browse files
Ja bist du narrischJa bist du narrisch
Ja bist du narrisch
authored and
Ja bist du narrisch
committed
Upgrade NUnit - code adjustments
1 parent fe9b857 commit 850967c

20 files changed

+321
-300
lines changed

‎src/Migrator.Tests/ColumnPropertyMapperTest.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,106 +17,106 @@ public void OracleCreatesNotNullSql()
1717
{
1818
var mapper = new ColumnPropertiesMapper(new OracleDialect(), "varchar(30)");
1919
mapper.MapColumnProperties(new Column("foo", DbType.String, ColumnProperty.NotNull));
20-
Assert.AreEqual("foo varchar(30) NOT NULL", mapper.ColumnSql);
20+
Assert.That("foo varchar(30) NOT NULL", Is.EqualTo(mapper.ColumnSql));
2121
}
2222

2323
[Test]
2424
public void OracleCreatesSql()
2525
{
2626
var mapper = new ColumnPropertiesMapper(new OracleDialect(), "varchar(30)");
2727
mapper.MapColumnProperties(new Column("foo", DbType.String, 0));
28-
Assert.AreEqual("foo varchar(30)", mapper.ColumnSql);
28+
Assert.That("foo varchar(30)", Is.EqualTo(mapper.ColumnSql));
2929
}
3030

3131
[Test]
3232
public void OracleIndexSqlIsNoNullWhenIndexed()
3333
{
3434
var mapper = new ColumnPropertiesMapper(new OracleDialect(), "char(1)");
3535
mapper.MapColumnProperties(new Column("foo", DbType.StringFixedLength, 1, ColumnProperty.Indexed));
36-
Assert.IsNotNull(mapper.IndexSql);
36+
Assert.That(mapper.IndexSql, Is.Not.Null);
3737
}
3838

3939
[Test]
4040
public void OracleIndexSqlIsNullWhenIndexedFalse()
4141
{
4242
var mapper = new ColumnPropertiesMapper(new OracleDialect(), "char(1)");
4343
mapper.MapColumnProperties(new Column("foo", DbType.StringFixedLength, 1, 0));
44-
Assert.IsNull(mapper.IndexSql);
44+
Assert.That(mapper.IndexSql, Is.Null);
4545
}
4646

4747
[Test]
4848
public void PostgresIndexSqlIsNoNullWhenIndexed()
4949
{
5050
var mapper = new ColumnPropertiesMapper(new PostgreSQLDialect(), "char(1)");
5151
mapper.MapColumnProperties(new Column("foo", DbType.StringFixedLength, 1, ColumnProperty.Indexed));
52-
Assert.IsNotNull(mapper.IndexSql);
52+
Assert.That(mapper.IndexSql, Is.Not.Null);
5353
}
5454

5555
[Test]
5656
public void PostgresIndexSqlIsNullWhenIndexedFalse()
5757
{
5858
var mapper = new ColumnPropertiesMapper(new PostgreSQLDialect(), "char(1)");
5959
mapper.MapColumnProperties(new Column("foo", DbType.StringFixedLength, 1, 0));
60-
Assert.IsNull(mapper.IndexSql);
60+
Assert.That(mapper.IndexSql, Is.Null);
6161
}
6262

6363
[Test]
6464
public void SqlServerCreatesNotNullSql()
6565
{
6666
var mapper = new ColumnPropertiesMapper(new SqlServerDialect(), "varchar(30)");
6767
mapper.MapColumnProperties(new Column("foo", DbType.String, ColumnProperty.NotNull));
68-
Assert.AreEqual("[foo] varchar(30) NOT NULL", mapper.ColumnSql);
68+
Assert.That("[foo] varchar(30) NOT NULL",Is.EqualTo( mapper.ColumnSql));
6969
}
7070

7171
[Test]
7272
public void SqlServerCreatesSqWithBooleanDefault()
7373
{
7474
var mapper = new ColumnPropertiesMapper(new SqlServerDialect(), "bit");
7575
mapper.MapColumnProperties(new Column("foo", DbType.Boolean, 0, false));
76-
Assert.AreEqual("[foo] bit DEFAULT 0", mapper.ColumnSql);
76+
Assert.That("[foo] bit DEFAULT 0", Is.EqualTo(mapper.ColumnSql));
7777

7878
mapper.MapColumnProperties(new Column("bar", DbType.Boolean, 0, true));
79-
Assert.AreEqual("[bar] bit DEFAULT 1", mapper.ColumnSql);
79+
Assert.That("[bar] bit DEFAULT 1", Is.EqualTo(mapper.ColumnSql));
8080
}
8181

8282
[Test]
8383
public void SqlServerCreatesSqWithDefault()
8484
{
8585
var mapper = new ColumnPropertiesMapper(new SqlServerDialect(), "varchar(30)");
8686
mapper.MapColumnProperties(new Column("foo", DbType.String, 0, "'NEW'"));
87-
Assert.AreEqual("[foo] varchar(30) DEFAULT '''NEW'''", mapper.ColumnSql);
87+
Assert.That("[foo] varchar(30) DEFAULT '''NEW'''", Is.EqualTo(mapper.ColumnSql));
8888
}
8989

9090
[Test]
9191
public void SqlServerCreatesSqWithNullDefault()
9292
{
9393
var mapper = new ColumnPropertiesMapper(new SqlServerDialect(), "varchar(30)");
9494
mapper.MapColumnProperties(new Column("foo", DbType.String, 0, "NULL"));
95-
Assert.AreEqual("[foo] varchar(30) DEFAULT 'NULL'", mapper.ColumnSql);
95+
Assert.That("[foo] varchar(30) DEFAULT 'NULL'",Is.EqualTo( mapper.ColumnSql));
9696
}
9797

9898
[Test]
9999
public void SqlServerCreatesSql()
100100
{
101101
var mapper = new ColumnPropertiesMapper(new SqlServerDialect(), "varchar(30)");
102102
mapper.MapColumnProperties(new Column("foo", DbType.String, 0));
103-
Assert.AreEqual("[foo] varchar(30)", mapper.ColumnSql);
103+
Assert.That("[foo] varchar(30)", Is.EqualTo(mapper.ColumnSql));
104104
}
105105

106106
[Test]
107107
public void SqlServerIndexSqlIsNoNullWhenIndexed()
108108
{
109109
var mapper = new ColumnPropertiesMapper(new SqlServerDialect(), "char(1)");
110110
mapper.MapColumnProperties(new Column("foo", DbType.StringFixedLength, 1, ColumnProperty.Indexed));
111-
Assert.IsNull(mapper.IndexSql);
111+
Assert.That(mapper.IndexSql, Is.Null);
112112
}
113113

114114
[Test]
115115
public void SQLiteIndexSqlWithEmptyStringDefault()
116116
{
117117
var mapper = new ColumnPropertiesMapper(new SQLiteDialect(), "varchar(30)");
118118
mapper.MapColumnProperties(new Column("foo", DbType.String, 1, ColumnProperty.NotNull, string.Empty));
119-
Assert.AreEqual("foo varchar(30) NOT NULL DEFAULT ''", mapper.ColumnSql);
119+
Assert.That("foo varchar(30) NOT NULL DEFAULT ''", Is.EqualTo(mapper.ColumnSql));
120120
}
121121
}
122122
}

‎src/Migrator.Tests/JoiningTableTransformationProviderExtensionsTests.cs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Data;
22
using Migrator.Framework;
33
using NUnit.Framework;
4-
using Rhino.Mocks;
5-
4+
using Rhino.Mocks;
5+
66
namespace Migrator.Tests
77
{
88
[TestFixture]
@@ -27,27 +27,27 @@ public void AddManyToManyJoiningTable_AddsPrimaryKey()
2727

2828
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddPrimaryKey(null, null, null))[0];
2929

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

3333
var columns = (string[]) args[2];
3434

35-
Assert.Contains("TestScenarioId", columns);
36-
Assert.Contains("VersionId", columns);
35+
Assert.That("TestScenarioId", Does.Contain(columns));
36+
Assert.That("VersionId", Does.Contain( columns));
3737
}
3838

3939
[Test]
4040
public void AddManyToManyJoiningTable_CreatesLeftHandSideColumn_WithCorrectName()
4141
{
4242
provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
4343

44-
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[]) null))[0];
45-
44+
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[]) null))[0];
45+
4646
Column lhsColumn = ((IDbField[]) args[1])[0] as Column;
4747

48-
Assert.AreEqual(lhsColumn.Name, "TestScenarioId");
49-
Assert.AreEqual(DbType.Guid, lhsColumn.Type);
50-
Assert.AreEqual(ColumnProperty.NotNull, lhsColumn.ColumnProperty);
48+
Assert.That(lhsColumn.Name, Is.EqualTo("TestScenarioId"));
49+
Assert.That(DbType.Guid, Is.EqualTo(lhsColumn.Type));
50+
Assert.That(ColumnProperty.NotNull, Is.EqualTo(lhsColumn.ColumnProperty));
5151
}
5252

5353
[Test]
@@ -57,11 +57,11 @@ public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectA
5757

5858
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[0];
5959

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

6767
[Test]
@@ -71,7 +71,7 @@ public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectN
7171

7272
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[0];
7373

74-
Assert.AreEqual("FK_Scenarios_ScenarioVersions", args[0]);
74+
Assert.That("FK_Scenarios_ScenarioVersions", Is.EqualTo(args[0]));
7575
}
7676

7777
[Test]
@@ -83,9 +83,9 @@ public void AddManyToManyJoiningTable_CreatesRightHandSideColumn_WithCorrectName
8383

8484
Column rhsColumn = ((IDbField[]) args[1])[1] as Column;
8585

86-
Assert.AreEqual(rhsColumn.Name, "VersionId");
87-
Assert.AreEqual(DbType.Guid, rhsColumn.Type);
88-
Assert.AreEqual(ColumnProperty.NotNull, rhsColumn.ColumnProperty);
86+
Assert.That(rhsColumn.Name, Is.EqualTo("VersionId"));
87+
Assert.That(DbType.Guid, Is.EqualTo(rhsColumn.Type));
88+
Assert.That(ColumnProperty.NotNull, Is.EqualTo(rhsColumn.ColumnProperty));
8989
}
9090

9191
[Test]
@@ -95,11 +95,11 @@ public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrect
9595

9696
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[1];
9797

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

105105
[Test]
@@ -109,7 +109,7 @@ public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrect
109109

110110
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddForeignKey(null, null, "", null, null, ForeignKeyConstraintType.NoAction))[1];
111111

112-
Assert.AreEqual("FK_Versions_ScenarioVersions", args[0]);
112+
Assert.That("FK_Versions_ScenarioVersions", Is.EqualTo(args[0]));
113113
}
114114

115115
[Test]
@@ -119,7 +119,7 @@ public void AddManyToManyJoiningTable_CreatesTableWithCorrectName()
119119

120120
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.AddTable(null, (Column[]) null))[0];
121121

122-
Assert.AreEqual("dbo.TestScenarioVersions", args[0]);
122+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
123123
}
124124

125125
[Test]
@@ -129,8 +129,8 @@ public void RemoveManyToManyJoiningTable_RemovesLhsForeignKey()
129129

130130
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveForeignKey(null, null))[0];
131131

132-
Assert.AreEqual("dbo.TestScenarioVersions", args[0]);
133-
Assert.AreEqual("FK_Scenarios_ScenarioVersions", args[1]);
132+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
133+
Assert.That("FK_Scenarios_ScenarioVersions", Is.EqualTo(args[1]));
134134
}
135135

136136
[Test]
@@ -140,8 +140,8 @@ public void RemoveManyToManyJoiningTable_RemovesRhsForeignKey()
140140

141141
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveForeignKey(null, null))[1];
142142

143-
Assert.AreEqual("dbo.TestScenarioVersions", args[0]);
144-
Assert.AreEqual("FK_Versions_ScenarioVersions", args[1]);
143+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
144+
Assert.That("FK_Versions_ScenarioVersions", Is.EqualTo(args[1]));
145145
}
146146

147147
[Test]
@@ -151,7 +151,7 @@ public void RemoveManyToManyJoiningTable_RemovesTable()
151151

152152
object[] args = provider.GetArgumentsForCallsMadeOn(stub => stub.RemoveTable(null))[0];
153153

154-
Assert.AreEqual("dbo.TestScenarioVersions", args[0]);
154+
Assert.That("dbo.TestScenarioVersions", Is.EqualTo(args[0]));
155155
}
156156
}
157157
}

‎src/Migrator.Tests/MigrationLoaderTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ public void CheckForDuplicatedVersion()
5555
[Test]
5656
public void LastVersion()
5757
{
58-
Assert.AreEqual(7, _migrationLoader.LastVersion);
58+
Assert.That(7, Is.EqualTo(_migrationLoader.LastVersion));
5959
}
6060

6161
[Test]
6262
public void NullIfNoMigrationForVersion()
6363
{
64-
Assert.IsNull(_migrationLoader.GetMigration(99999999));
64+
Assert.That(_migrationLoader.GetMigration(99999999), Is.Null);
6565
}
6666

6767
[Test]
6868
public void ZeroIfNoMigrations()
6969
{
7070
_migrationLoader.MigrationsTypes.Clear();
71-
Assert.AreEqual(0, _migrationLoader.LastVersion);
71+
Assert.That(0, Is.EqualTo(_migrationLoader.LastVersion));
7272
}
7373
}
7474
}

‎src/Migrator.Tests/MigrationTestCase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void SetUp()
3333
{
3434
_migrator = new Migrator(TransformationProvider, MigrationAssembly, true);
3535

36-
Assert.IsTrue(_migrator.MigrationsTypes.Count > 0, "No migrations in assembly " + MigrationAssembly.Location);
36+
Assert.That(_migrator.MigrationsTypes.Count > 0, Is.True, "No migrations in assembly " + MigrationAssembly.Location);
3737

3838
_migrator.MigrateTo(0);
3939
}

‎src/Migrator.Tests/MigrationTypeComparerTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void SortAscending()
7676

7777
for (int i = 0; i < 3; i++)
7878
{
79-
Assert.AreSame(_types[i], list[i]);
79+
Assert.That(_types[i], Is.SameAs( list[i]));
8080
}
8181
}
8282

@@ -93,7 +93,7 @@ public void SortDescending()
9393

9494
for (int i = 0; i < 3; i++)
9595
{
96-
Assert.AreSame(_types[2 - i], list[i]);
96+
Assert.That(_types[2 - i], Is.SameAs( list[i]));
9797
}
9898
}
9999
}

0 commit comments

Comments
 (0)