Skip to content

Commit 55cb6f1

Browse files
committed
NH-4004 - Restrict tests running on SqlServer CE
1 parent 21007cc commit 55cb6f1

File tree

7 files changed

+46
-63
lines changed

7 files changed

+46
-63
lines changed

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@
726726
<Compile Include="MappingByCode\TypeExtensionsTests\GetPropertyOrFieldMatchingNameTest.cs" />
727727
<Compile Include="MappingByCode\TypeExtensionsTests\TypeExtensionsTest.cs" />
728728
<Compile Include="MappingByCode\TypeNameUtilTests.cs" />
729+
<Compile Include="TestDialects\MsSqlCe40TestDialect.cs" />
729730
<Compile Include="NHSpecificTest\AccessAndCorrectPropertyName\Fixture.cs" />
730731
<Compile Include="NHSpecificTest\AccessAndCorrectPropertyName\Model.cs" />
731732
<Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Domain.cs" />
@@ -1434,7 +1435,6 @@
14341435
<Compile Include="Subselect\Domain.cs" />
14351436
<Compile Include="TestCaseMappingByCode.cs" />
14361437
<Compile Include="TestDialect.cs" />
1437-
<Compile Include="TestDialects\MsSql2008TestDialect.cs" />
14381438
<Compile Include="TestDialects\PostgreSQL83TestDialect.cs" />
14391439
<Compile Include="TestDialects\SQLiteTestDialect.cs" />
14401440
<Compile Include="Tools\hbm2ddl\SchemaExportTests\ExportToFileFixture.cs" />

src/NHibernate.Test/ReadOnly/TextHolder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class TextHolder
1010
/// </summary>
1111
public static bool SupportedForDialect(Dialect.Dialect dialect)
1212
{
13-
return !(dialect is FirebirdDialect || dialect is Oracle8iDialect);
13+
return !(dialect is FirebirdDialect || dialect is Oracle8iDialect || dialect is MsSqlCeDialect);
1414
}
1515

1616

src/NHibernate.Test/TestDialect.cs

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
52
using NHibernate.SqlTypes;
63

74
namespace NHibernate.Test
@@ -15,56 +12,52 @@ public class TestDialect
1512
{
1613
public static TestDialect GetTestDialect(Dialect.Dialect dialect)
1714
{
18-
string testDialectTypeName = "NHibernate.Test.TestDialects." + dialect.GetType().Name.Replace("Dialect", "TestDialect");
19-
System.Type testDialectType = System.Type.GetType(testDialectTypeName);
15+
var testDialectTypeName = "NHibernate.Test.TestDialects." + dialect.GetType().Name.Replace("Dialect", "TestDialect");
16+
var testDialectType = System.Type.GetType(testDialectTypeName);
2017
if (testDialectType != null)
21-
return (TestDialect)Activator.CreateInstance(testDialectType, dialect);
18+
return (TestDialect) Activator.CreateInstance(testDialectType, dialect);
2219
return new TestDialect(dialect);
2320
}
2421

25-
private Dialect.Dialect dialect;
22+
readonly Dialect.Dialect _dialect;
2623

27-
public TestDialect(Dialect.Dialect dialect)
28-
{
29-
this.dialect = dialect;
30-
}
24+
public TestDialect(Dialect.Dialect dialect)
25+
{
26+
_dialect = dialect;
27+
}
3128

32-
public virtual bool SupportsOperatorAll { get { return true; } }
33-
public virtual bool SupportsOperatorSome { get { return true; } }
34-
public virtual bool SupportsLocate { get { return true; } }
29+
public virtual bool SupportsOperatorAll => true;
30+
public virtual bool SupportsOperatorSome => true;
31+
public virtual bool SupportsLocate => true;
3532

36-
public virtual bool SupportsDistributedTransactions { get { return true; } }
33+
public virtual bool SupportsDistributedTransactions => true;
3734

3835
/// <summary>
3936
/// Whether two transactions can be run at the same time. For example, with SQLite
4037
/// the database is locked when one transaction is run, so running a second transaction
4138
/// will cause a "database is locked" error message.
4239
/// </summary>
43-
public virtual bool SupportsConcurrentTransactions { get { return true; } }
44-
45-
public virtual bool SupportsFullJoin { get { return true; } }
40+
public virtual bool SupportsConcurrentTransactions => true;
4641

47-
public virtual bool HasBrokenDecimalType { get { return false; } }
42+
public virtual bool HasBrokenDecimalType => false;
4843

49-
public virtual bool SupportsNullCharactersInUtfStrings { get { return true; } }
44+
public virtual bool SupportsNullCharactersInUtfStrings => true;
5045

51-
public virtual bool SupportsSelectForUpdateOnOuterJoin { get { return true; } }
46+
public virtual bool SupportsSelectForUpdateOnOuterJoin => true;
5247

53-
public virtual bool SupportsHavingWithoutGroupBy { get { return true; } }
48+
public virtual bool SupportsHavingWithoutGroupBy => true;
5449

55-
public virtual bool IgnoresTrailingWhitespace { get { return false; } }
56-
57-
public bool SupportsSqlType(SqlType sqlType)
58-
{
59-
try
60-
{
61-
dialect.GetTypeName(sqlType);
62-
return true;
63-
}
64-
catch
65-
{
66-
return false;
67-
}
68-
}
50+
public bool SupportsSqlType(SqlType sqlType)
51+
{
52+
try
53+
{
54+
_dialect.GetTypeName(sqlType);
55+
return true;
56+
}
57+
catch
58+
{
59+
return false;
60+
}
61+
}
6962
}
7063
}

src/NHibernate.Test/TestDialects/MsSql2008TestDialect.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace NHibernate.Test.TestDialects
2+
{
3+
public class MsSqlCe40TestDialect : TestDialect
4+
{
5+
public MsSqlCe40TestDialect(Dialect.Dialect dialect) : base(dialect)
6+
{
7+
}
8+
9+
public override bool SupportsDistributedTransactions => false;
10+
11+
public override bool SupportsConcurrentTransactions => false;
12+
}
13+
}

src/NHibernate.Test/TestDialects/SQLiteTestDialect.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ public override bool SupportsConcurrentTransactions
3737
get { return false; }
3838
}
3939

40-
public override bool SupportsFullJoin
41-
{
42-
get { return false; }
43-
}
44-
4540
public override bool HasBrokenDecimalType
4641
{
4742
get { return true; }

src/NHibernate/Dialect/MsSqlCeDialect.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ public override bool SupportsLimitOffset
125125
get { return false; }
126126
}
127127

128+
public override bool SupportsSubSelects => false;
129+
128130
public override System.Type NativeIdentifierGeneratorClass => typeof(TableHiLoGenerator);
129131

130132
public override bool SupportsCircularCascadeDeleteConstraints => false;

0 commit comments

Comments
 (0)