diff --git a/src/AsyncGenerator.yml b/src/AsyncGenerator.yml index 4333f1bf114..68ae0a1c735 100644 --- a/src/AsyncGenerator.yml +++ b/src/AsyncGenerator.yml @@ -7,7 +7,7 @@ - pattern: ^.*(Hql\.g).*$ analyzation: methodConversion: -#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults +#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults - conversion: Ignore name: ProcessResults containingTypeName: IQueryBatchItem @@ -121,7 +121,7 @@ - conversion: ToAsync rule: Cache - conversion: ToAsync - rule: TransactionCompletion + rule: TransactionCompletion typeConversion: - conversion: Ignore name: EnumerableImpl @@ -276,7 +276,7 @@ methodRules: - containingType: NHibernate.Action.IAfterTransactionCompletionProcess - containingType: NHibernate.Action.IBeforeTransactionCompletionProcess - containingType: NHibernate.Action.EntityAction - name: BeforeTransactionCompletionProcessImpl + name: BeforeTransactionCompletionProcessImpl name: TransactionCompletion - filters: - containingNamespace: NHibernate diff --git a/src/NHibernate.DomainModel/Bar.cs b/src/NHibernate.DomainModel/Bar.cs index dfbb9dde84b..262d9d512e3 100644 --- a/src/NHibernate.DomainModel/Bar.cs +++ b/src/NHibernate.DomainModel/Bar.cs @@ -12,7 +12,6 @@ public class Bar : Abstract, BarProxy, INamed private string _name = "bar"; private object _object; - /// /// Gets or sets the X /// @@ -31,7 +30,6 @@ public string BarString set { _barString = value; } } - /// /// Gets or sets the _barComponent /// @@ -41,7 +39,6 @@ public FooComponent BarComponent set { _barComponent = value; } } - /// /// Gets or sets the _baz /// @@ -51,7 +48,6 @@ public Baz Baz set { _baz = value; } } - /// /// Gets or sets the _name /// @@ -61,7 +57,6 @@ public string Name set { _name = value; } } - /// /// Gets or sets the _object /// @@ -71,4 +66,4 @@ public object Object set { _object = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Baz.cs b/src/NHibernate.DomainModel/Baz.cs index acb2c846dcd..8df1fa87dcc 100644 --- a/src/NHibernate.DomainModel/Baz.cs +++ b/src/NHibernate.DomainModel/Baz.cs @@ -260,7 +260,6 @@ public string[] StringArray set { _stringArray = value; } } - /// /// Gets or sets the fooArray /// @@ -270,7 +269,6 @@ public FooProxy[] FooArray set { _fooArray = value; } } - /// /// Get/set for fooSet /// @@ -453,4 +451,4 @@ public int CompareTo(object obj) #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Circular.cs b/src/NHibernate.DomainModel/Circular.cs index 1684403c025..6c8386ae004 100644 --- a/src/NHibernate.DomainModel/Circular.cs +++ b/src/NHibernate.DomainModel/Circular.cs @@ -18,7 +18,6 @@ public string Id set { _id = value; } } - public System.Type Clazz { get { return _clazz; } @@ -37,4 +36,4 @@ public object AnyEntity set { _anyEntity = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/ComponentCollection.cs b/src/NHibernate.DomainModel/ComponentCollection.cs index 037a04f0057..3465b5489e3 100644 --- a/src/NHibernate.DomainModel/ComponentCollection.cs +++ b/src/NHibernate.DomainModel/ComponentCollection.cs @@ -20,7 +20,6 @@ public IList Foos set { _foos = value; } } - /// /// Holds the _str /// @@ -49,4 +48,4 @@ public IList Floats set { _floats = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Container.cs b/src/NHibernate.DomainModel/Container.cs index 9c397eb7f51..c1ead671661 100644 --- a/src/NHibernate.DomainModel/Container.cs +++ b/src/NHibernate.DomainModel/Container.cs @@ -80,7 +80,6 @@ public Glarch Glarch } } - private IList _oneToMany; private IList _components; private IList _manyToMany; @@ -94,7 +93,6 @@ public Glarch Glarch // mapping private ISet _ternarySet; - public virtual IList OneToMany { get { return _oneToMany; } @@ -155,4 +153,4 @@ public virtual ISet TernarySet set { _ternarySet = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Detail.cs b/src/NHibernate.DomainModel/Detail.cs index f5ae324c51a..6cd9242c8c2 100644 --- a/src/NHibernate.DomainModel/Detail.cs +++ b/src/NHibernate.DomainModel/Detail.cs @@ -26,7 +26,6 @@ public int I set { _i = value; } } - public ISet SubDetails { get { return _details; } @@ -39,4 +38,4 @@ public int X set { _x = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/DoubleStringType.cs b/src/NHibernate.DomainModel/DoubleStringType.cs index 4c794cb6f3d..b2b6d2fd8c8 100644 --- a/src/NHibernate.DomainModel/DoubleStringType.cs +++ b/src/NHibernate.DomainModel/DoubleStringType.cs @@ -57,7 +57,6 @@ public Object NullSafeGet(DbDataReader rs, string[] names, ISessionImplementor s return (first == null && second == null) ? null : new string[] {first, second}; } - public void NullSafeSet(DbCommand st, Object value, int index, bool[] settable, ISessionImplementor session) { string[] strings = (value == null) ? new string[2] : (string[]) value; @@ -107,4 +106,4 @@ public object Replace(object original, object target, ISessionImplementor sessio return DeepCopy(original); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Foo.cs b/src/NHibernate.DomainModel/Foo.cs index b64c5c736d3..7edbc288126 100644 --- a/src/NHibernate.DomainModel/Foo.cs +++ b/src/NHibernate.DomainModel/Foo.cs @@ -347,8 +347,8 @@ public LifecycleVeto OnSave(ISession s) _long = 696969696969696969L - count++; _short = 42; _float = 6666.66f; - //_double = new Double( 1.33e-69 ); // this double is too big for the sap db jdbc driver -// _double = 1.12e-36; + //_double = new Double( 1.33e-69 ); // this double is too big for the sap db jdbc driver + //_double = 1.12e-36; _boolean = true; _byte = 127; _int = 2; @@ -397,7 +397,6 @@ public bool EqualsFoo(Foo other) } } - return (_bool == other.Bool) && ((_boolean == other.Boolean) || (_boolean.Equals(other.Boolean))) && ((_byte == other.Byte) || (_byte.Equals(other.Byte))) @@ -429,7 +428,6 @@ public bool EqualsFoo(Foo other) // return key.GetHashCode() - _string.GetHashCode(); // } - private static int count = 0; } } diff --git a/src/NHibernate.DomainModel/Fum.cs b/src/NHibernate.DomainModel/Fum.cs index ddc1d7e1ee4..73c9aa85879 100644 --- a/src/NHibernate.DomainModel/Fum.cs +++ b/src/NHibernate.DomainModel/Fum.cs @@ -99,7 +99,6 @@ public ISet Friends set { this._friends = value; } } - public LifecycleVeto OnDelete(ISession s) { if (_friends == null) return LifecycleVeto.NoVeto; @@ -117,12 +116,10 @@ public LifecycleVeto OnDelete(ISession s) return LifecycleVeto.NoVeto; } - public void OnLoad(ISession s, object id) { } - public LifecycleVeto OnSave(ISession s) { if (_friends == null) return LifecycleVeto.NoVeto; @@ -140,7 +137,6 @@ public LifecycleVeto OnSave(ISession s) return LifecycleVeto.NoVeto; } - public LifecycleVeto OnUpdate(ISession s) { return LifecycleVeto.NoVeto; @@ -158,4 +154,4 @@ public MapComponent MapComponent set { _mapComponent = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Glarch.cs b/src/NHibernate.DomainModel/Glarch.cs index 5a3036817c0..83d23397e47 100644 --- a/src/NHibernate.DomainModel/Glarch.cs +++ b/src/NHibernate.DomainModel/Glarch.cs @@ -38,7 +38,6 @@ public int Version set { this._version = value; } } - /// /// Gets or sets the _next /// @@ -48,7 +47,6 @@ public GlarchProxy Next set { _next = value; } } - /// /// Gets or sets the _order /// @@ -58,7 +56,6 @@ public short Order set { _order = value; } } - /// /// Gets or sets the _strings /// @@ -68,7 +65,6 @@ public IList Strings set { _strings = value; } } - /// /// Gets or sets the _stringSets /// @@ -79,7 +75,6 @@ public ISet StringSets set { _stringSets = value; } } - /// /// Gets or sets the _fooComponents /// @@ -89,7 +84,6 @@ public IList FooComponents set { _fooComponents = value; } } - /// /// Gets or sets the _proxyArray /// @@ -99,7 +93,6 @@ public GlarchProxy[] ProxyArray set { _proxyArray = value; } } - /// /// Gets or sets the _proxySet /// @@ -188,4 +181,4 @@ public Multiplicity Multiple set { _name = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Location.cs b/src/NHibernate.DomainModel/Location.cs index 6da9c7a0332..4559856996e 100644 --- a/src/NHibernate.DomainModel/Location.cs +++ b/src/NHibernate.DomainModel/Location.cs @@ -40,7 +40,6 @@ public string CountryCode set { _countryCode = value; } } - public string Description { get { return _description; } @@ -76,4 +75,4 @@ public override int GetHashCode() #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/MoreStuff.cs b/src/NHibernate.DomainModel/MoreStuff.cs index 238de291718..4e9238c4bc3 100644 --- a/src/NHibernate.DomainModel/MoreStuff.cs +++ b/src/NHibernate.DomainModel/MoreStuff.cs @@ -15,7 +15,6 @@ public class MoreStuff private IList _stuffs; private string _name; - public string StringId { get { return _stringId; } @@ -52,7 +51,6 @@ public override bool Equals(object obj) return (rhs.IntId == this.IntId && rhs.StringId.Equals(this.StringId)); } - public override int GetHashCode() { return _stringId.GetHashCode(); @@ -60,4 +58,4 @@ public override int GetHashCode() #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/NHSpecific/Child.cs b/src/NHibernate.DomainModel/NHSpecific/Child.cs index 9c439a9237c..5eb941631c9 100644 --- a/src/NHibernate.DomainModel/NHSpecific/Child.cs +++ b/src/NHibernate.DomainModel/NHSpecific/Child.cs @@ -54,7 +54,6 @@ public Child FirstSibling set { Siblings.Insert(0, value); } } - public Child SecondSibling { get { return (Child) Siblings[1]; } @@ -115,11 +114,10 @@ public Child[] Friends set { _friends = value; } } - public DateTime FavoriteDate { get { return _favoriteDate; } set { _favoriteDate = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/NHSpecific/Parent.cs b/src/NHibernate.DomainModel/NHSpecific/Parent.cs index 2e3cab577bd..0bb468d37b7 100644 --- a/src/NHibernate.DomainModel/NHSpecific/Parent.cs +++ b/src/NHibernate.DomainModel/NHSpecific/Parent.cs @@ -13,7 +13,6 @@ public class Parent private ISet _children; private ISet _adultFriends; - public Parent() { _adultFriends = new SortedSet(new ParentComparer()); @@ -48,4 +47,4 @@ public void AddFriend(Parent friend) _adultFriends.Add(friend); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Northwind/Entities/Role.cs b/src/NHibernate.DomainModel/Northwind/Entities/Role.cs index 362eaf0f5f8..2643c03d285 100644 --- a/src/NHibernate.DomainModel/Northwind/Entities/Role.cs +++ b/src/NHibernate.DomainModel/Northwind/Entities/Role.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.DomainModel.Northwind.Entities +namespace NHibernate.DomainModel.Northwind.Entities { public class Role { diff --git a/src/NHibernate.DomainModel/Northwind/Entities/User.cs b/src/NHibernate.DomainModel/Northwind/Entities/User.cs index 35a88e2f7b1..a2bde32af30 100644 --- a/src/NHibernate.DomainModel/Northwind/Entities/User.cs +++ b/src/NHibernate.DomainModel/Northwind/Entities/User.cs @@ -59,10 +59,6 @@ public User(string name, DateTime registeredAt) } } - - - - public enum EnumStoredAsString { Unspecified, Small, Medium, Large } public enum EnumStoredAsInt32 { Unspecified, High, Low } diff --git a/src/NHibernate.DomainModel/OuterKey.cs b/src/NHibernate.DomainModel/OuterKey.cs index 52781386478..9b6d085569a 100644 --- a/src/NHibernate.DomainModel/OuterKey.cs +++ b/src/NHibernate.DomainModel/OuterKey.cs @@ -38,7 +38,6 @@ public override bool Equals(object obj) return true; } - public override int GetHashCode() { unchecked @@ -55,4 +54,4 @@ public override int GetHashCode() #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/Po.cs b/src/NHibernate.DomainModel/Po.cs index f25b24eb913..d46d910d0fc 100644 --- a/src/NHibernate.DomainModel/Po.cs +++ b/src/NHibernate.DomainModel/Po.cs @@ -13,7 +13,6 @@ public class Po private Top _top; private Lower _lower; - public long Id { get { return _id; } @@ -56,4 +55,4 @@ public Lower Lower set { _lower = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.DomainModel/StringComparator.cs b/src/NHibernate.DomainModel/StringComparator.cs index 69b0893734e..1611397c6c1 100644 --- a/src/NHibernate.DomainModel/StringComparator.cs +++ b/src/NHibernate.DomainModel/StringComparator.cs @@ -20,10 +20,9 @@ public int Compare(string x, string y) return -1; } - return ((String) x).ToLower().CompareTo(((String) y).ToLower()); } #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs b/src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs index 1d517305df7..9e0501e351a 100644 --- a/src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs +++ b/src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs @@ -50,7 +50,6 @@ public async Task SimpleNativeSQLInsert_DoesNotEvictEntireCacheWhenQuerySpacesAr using (var t = s.BeginTransaction()) { - await (s.CreateSQLQuery(ssql).ExecuteUpdateAsync()); await (t.CommitAsync()); diff --git a/src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs b/src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs index 11d61969881..6c4557b8bdc 100644 --- a/src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs +++ b/src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs @@ -1695,6 +1695,5 @@ private BatchableCache GetDefaultQueryCache() return cache; } - } } diff --git a/src/NHibernate.Test/Async/CacheTest/SerializationFixture.cs b/src/NHibernate.Test/Async/CacheTest/SerializationFixture.cs index 85d822288c9..f2683f7f26c 100644 --- a/src/NHibernate.Test/Async/CacheTest/SerializationFixture.cs +++ b/src/NHibernate.Test/Async/CacheTest/SerializationFixture.cs @@ -119,7 +119,6 @@ public async Task TestAnyTypeObjectTypeCacheEntrySerializationAsync() CheckObjectTypeCacheEntry(item, copy); } - [Serializable] public class MyEntity { diff --git a/src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs b/src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs index 61a15a50132..782d1516fe5 100644 --- a/src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs +++ b/src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs @@ -16,7 +16,6 @@ namespace NHibernate.Test.Cascade.Circle { using System.Threading.Tasks; using System.Threading; - /** * The test case uses the following model: * diff --git a/src/NHibernate.Test/Async/Cascade/MultiPathCascadeTest.cs b/src/NHibernate.Test/Async/Cascade/MultiPathCascadeTest.cs index 25fa311a43b..c4f58280d9f 100644 --- a/src/NHibernate.Test/Async/Cascade/MultiPathCascadeTest.cs +++ b/src/NHibernate.Test/Async/Cascade/MultiPathCascadeTest.cs @@ -38,7 +38,6 @@ public async Task MultiPathMergeModifiedDetachedAsync() using (ISession s = OpenSession()) using (s.BeginTransaction()) { - a.Data = "Anna"; await (s.SaveAsync(a)); await (s.Transaction.CommitAsync()); diff --git a/src/NHibernate.Test/Async/Cascade/RefreshFixture.cs b/src/NHibernate.Test/Async/Cascade/RefreshFixture.cs index 3e45819fbe1..f62ed44dfd5 100644 --- a/src/NHibernate.Test/Async/Cascade/RefreshFixture.cs +++ b/src/NHibernate.Test/Async/Cascade/RefreshFixture.cs @@ -102,7 +102,6 @@ public async Task RefreshIgnoringTransientInCollectionAsync() { using (ITransaction txn = session.BeginTransaction()) { - var batch = new JobBatch(DateTime.Now); batch.CreateJob().ProcessingInstructions = "Just do it!"; await (session.PersistAsync(batch)); @@ -135,6 +134,5 @@ public async Task RefreshNotIgnoringTransientByUnsavedValueAsync() session.Close(); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/CfgTest/ConfigurationFixture.cs b/src/NHibernate.Test/Async/CfgTest/ConfigurationFixture.cs index b7d402f6119..51a82d0aff9 100644 --- a/src/NHibernate.Test/Async/CfgTest/ConfigurationFixture.cs +++ b/src/NHibernate.Test/Async/CfgTest/ConfigurationFixture.cs @@ -106,7 +106,6 @@ public class SampleQueryProvider : DefaultQueryProvider { public SampleQueryProvider(ISessionImplementor session) : base(session) { - } protected SampleQueryProvider(ISessionImplementor session, object collection, NhQueryableOptions options) : base(session, collection, options) @@ -118,6 +117,5 @@ protected override IQueryProvider CreateWithOptions(NhQueryableOptions options) return new SampleQueryProvider(Session, Collection, options); } } - } } diff --git a/src/NHibernate.Test/Async/Classic/LifecycleFixture.cs b/src/NHibernate.Test/Async/Classic/LifecycleFixture.cs index d346845518a..aecfdfbd818 100644 --- a/src/NHibernate.Test/Async/Classic/LifecycleFixture.cs +++ b/src/NHibernate.Test/Async/Classic/LifecycleFixture.cs @@ -109,7 +109,6 @@ public async Task MergeAsync() Assert.That(Sfi.Statistics.EntityInsertCount, Is.EqualTo(0)); Assert.That(Sfi.Statistics.EntityUpdateCount, Is.EqualTo(0)); - // cleanup using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) @@ -142,4 +141,4 @@ public async Task DeleteAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/Classic/ValidatableFixture.cs b/src/NHibernate.Test/Async/Classic/ValidatableFixture.cs index 7f08613bca3..d8b3b514ddc 100644 --- a/src/NHibernate.Test/Async/Classic/ValidatableFixture.cs +++ b/src/NHibernate.Test/Async/Classic/ValidatableFixture.cs @@ -144,7 +144,6 @@ public async Task MergeAsync() // Ok } - // cleanup using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) @@ -167,6 +166,5 @@ public async Task DeleteAsync() await (s.FlushAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs b/src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs index e3ae7de3018..e080dbd91eb 100644 --- a/src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs +++ b/src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs @@ -58,7 +58,6 @@ protected override void OnTearDown() } } - /// /// Test the basic CRUD operations for a class with a Composite Identifier /// diff --git a/src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs b/src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs index 569abe99b0f..5bc228546f8 100644 --- a/src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs +++ b/src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs @@ -138,7 +138,6 @@ public async Task CompositeIdsAsync() await (t.CommitAsync()); } - using (s = OpenSession()) { t = s.BeginTransaction(); @@ -298,4 +297,4 @@ public async Task QueryAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/ConnectionStringTest/NamedConnectionStringFixture.cs b/src/NHibernate.Test/Async/ConnectionStringTest/NamedConnectionStringFixture.cs index 8bfc1ae19cf..8d3b82709d0 100644 --- a/src/NHibernate.Test/Async/ConnectionStringTest/NamedConnectionStringFixture.cs +++ b/src/NHibernate.Test/Async/ConnectionStringTest/NamedConnectionStringFixture.cs @@ -22,7 +22,7 @@ namespace NHibernate.Test.ConnectionStringTest public partial class MockConnectionProvider : ConnectionProvider { - + /// /// Get an open . /// @@ -33,5 +33,4 @@ public override Task GetConnectionAsync(CancellationToken cancella throw new NotImplementedException(); } } - } diff --git a/src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs b/src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs index be2dcb8002e..7e3112b3f94 100644 --- a/src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs +++ b/src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs @@ -377,7 +377,6 @@ public async Task CloningCriteria_AddCount_RemoveOrderingAsync() .AddOrder(Order.Asc("a.bodyWeight")); ICriteria cloned = CriteriaTransformer.TransformToRowCount(c); - await (cloned.ListAsync()); await (t.RollbackAsync()); s.Close(); @@ -802,7 +801,6 @@ public async Task ProjectionsTestAsync() Assert.AreEqual(101L, result[2]); Assert.AreEqual(384.0D, (Double)result[3], 0.01D); - IList resultWithMaps = await (s.CreateCriteria(typeof(Enrolment)) .SetProjection(Projections.Distinct(Projections.ProjectionList() .Add(Projections.Property("StudentNumber"), "stNumber") @@ -833,7 +831,6 @@ public async Task ProjectionsTestAsync() Assert.AreEqual(101L, m1["stNumber"]); Assert.AreEqual(667L, m0["stNumber"]); - IList resultWithAliasedBean = await (s.CreateCriteria(typeof(Enrolment)) .CreateAlias("Student", "st") .CreateAlias("Course", "co") @@ -890,7 +887,6 @@ public async Task ProjectionsTestAsync() ProjectionList pp1 = Projections.ProjectionList().Add(Projections.RowCountInt64()); - object r = await (s.CreateCriteria(typeof(Enrolment)) .SetProjection(pp1) .UniqueResultAsync()); @@ -994,7 +990,6 @@ public async Task CloningProjectionsTestAsync() Assert.AreEqual(101L, result[2]); Assert.AreEqual(384.0D, (Double)result[3], 0.01D); - ICriteria criteriaToClone2 = s.CreateCriteria(typeof(Enrolment)) .SetProjection(Projections.Distinct(Projections.ProjectionList() .Add(Projections.Property("StudentNumber"), "stNumber") @@ -1027,7 +1022,6 @@ public async Task CloningProjectionsTestAsync() Assert.AreEqual(101L, m1["stNumber"]); Assert.AreEqual(667L, m0["stNumber"]); - ICriteria criteriaToClone3 = s.CreateCriteria(typeof(Enrolment)) .CreateAlias("Student", "st") .CreateAlias("Course", "co") @@ -1778,7 +1772,6 @@ public async Task CloningProjectionsUsingPropertyAsync() Assert.AreEqual(101L, result[2]); Assert.AreEqual(384.0D, (double)result[3], 0.01D); - await (CriteriaTransformer.Clone( s.CreateCriteria(typeof(Enrolment)) .Add(Property.ForName("StudentNumber").Gt(665L)) @@ -1822,7 +1815,6 @@ public async Task CloningProjectionsUsingPropertyAsync() Assert.AreEqual(101L, m1["stNumber"]); Assert.AreEqual(667L, m0["stNumber"]); - IList resultWithAliasedBean = await (CriteriaTransformer.Clone(s.CreateCriteria(typeof(Enrolment)) .CreateAlias("Student", "st") .CreateAlias("Course", "co") @@ -2344,7 +2336,6 @@ public async Task SameColumnAndAliasNamesAsync() .Add(Projections.Property("StudentNumber"), "StudentNumber") .Add(Projections.Property("Name"), "Name")); - ISession session = OpenSession(); ITransaction t = session.BeginTransaction(); @@ -2381,7 +2372,6 @@ public async Task SameColumnAndAliasNamesResultTransformerAsync() .Add(Property.ForName("Name").Eq("Gavin King")) .AddOrder(Order.Asc("StudentNumber")); - ISession session = OpenSession(); ITransaction t = session.BeginTransaction(); @@ -2513,7 +2503,6 @@ public async Task TransformToRowCountTestAsync() ICriteria subCriterium = crit.CreateCriteria("PreferredCourse"); subCriterium.Add(Property.ForName("CourseCode").Eq("PREFFERED_CODE")); - ICriteria countCriteria = CriteriaTransformer.TransformToRowCount(crit); await (countCriteria.ListAsync()); @@ -2549,7 +2538,6 @@ public async Task OrderProjectionAliasedTestAsync() using (ISession session = OpenSession()) using (ITransaction t = session.BeginTransaction()) { - Course courseA = new Course(); courseA.CourseCode = "HIB-A"; courseA.Description = "Hibernate Training A"; diff --git a/src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs b/src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs index 215c0fff9b2..ff3b63d13e4 100644 --- a/src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs +++ b/src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs @@ -208,7 +208,6 @@ public async Task MixOfJoinsForAssociatedAndNotAssociatedEntitiesAsync() using (var sqlLog = new SqlLogSpy()) using (var session = OpenSession()) { - EntityComplex root = null; EntityComplex ejLevel1 = null; EntitySimpleChild customChildForEjLevel1 = null; @@ -293,7 +292,6 @@ public async Task NullLeftEntityJoinWithEntityProjectionAsync() [Test] public async Task EntityJoinForCustomEntityNameAsync() { - using (var sqlLog = new SqlLogSpy()) using (var session = OpenSession()) { @@ -314,7 +312,6 @@ public async Task EntityJoinForCustomEntityNameAsync() [Test] public async Task EntityJoinForCustomEntityName_ExpressionAsync() { - using (var sqlLog = new SqlLogSpy()) using (var session = OpenSession()) { @@ -415,7 +412,6 @@ protected override HbmMapping GetMappings() m.Inverse(true); }, a => a.OneToMany()); - }); mapper.Class( @@ -465,7 +461,6 @@ protected override HbmMapping GetMappings() rc.Property(e => e.Composite1Key1); rc.Property(e => e.Composite1Key2); rc.Property(e => e.CustomEntityNameId); - }); mapper.Class( diff --git a/src/NHibernate.Test/Async/Criteria/EntityProjectionsTest.cs b/src/NHibernate.Test/Async/Criteria/EntityProjectionsTest.cs index 5167de586a1..ad38f539dfa 100644 --- a/src/NHibernate.Test/Async/Criteria/EntityProjectionsTest.cs +++ b/src/NHibernate.Test/Async/Criteria/EntityProjectionsTest.cs @@ -61,7 +61,6 @@ protected override HbmMapping GetMappings() m.Inverse(true); }, a => a.OneToMany()); - }); mapper.Class( @@ -192,7 +191,6 @@ public async Task RootEntityProjectionLazyAsync() .Select(Projections.RootEntity().SetLazy(true)) .Take(1).SingleOrDefaultAsync()); - Assert.That(NHibernateUtil.IsInitialized(entityRoot), Is.False, "Object must be lazy loaded."); } } @@ -325,7 +323,6 @@ public async Task MultipleLazyEntityProjectionsAsync() //make sure objects are populated from different aliases for the same types Assert.That(root.Id, Is.Not.EqualTo(sameTypeChild.Id), "Different objects are expected for root and sameTypeChild."); Assert.That(child1.Id, Is.Not.EqualTo(child2.Id), "Different objects are expected for child1 and child2."); - } } @@ -455,7 +452,6 @@ public async Task MultipleEntitiesProjectionsToResultTransformerAsync() } } - [Test] public async Task ReadOnlyProjectionAsync() { @@ -487,7 +483,6 @@ public async Task EntityProjectionForCompositeKeyInitializedAsync() Assert.That(composite, Is.EqualTo(_entityWithCompositeId).Using((EntityWithCompositeId x, EntityWithCompositeId y) => (Equals(x.Key, y.Key) && Equals(x.Name, y.Name)) ? 0 : 1)); Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected"); } - } [Test] diff --git a/src/NHibernate.Test/Async/Criteria/Lambda/FunctionsIntegrationFixture.cs b/src/NHibernate.Test/Async/Criteria/Lambda/FunctionsIntegrationFixture.cs index 59731c3ed08..e21a2e3f6b2 100644 --- a/src/NHibernate.Test/Async/Criteria/Lambda/FunctionsIntegrationFixture.cs +++ b/src/NHibernate.Test/Async/Criteria/Lambda/FunctionsIntegrationFixture.cs @@ -62,7 +62,6 @@ public async Task SqrtSingleOrDefaultAsync() } } - [Test] public async Task RoundDoubleWithOneArgumentAsync() { diff --git a/src/NHibernate.Test/Async/Criteria/ProjectionsTest.cs b/src/NHibernate.Test/Async/Criteria/ProjectionsTest.cs index c885d804f96..aca0e5d3660 100644 --- a/src/NHibernate.Test/Async/Criteria/ProjectionsTest.cs +++ b/src/NHibernate.Test/Async/Criteria/ProjectionsTest.cs @@ -197,7 +197,6 @@ public async Task UsingConditionalsAsync() .UniqueResultAsync()); Assert.AreEqual("yes", result); - result = await (session.CreateCriteria(typeof(Student)) .SetProjection( Projections.Conditional( @@ -222,7 +221,6 @@ public async Task UseInWithProjectionAsync() } } - [Test] public async Task UseLikeWithProjectionAsync() { @@ -271,7 +269,6 @@ public async Task UseEqWithProjectionAsync() } } - [Test] public async Task UseGtWithProjectionAsync() { diff --git a/src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs b/src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs index a93917d8a67..3900b598b5c 100644 --- a/src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs +++ b/src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs @@ -655,7 +655,6 @@ private static void MapList(IClassMapper rc, Express ckm.Name("ParentId"); }); km.ForeignKey("none"); - }); m.Cascade(Mapping.ByCode.Cascade.All); if (fetchMode != null) diff --git a/src/NHibernate.Test/Async/DialectTest/DialectFixture.cs b/src/NHibernate.Test/Async/DialectTest/DialectFixture.cs index 2fd3d53d33a..7cd23188f84 100644 --- a/src/NHibernate.Test/Async/DialectTest/DialectFixture.cs +++ b/src/NHibernate.Test/Async/DialectTest/DialectFixture.cs @@ -41,7 +41,6 @@ public class DialectFixtureAsync // be. protected string[] tableThatNeedsToBeQuoted; - [SetUp] public virtual void SetUp() { diff --git a/src/NHibernate.Test/Async/DriverTest/Sql2008DateTime2Test.cs b/src/NHibernate.Test/Async/DriverTest/Sql2008DateTime2Test.cs index 091bd489524..cf496863aab 100644 --- a/src/NHibernate.Test/Async/DriverTest/Sql2008DateTime2Test.cs +++ b/src/NHibernate.Test/Async/DriverTest/Sql2008DateTime2Test.cs @@ -74,6 +74,5 @@ public async Task CrudAsync() await (t.CommitAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/ExceptionsTest/SQLExceptionConversionTest.cs b/src/NHibernate.Test/Async/ExceptionsTest/SQLExceptionConversionTest.cs index 0ad016e2c01..d85dbce01a0 100644 --- a/src/NHibernate.Test/Async/ExceptionsTest/SQLExceptionConversionTest.cs +++ b/src/NHibernate.Test/Async/ExceptionsTest/SQLExceptionConversionTest.cs @@ -80,7 +80,6 @@ protected override void Configure(Cfg.Configuration configuration) [Test] public async Task IntegrityViolationAsync() { - //ISQLExceptionConverter converter = Dialect.BuildSQLExceptionConverter(); ISQLExceptionConverter converter = Sfi.Settings.SqlExceptionConverter; diff --git a/src/NHibernate.Test/Async/ExpressionTest/Projection/ProjectionSqlFixture.cs b/src/NHibernate.Test/Async/ExpressionTest/Projection/ProjectionSqlFixture.cs index 50ec21d53b2..86b59bbe491 100644 --- a/src/NHibernate.Test/Async/ExpressionTest/Projection/ProjectionSqlFixture.cs +++ b/src/NHibernate.Test/Async/ExpressionTest/Projection/ProjectionSqlFixture.cs @@ -92,7 +92,7 @@ public async Task QueryTest1Async() .Add(Projections.Max("Pay")) .Add(Projections.Min("Pay"))) ; - IList result = await (c.ListAsync());// c.UniqueResult(); + IList result = await (c.ListAsync()); // c.UniqueResult(); Assert.IsTrue(result.Count == 1, "More than one record was found, while just one was expected"); Assert.IsTrue(result[0] is object[], "expected object[] as result, but found " + result[0].GetType().Name); @@ -116,7 +116,7 @@ public async Task SelectSqlProjectionTestAsync() new string[] { "MyPay" }, new IType[] { NHibernateUtil.Double }))); - IList result = await (c.ListAsync());// c.UniqueResult(); + IList result = await (c.ListAsync()); // c.UniqueResult(); Assert.IsTrue(result.Count == 1); object results = result[0]; Assert.AreEqual(results, 2.5); diff --git a/src/NHibernate.Test/Async/ExpressionTest/QueryByExampleTest.cs b/src/NHibernate.Test/Async/ExpressionTest/QueryByExampleTest.cs index 5d6204f408d..4c734ef7bd9 100644 --- a/src/NHibernate.Test/Async/ExpressionTest/QueryByExampleTest.cs +++ b/src/NHibernate.Test/Async/ExpressionTest/QueryByExampleTest.cs @@ -110,7 +110,6 @@ public async Task TestJunctionNotExpressionQBEAsync() ICriteria crit = s.CreateCriteria(typeof(Componentizable)); Example ex = Example.Create(master).EnableLike(); - crit.Add(Expression.Or(Expression.Not(ex), ex)); IList result = await (crit.ListAsync()); @@ -202,4 +201,4 @@ private Componentizable GetMaster(String name, String subName, String subName1) return master; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs b/src/NHibernate.Test/Async/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs index b5e7c9b38a5..f8ccfdb53f4 100644 --- a/src/NHibernate.Test/Async/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs +++ b/src/NHibernate.Test/Async/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs @@ -56,7 +56,6 @@ protected override void OnSetUp() comment.IndexInPost = 0; post1.Comments.Add(comment); - session.Save(category); session.Save(author); session.Save(commenter); @@ -116,4 +115,4 @@ public async Task ComplexSubQuery_QueryingByGrandChildrenAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs b/src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs index 244678c5c05..a971ec6d132 100644 --- a/src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs +++ b/src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs @@ -195,7 +195,6 @@ private static void AssertFetchProperty(Person person) #endregion - #region FetchComponentAndFormulaTwoQueryReadOnly [TestCase(true)] @@ -342,7 +341,6 @@ public async Task TestLinqFetchFormulaAndManyToOneComponentAsync() .Fetch(o => o.Formula) .Fetch(o => o.BestFriend).ThenFetch(o => o.Address) .FirstOrDefaultAsync(o => o.Id == 1)); - } AssertFetchFormulaAndManyToOneComponent(person); diff --git a/src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs b/src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs index 85853191c30..96d43ef72d0 100644 --- a/src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs +++ b/src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs @@ -199,7 +199,6 @@ public async Task CriteriaQueryFiltersAsync() } } - [Test] public async Task CriteriaControlAsync() { @@ -294,7 +293,6 @@ public async Task CriteriaSubqueryWithFiltersAsync() Assert.That(orders.Count, Is.EqualTo(1), "Incorrect orders count"); - log.Info("query against Order with a subquery for line items with a subquery line items where the product name is Acme Hair Gel and the quantity is greater than 1 in a given region and the product is effective as of 4 months ago"); session.EnableFilter("region").SetParameter("region", "APAC"); session.EnableFilter("effectiveDate").SetParameter("asOfDate", testData.fourMonthsAgo.Date); @@ -310,7 +308,6 @@ public async Task CriteriaSubqueryWithFiltersAsync() } } - [Test] public async Task GetFiltersAsync() { @@ -826,7 +823,6 @@ public void Prepare() using (var session = outer.OpenSession()) using (var transaction = session.BeginTransaction()) { - foreach (var obj in entitiesToCleanUp) { await (session.DeleteAsync(obj, cancellationToken)); @@ -841,7 +837,6 @@ public void Release() using (var session = outer.OpenSession()) using (var transaction = session.BeginTransaction()) { - foreach (var obj in entitiesToCleanUp) { session.Delete(obj); diff --git a/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs b/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs index 2582546c369..374ff186bc6 100644 --- a/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs +++ b/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs @@ -50,12 +50,10 @@ public async Task CanUseFutureCriteriaAsync() { foreach (var person in await (persons5.GetEnumerableAsync())) { - } foreach (var person in await (persons10.GetEnumerableAsync())) { - } var events = logSpy.Appender.GetEvents(); @@ -112,7 +110,6 @@ public async Task CanCombineSingleFutureValueWithEnumerableFuturesAsync() foreach (var person in await (persons.GetEnumerableAsync())) { - } var events = logSpy.Appender.GetEvents(); diff --git a/src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs b/src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs index 47b3cf8e2c3..0a9a2ba4be4 100644 --- a/src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs +++ b/src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs @@ -63,12 +63,10 @@ public async Task CanUseFutureQueryAsync() { foreach (var person in await (persons5.GetEnumerableAsync())) { - } foreach (var person in await (persons10.GetEnumerableAsync())) { - } var events = logSpy.Appender.GetEvents(); diff --git a/src/NHibernate.Test/Async/Futures/FutureQueryOverFixture.cs b/src/NHibernate.Test/Async/Futures/FutureQueryOverFixture.cs index 12acab5f3d1..2646203cf33 100644 --- a/src/NHibernate.Test/Async/Futures/FutureQueryOverFixture.cs +++ b/src/NHibernate.Test/Async/Futures/FutureQueryOverFixture.cs @@ -17,7 +17,6 @@ namespace NHibernate.Test.Futures [TestFixture] public class FutureQueryOverFixtureAsync : FutureFixture { - protected override void OnSetUp() { base.OnSetUp(); @@ -141,7 +140,6 @@ public async Task CanCombineSingleFutureValueWithEnumerableFuturesAsync() foreach (var person in await (persons.GetEnumerableAsync())) { - } var events = logSpy.Appender.GetEvents(); diff --git a/src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs b/src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs index bab0ca692ca..57ade75dcb2 100644 --- a/src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs +++ b/src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs @@ -260,7 +260,6 @@ public async Task CanUseFutureFetchQueryAsync() using (var logSpy = new SqlLogSpy()) { - Assert.That((await (persons.GetEnumerableAsync())).Any(x => x.Children.Any()), "No children found"); Assert.That((await (persons10.GetEnumerableAsync())).Any(x => x.Children.Any()), "No children found"); diff --git a/src/NHibernate.Test/Async/Futures/QueryBatchFixture.cs b/src/NHibernate.Test/Async/Futures/QueryBatchFixture.cs index 1c4a39aae97..d5699d322a5 100644 --- a/src/NHibernate.Test/Async/Futures/QueryBatchFixture.cs +++ b/src/NHibernate.Test/Async/Futures/QueryBatchFixture.cs @@ -205,7 +205,6 @@ public async Task SameCollectionFetchesAsync() Assert.That(NHibernateUtil.IsInitialized(parent), Is.True); Assert.That(NHibernateUtil.IsInitialized(parent.ChildrenList), Is.True); Assert.That(parent.ChildrenList.Count, Is.EqualTo(2)); - } } diff --git a/src/NHibernate.Test/Async/Generatedkeys/Select/SelectGeneratorTest.cs b/src/NHibernate.Test/Async/Generatedkeys/Select/SelectGeneratorTest.cs index c7eb168df5c..abb88c3939d 100644 --- a/src/NHibernate.Test/Async/Generatedkeys/Select/SelectGeneratorTest.cs +++ b/src/NHibernate.Test/Async/Generatedkeys/Select/SelectGeneratorTest.cs @@ -48,6 +48,5 @@ public async Task GetGeneratedKeysSupportAsync() await (session.Transaction.CommitAsync()); session.Close(); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/GenericTest/BagGeneric/BagGenericFixture.cs b/src/NHibernate.Test/Async/GenericTest/BagGeneric/BagGenericFixture.cs index 22dcf9ca779..3c5d006f245 100644 --- a/src/NHibernate.Test/Async/GenericTest/BagGeneric/BagGenericFixture.cs +++ b/src/NHibernate.Test/Async/GenericTest/BagGeneric/BagGenericFixture.cs @@ -19,7 +19,6 @@ namespace NHibernate.Test.GenericTest.BagGeneric [TestFixture] public class BagGenericFixtureAsync : TestCase { - protected override string[] Mappings { get { return new string[] { "GenericTest.BagGeneric.BagGenericFixture.hbm.xml" }; } diff --git a/src/NHibernate.Test/Async/GenericTest/ListGeneric/ListGenericFixture.cs b/src/NHibernate.Test/Async/GenericTest/ListGeneric/ListGenericFixture.cs index c633d6b18d5..5440614c613 100644 --- a/src/NHibernate.Test/Async/GenericTest/ListGeneric/ListGenericFixture.cs +++ b/src/NHibernate.Test/Async/GenericTest/ListGeneric/ListGenericFixture.cs @@ -20,7 +20,6 @@ namespace NHibernate.Test.GenericTest.ListGeneric [TestFixture] public class ListGenericFixtureAsync : TestCase { - protected override string[] Mappings { get { return new string[] { "GenericTest.ListGeneric.ListGenericFixture.hbm.xml" }; } diff --git a/src/NHibernate.Test/Async/GenericTest/Overall/Fixture.cs b/src/NHibernate.Test/Async/GenericTest/Overall/Fixture.cs index 3b345242e9d..1160fe8aef2 100644 --- a/src/NHibernate.Test/Async/GenericTest/Overall/Fixture.cs +++ b/src/NHibernate.Test/Async/GenericTest/Overall/Fixture.cs @@ -79,5 +79,4 @@ public async Task CRUDABAsync() } } } - } diff --git a/src/NHibernate.Test/Async/GenericTest/SetGeneric/SetGenericFixture.cs b/src/NHibernate.Test/Async/GenericTest/SetGeneric/SetGenericFixture.cs index 684ecbdfe34..e04a5476262 100644 --- a/src/NHibernate.Test/Async/GenericTest/SetGeneric/SetGenericFixture.cs +++ b/src/NHibernate.Test/Async/GenericTest/SetGeneric/SetGenericFixture.cs @@ -20,7 +20,6 @@ namespace NHibernate.Test.GenericTest.SetGeneric [TestFixture] public class SetGenericFixtureAsync : TestCase { - protected override string[] Mappings { get { return new string[] { "GenericTest.SetGeneric.SetGenericFixture.hbm.xml" }; } diff --git a/src/NHibernate.Test/Async/GhostProperty/GhostPropertyFixture.cs b/src/NHibernate.Test/Async/GhostProperty/GhostPropertyFixture.cs index 85d00197b0e..12ab309a529 100644 --- a/src/NHibernate.Test/Async/GhostProperty/GhostPropertyFixture.cs +++ b/src/NHibernate.Test/Async/GhostProperty/GhostPropertyFixture.cs @@ -59,7 +59,6 @@ protected override void OnSetUp() }); tx.Commit(); } - } protected override void OnTearDown() diff --git a/src/NHibernate.Test/Async/Hql/Ast/BulkManipulation.cs b/src/NHibernate.Test/Async/Hql/Ast/BulkManipulation.cs index 15d04cf3bac..985f829144f 100644 --- a/src/NHibernate.Test/Async/Hql/Ast/BulkManipulation.cs +++ b/src/NHibernate.Test/Async/Hql/Ast/BulkManipulation.cs @@ -103,7 +103,6 @@ public async Task SimpleInsertFromAggregateAsync() await (data.CleanupAsync()); } - [Test] public async Task InsertWithManyToOneAsync() { diff --git a/src/NHibernate.Test/Async/Hql/Ast/HqlFixture.cs b/src/NHibernate.Test/Async/Hql/Ast/HqlFixture.cs index b397e9412b4..6b64ac1c627 100644 --- a/src/NHibernate.Test/Async/Hql/Ast/HqlFixture.cs +++ b/src/NHibernate.Test/Async/Hql/Ast/HqlFixture.cs @@ -289,7 +289,6 @@ public async Task InsertIntoFromSelect_WithSelectClauseParametersAsync() } } - [Test] public async Task UnaryMinusBeforeParenthesesHandledCorrectlyAsync() { @@ -310,4 +309,4 @@ public async Task UnaryMinusBeforeParenthesesHandledCorrectlyAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/Hql/Ast/OrderByTest.cs b/src/NHibernate.Test/Async/Hql/Ast/OrderByTest.cs index 49704e951ba..5bff80a1d9f 100644 --- a/src/NHibernate.Test/Async/Hql/Ast/OrderByTest.cs +++ b/src/NHibernate.Test/Async/Hql/Ast/OrderByTest.cs @@ -367,7 +367,6 @@ private async Task CheckTestOrderByResultAsync(object result, Zoo zooExpected, HashSet zoosUnordered, CancellationToken cancellationToken = default(CancellationToken)) { - Assert.IsInstanceOf(result); var resultArray = (object[]) result; Assert.AreEqual(2, resultArray.Length); @@ -388,7 +387,6 @@ private async Task CheckTestOrderByResultAsync(object result, } } - private class TestData { private readonly OrderByTestAsync tc; @@ -651,4 +649,4 @@ public void Cleanup() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs b/src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs index 17b11403da4..c573a7666a8 100644 --- a/src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs +++ b/src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs @@ -213,7 +213,6 @@ public async Task EntityJoinWithEntityAssociationComparison2ShouldAddJoinAsync() } } - [Test] public async Task WithClauseOnOtherAssociationAsync() { @@ -294,10 +293,8 @@ protected override HbmMapping GetMappings() rc.ManyToOne(ep => ep.SameTypeChild, m => m.Column("SameTypeChildId")); rc.ManyToOne(ep => ep.SameTypeChild2, m => m.Column("SameTypeChild2Id")); - }); - mapper.Class( rc => { @@ -338,7 +335,6 @@ protected override HbmMapping GetMappings() rc.Property(e => e.Composite1Key1); rc.Property(e => e.Composite1Key2); rc.Property(e => e.CustomEntityNameId); - }); mapper.Class( @@ -382,7 +378,6 @@ protected override void OnSetUp() { Name = "ComplexEntityChild2" } - }; _entityWithCompositeId = new EntityWithCompositeId diff --git a/src/NHibernate.Test/Async/Hql/HQLFunctions.cs b/src/NHibernate.Test/Async/Hql/HQLFunctions.cs index 74df40cd536..fa16f2ca8c9 100644 --- a/src/NHibernate.Test/Async/Hql/HQLFunctions.cs +++ b/src/NHibernate.Test/Async/Hql/HQLFunctions.cs @@ -215,8 +215,7 @@ public void AggregatesAndMathNH959Async() Assert.DoesNotThrowAsync(() => s.CreateQuery("select a.Id, sum(BodyWeight)/avg(BodyWeight) from Animal a group by a.Id having sum(BodyWeight)>0").ListAsync()); } } - - + [Test] public async Task SubStringTwoParametersAsync() { @@ -257,8 +256,7 @@ public async Task SubStringTwoParametersAsync() Assert.AreEqual("abcdef", result.Description); } } - - + [Test] public async Task SubStringAsync() { @@ -283,7 +281,6 @@ public async Task SubStringAsync() .UniqueResultAsync()); Assert.AreEqual("abcdef", result.Description); - // Following tests verify that parameters can be used. hql = "from Animal a where substring(a.Description, 2, ?) = 'bcd'"; @@ -292,7 +289,6 @@ public async Task SubStringAsync() .UniqueResultAsync()); Assert.AreEqual("abcdef", result.Description); - hql = "from Animal a where substring(a.Description, ?, ?) = ?"; result = (Animal)await (s.CreateQuery(hql) .SetParameter(0, 2) diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/OptimizerTests.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/OptimizerTests.cs index 49d72dc7ac4..e7e5c23fad0 100644 --- a/src/NHibernate.Test/Async/IdGen/Enhanced/OptimizerTests.cs +++ b/src/NHibernate.Test/Async/IdGen/Enhanced/OptimizerTests.cs @@ -40,7 +40,7 @@ public async Task TestBasicNoOptimizerUsageAsync() long next = (long)await (optimizer.GenerateAsync(sequence, CancellationToken.None)); Assert.That(next, Is.EqualTo(i)); } - Assert.That(sequence.TimesCalled, Is.EqualTo(11)); // an extra time to get to 1 initially + Assert.That(sequence.TimesCalled, Is.EqualTo(11)); // an extra time to get to 1 initially Assert.That(sequence.CurrentValue, Is.EqualTo(10)); } @@ -67,7 +67,6 @@ public async Task TestBasicHiLoOptimizerUsageAsync() Assert.That(sequence.TimesCalled, Is.EqualTo(2)); Assert.That(sequence.CurrentValue, Is.EqualTo(2)); - // test historic table behavior, where the initial values started at 0 (we now force 1 to be the first used id value) sequence = new SourceMock(0); optimizer = OptimizerFactory.BuildOptimizer(OptimizerFactory.HiLo, typeof(long), increment, -1); @@ -251,4 +250,4 @@ public async Task TestRecoveredPooledLoOptimizerUsageAsync() Assert.That(sequence.CurrentValue, Is.EqualTo(4)); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/BasicTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/BasicTableTest.cs index 960228e6528..3ca65376d2d 100644 --- a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/BasicTableTest.cs +++ b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/BasicTableTest.cs @@ -28,7 +28,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - [Test] public async Task TestNormalBoundaryAsync() { @@ -52,12 +51,10 @@ public async Task TestNormalBoundaryAsync() Assert.That(entities[i].Id, Is.EqualTo(expectedId)); Assert.That(generator.TableAccessCount, Is.EqualTo(expectedId)); Assert.That(generator.Optimizer.LastSourceValue, Is.EqualTo(expectedId)); - } await (transaction.CommitAsync()); } - using (ITransaction transaction = s.BeginTransaction()) { for (int i = 0; i < count; i++) diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs index 048aba891c8..962460f90e0 100644 --- a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs +++ b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs @@ -65,7 +65,6 @@ public async Task TestNormalBoundaryAsync() await (transaction.CommitAsync()); } - using (ITransaction transaction = s.BeginTransaction()) { for (int i = 0; i < entities.Length; i++) diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs index 5be6374f66f..d721443bdd6 100644 --- a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs +++ b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs @@ -28,7 +28,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - [Test] public async Task TestNormalBoundaryAsync() { @@ -51,7 +50,7 @@ public async Task TestNormalBoundaryAsync() entities[i] = new Entity("" + (i + 1)); await (s.SaveAsync(entities[i])); Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization - Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization + Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization Assert.That(optimizer.LastValue, Is.EqualTo(i + 1)); } diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs index 83e5bd20315..00c921da834 100644 --- a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs +++ b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs @@ -28,7 +28,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - [Test] public async Task TestNormalBoundaryAsync() { @@ -51,7 +50,7 @@ public async Task TestNormalBoundaryAsync() entities[i] = new Entity("" + (i + 1)); await (s.SaveAsync(entities[i])); Assert.That(generator.TableAccessCount, Is.EqualTo(2)); // initialization calls seq twice - Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice + Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice Assert.That(optimizer.LastValue, Is.EqualTo(i + 1)); } diff --git a/src/NHibernate.Test/Async/IdTest/AssignedFixture.cs b/src/NHibernate.Test/Async/IdTest/AssignedFixture.cs index 42a417f7851..06fc3e6ec09 100644 --- a/src/NHibernate.Test/Async/IdTest/AssignedFixture.cs +++ b/src/NHibernate.Test/Async/IdTest/AssignedFixture.cs @@ -17,11 +17,9 @@ namespace NHibernate.Test.IdTest { using System.Threading.Tasks; - [TestFixture] public class AssignedFixtureAsync : IdFixtureBase { - private string[] GetAssignedIdentifierWarnings(LogSpy ls) { List warnings = new List(); @@ -260,7 +258,5 @@ public async Task InsertCascadeNoWarningAsync() Assert.That(warnings.Length, Is.EqualTo(0)); } } - } - } diff --git a/src/NHibernate.Test/Async/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs b/src/NHibernate.Test/Async/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs index 44b2fb38c30..a5e9222fd42 100644 --- a/src/NHibernate.Test/Async/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs +++ b/src/NHibernate.Test/Async/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs @@ -496,7 +496,7 @@ public async Task CreateWithNonEmptyManyToManyCollectionMergeWithNewElementAsync s.Close(); AssertInsertCount(1); - AssertUpdateCount(isContractVersioned && isPlanVersioned ? 1 : 0); // NH-specific: Hibernate issues a separate UPDATE for the version number + AssertUpdateCount(isContractVersioned && isPlanVersioned ? 1 : 0); // NH-specific: Hibernate issues a separate UPDATE for the version number ClearCounts(); s = OpenSession(); diff --git a/src/NHibernate.Test/Async/Immutable/ImmutableTest.cs b/src/NHibernate.Test/Async/Immutable/ImmutableTest.cs index e1294c54f7b..b75063bd44e 100644 --- a/src/NHibernate.Test/Async/Immutable/ImmutableTest.cs +++ b/src/NHibernate.Test/Async/Immutable/ImmutableTest.cs @@ -1050,7 +1050,6 @@ public async Task ImmutableParentEntityWithMergeAsync() AssertUpdateCount(0); AssertDeleteCount(3); - } [Test] diff --git a/src/NHibernate.Test/Async/Insertordering/AnimalModel/Fixture.cs b/src/NHibernate.Test/Async/Insertordering/AnimalModel/Fixture.cs index e50771bd5f5..15aa084e180 100644 --- a/src/NHibernate.Test/Async/Insertordering/AnimalModel/Fixture.cs +++ b/src/NHibernate.Test/Async/Insertordering/AnimalModel/Fixture.cs @@ -7,7 +7,6 @@ // //------------------------------------------------------------------------------ - using System.Collections; using NHibernate.Cfg; using NUnit.Framework; diff --git a/src/NHibernate.Test/Async/Insertordering/FamilyModel/Fixture.cs b/src/NHibernate.Test/Async/Insertordering/FamilyModel/Fixture.cs index c60b2cfe24b..1f109a259df 100644 --- a/src/NHibernate.Test/Async/Insertordering/FamilyModel/Fixture.cs +++ b/src/NHibernate.Test/Async/Insertordering/FamilyModel/Fixture.cs @@ -7,7 +7,6 @@ // //------------------------------------------------------------------------------ - using System.Collections; using System.Linq; using NHibernate.Cfg; diff --git a/src/NHibernate.Test/Async/Insertordering/InsertOrderingFixture.cs b/src/NHibernate.Test/Async/Insertordering/InsertOrderingFixture.cs index b41af58320a..64c56a92cbf 100644 --- a/src/NHibernate.Test/Async/Insertordering/InsertOrderingFixture.cs +++ b/src/NHibernate.Test/Async/Insertordering/InsertOrderingFixture.cs @@ -7,7 +7,6 @@ // //------------------------------------------------------------------------------ - using System; using System.Collections; using System.Collections.Generic; @@ -678,22 +677,8 @@ public IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor } public partial class InsertOrderingFixture : TestCase { - - - - - - - - - - - - - public partial class StatsBatcher : SqlClientBatchingBatcher { - public override async System.Threading.Tasks.Task PrepareBatchCommandAsync(CommandType type, SqlString sql, SqlType[] parameterTypes, CancellationToken cancellationToken) { var result = await (base.PrepareBatchCommandAsync(type, sql, parameterTypes, cancellationToken)); @@ -730,6 +715,5 @@ protected override System.Threading.Tasks.Task DoExecuteBatchAsync(DbCommand ps, } } - } } diff --git a/src/NHibernate.Test/Async/Join/JoinTest.cs b/src/NHibernate.Test/Async/Join/JoinTest.cs index 9a9ee0185fe..855b74f3968 100644 --- a/src/NHibernate.Test/Async/Join/JoinTest.cs +++ b/src/NHibernate.Test/Async/Join/JoinTest.cs @@ -442,7 +442,6 @@ private Employee CreateEmployee(string name, string title) return result; } - [Test] public async Task TestSimpleInsertAndRetrieveEmployeeAsync() { @@ -585,4 +584,4 @@ public async Task PolymorphicGetByTypeofSuperclassAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs b/src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs index 4ec41663136..4c680979d39 100644 --- a/src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs +++ b/src/NHibernate.Test/Async/LazyGroup/LazyGroupFixture.cs @@ -224,7 +224,6 @@ private static Person GeneratePerson(int i) Image = new byte[i], NickName = $"NickName{i}" }; - } } } diff --git a/src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs b/src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs index 3b4405eb6a7..e0252e2647b 100644 --- a/src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs +++ b/src/NHibernate.Test/Async/LazyProperty/LazyPropertyFixture.cs @@ -73,7 +73,6 @@ protected override void OnSetUp() }); tx.Commit(); } - } protected override void OnTearDown() @@ -325,7 +324,6 @@ public async Task CacheShouldNotContainLazyPropertiesAsync() using (var s = OpenSession()) using (var tx = s.BeginTransaction()) { - book = await (s.CreateQuery("from Book b fetch all properties where b.Id = :id") .SetParameter("id", 1) .UniqueResultAsync()); @@ -338,7 +336,6 @@ public async Task CacheShouldNotContainLazyPropertiesAsync() using (var s = OpenSession()) using (var tx = s.BeginTransaction()) { - book = await (s.GetAsync(1)); await (tx.CommitAsync()); } @@ -372,7 +369,6 @@ public async Task CanMergeTransientWithLazyPropertyInCollectionAsync() Assert.That(book, Is.Not.Null); Assert.That(book.Name, Is.EqualTo("some name two")); Assert.That(book.ALotOfText, Is.EqualTo("a lot of text two...")); - } using (var s = OpenSession()) using (var tx = s.BeginTransaction()) diff --git a/src/NHibernate.Test/Async/Legacy/CriteriaTest.cs b/src/NHibernate.Test/Async/Legacy/CriteriaTest.cs index e5b79d45bda..db7b2370a4c 100644 --- a/src/NHibernate.Test/Async/Legacy/CriteriaTest.cs +++ b/src/NHibernate.Test/Async/Legacy/CriteriaTest.cs @@ -179,6 +179,5 @@ public async Task CriteriaLeftOuterJoinAsync() await (s.FlushAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/Legacy/FooBarTest.cs b/src/NHibernate.Test/Async/Legacy/FooBarTest.cs index 0b1211a7068..282c2b6754f 100644 --- a/src/NHibernate.Test/Async/Legacy/FooBarTest.cs +++ b/src/NHibernate.Test/Async/Legacy/FooBarTest.cs @@ -452,7 +452,6 @@ public async Task QueryAsync() list = await (s.CreateQuery("select foo, bar from Foo foo left outer join foo.TheFoo bar where foo = ?") .SetEntity(0, foo).ListAsync()); - object[] row1 = (object[]) list[0]; Assert.IsTrue(row1[0] == foo && row1[1] == foo2); @@ -611,7 +610,6 @@ public async Task QueryAsync() enumerable = await (s.CreateQuery( "select foo.Component.Name, elements(foo.Component.ImportantDates) from foo in class Foo where foo.TheFoo.id=?"). SetString(0, foo.TheFoo.Key).EnumerableAsync()); - int i = 0; foreach (object[] row in enumerable) @@ -1017,7 +1015,6 @@ public async Task NonlazyCollectionsAsync() } } - [Test] public async Task ReuseDeletedCollectionAsync() { @@ -1266,7 +1263,6 @@ public async Task FetchInitializedCollectionAsync() s.Close(); } - [Test] public async Task LateCollectionAddAsync() { @@ -1329,7 +1325,6 @@ public async Task UpdateAsync() s.Close(); } - [Test] public async Task ListRemoveAsync() { @@ -1475,7 +1470,6 @@ public async Task SortablesAsync() s.Close(); } - [Test] public async Task FetchListAsync() { @@ -1503,7 +1497,6 @@ public async Task FetchListAsync() s.Close(); } - [Test] public async Task BagOneToManyAsync() { @@ -1527,7 +1520,6 @@ public async Task BagOneToManyAsync() s.Close(); } - [Test] public async Task QueryLockModeAsync() { @@ -1602,7 +1594,6 @@ public async Task QueryLockModeAsync() s.Close(); } - [Test] public async Task ManyToManyBagAsync() { @@ -1629,7 +1620,6 @@ public async Task ManyToManyBagAsync() s.Close(); } - [Test] public async Task IdBagAsync() { @@ -1689,7 +1679,6 @@ public async Task IdBagAsync() s.Close(); } - [Test] public async Task ForceOuterJoinAsync() { @@ -1726,7 +1715,6 @@ public async Task ForceOuterJoinAsync() s.Close(); } - [Test] public async Task EmptyCollectionAsync() { @@ -1747,7 +1735,6 @@ public async Task EmptyCollectionAsync() s.Close(); } - [Test] public async Task OneToOneGeneratorAsync() { @@ -1768,7 +1755,6 @@ public async Task OneToOneGeneratorAsync() Assert.AreEqual(x.Id, y.Id); - s = OpenSession(); x = new X(); y = new Y(); @@ -1784,7 +1770,6 @@ public async Task OneToOneGeneratorAsync() Assert.AreEqual(x.Id, y.Id); - s = OpenSession(); x = new X(); y = new Y(); @@ -1816,7 +1801,6 @@ public async Task OneToOneGeneratorAsync() s.Close(); } - [Test] public async Task LimitAsync() { @@ -1846,7 +1830,6 @@ public async Task LimitAsync() s.Close(); } - [Test] public async Task CustomAsync() { @@ -1879,7 +1862,6 @@ public async Task CustomAsync() s.Close(); } - [Test] public async Task SaveAddDeleteAsync() { @@ -1895,7 +1877,6 @@ public async Task SaveAddDeleteAsync() s.Close(); } - [Test] public async Task NamedParamsAsync() { @@ -2089,7 +2070,6 @@ public async Task FindByCriteriaAsync() Assert.IsTrue(list.Count == 1 && list[0] == f); - list = await (s.CreateCriteria(typeof(Foo)) .SetMaxResults(5) .AddOrder(Order.Asc("Date")) @@ -2137,7 +2117,6 @@ public async Task FindByCriteriaAsync() s.Close(); } - [Test] public async Task AfterDeleteAsync() { @@ -2152,7 +2131,6 @@ public async Task AfterDeleteAsync() s.Close(); } - [Test] public async Task CollectionWhereAsync() { @@ -2191,7 +2169,6 @@ public async Task CollectionWhereAsync() s.Close(); } - [Test] public async Task ComponentParentAsync() { @@ -2223,7 +2200,6 @@ public async Task ComponentParentAsync() s.Close(); } - [Test] public async Task CollectionCacheAsync() { @@ -2246,7 +2222,6 @@ public async Task CollectionCacheAsync() s.Close(); } - [Test] //[Ignore("TimeZone Portions commented out - http://nhibernate.jira.com/browse/NH-88")] public async Task AssociationIdAsync() @@ -2292,7 +2267,6 @@ public async Task AssociationIdAsync() NHibernateUtil.String }; - //IList results = s.List( hqlString, values, types ); IQuery q = s.CreateQuery(hqlString); for (int i = 0; i < values.Length; i++) @@ -2319,7 +2293,6 @@ public async Task AssociationIdAsync() results = await (q.ListAsync()); Assert.AreEqual(1, results.Count); - hqlString = "from s in class Stuff where s.Foo.String is not null"; await (s.CreateQuery(hqlString).ListAsync()); @@ -2362,7 +2335,6 @@ public async Task AssociationIdAsync() } } - [Test] public async Task CascadeSaveAsync() { @@ -2389,7 +2361,6 @@ public async Task CascadeSaveAsync() s.Close(); } - [Test] public async Task CompositeKeyPathExpressionsAsync() { @@ -2420,7 +2391,6 @@ public async Task CompositeKeyPathExpressionsAsync() s.Close(); } - [Test] public async Task CollectionsInSelectAsync() { @@ -2457,7 +2427,6 @@ public async Task CollectionsInSelectAsync() Assert.AreEqual(1, r.Count); Assert.AreEqual(foos[1].Long, r.Amount); - list = await (s.CreateQuery( "select new Result( baz.Name, max(foo.Long), count(foo) ) from Baz baz join baz.FooArray foo group by baz.Name"). @@ -2557,7 +2526,6 @@ public async Task CollectionsInSelectAsync() s.Close(); } - [Test] public async Task NewFlushingAsync() { @@ -2640,7 +2608,6 @@ public async Task NewFlushingAsync() s.Close(); } - [Test] public async Task PersistCollectionsAsync() { @@ -2688,7 +2655,6 @@ public async Task PersistCollectionsAsync() list = await (s.CreateQuery( "select foo from foo in class NHibernate.DomainModel.Foo, baz in class NHibernate.DomainModel.Baz where foo in elements(baz.FooArray) and 3 = some elements(baz.IntArray) and 4 > all indices(baz.IntArray)") .ListAsync()); - Assert.AreEqual(2, list.Count, "collection.elements find"); } @@ -2916,7 +2882,6 @@ public async Task PersistCollectionsAsync() s.Close(); } - [Test] public async Task SaveFlushAsync() { @@ -2936,7 +2901,6 @@ public async Task SaveFlushAsync() s.Close(); } - [Test] public async Task CreateUpdateAsync() { @@ -2970,7 +2934,6 @@ public async Task CreateUpdateAsync() s.Close(); } - [Test] public async Task UpdateCollectionsAsync() { @@ -3038,7 +3001,6 @@ public async Task UpdateCollectionsAsync() s.Close(); } - [Test] public async Task LoadAsync() { @@ -3067,7 +3029,6 @@ public async Task LoadAsync() s.Close(); } - [Test] public async Task CreateAsync() { @@ -3087,7 +3048,6 @@ public async Task CreateAsync() s.Close(); } - [Test] public async Task CallbackAsync() { @@ -3125,7 +3085,6 @@ public async Task CallbackAsync() s.Close(); } - [Test] public async Task PolymorphismAsync() { @@ -3145,7 +3104,6 @@ public async Task PolymorphismAsync() s.Close(); } - [Test] public async Task RemoveContainsAsync() { @@ -3168,7 +3126,6 @@ public async Task RemoveContainsAsync() s.Close(); } - [Test] public async Task CollectionOfSelfAsync() { @@ -3209,7 +3166,6 @@ public async Task CollectionOfSelfAsync() s.Close(); } - [Test] public async Task FindAsync() { @@ -3284,8 +3240,7 @@ public async Task FindAsync() await (txn.CommitAsync()); s.Close(); } - - + [Test] public async Task DeleteRecursiveAsync() { @@ -3302,8 +3257,7 @@ public async Task DeleteRecursiveAsync() await (s.FlushAsync()); s.Close(); } - - + [Test] public async Task ReachabilityAsync() { @@ -3426,8 +3380,7 @@ public async Task ReachabilityAsync() await (s.FlushAsync()); s.Close(); } - - + [Test] public async Task PersistentLifecycleAsync() { @@ -3453,8 +3406,7 @@ public async Task PersistentLifecycleAsync() await (s.FlushAsync()); s.Close(); } - - + [Test] public async Task EnumerableAsync() { @@ -3791,7 +3743,6 @@ public async Task VersionedCollectionsAsync() s.Close(); } - [Test] public async Task RecursiveLoadAsync() { @@ -3994,7 +3945,6 @@ public async Task MultiColumnQueriesAsync() s.Close(); } - [Test] public async Task DeleteTransientAsync() { @@ -4219,7 +4169,6 @@ public async Task UpdateFromTransientAsync() s.Close(); } - [Test] public async Task ArraysOfTimesAsync() { @@ -4297,7 +4246,6 @@ public async Task ComponentsAsync() s.Close(); } - [Test] public async Task EnumAsync() { @@ -4363,8 +4311,7 @@ public async Task EnumAsync() await (s.FlushAsync()); s.Close(); } - - + [Test] public async Task NoForeignKeyViolationsAsync() { @@ -4933,7 +4880,6 @@ public async Task AutoFlushCollectionsAsync() e = (await (s.CreateQuery("select elements(baz.StringArray) from baz in class NHibernate.DomainModel.Baz").EnumerableAsync())). GetEnumerator(); - bool found = false; while (e.MoveNext()) @@ -5139,7 +5085,6 @@ public async Task LoadAfterDeleteAsync() s.Close(); } - [Test] public async Task ObjectTypeAsync() { @@ -5166,7 +5111,6 @@ public async Task ObjectTypeAsync() } } - [Test] public async Task AnyAsync() { diff --git a/src/NHibernate.Test/Async/Legacy/FumTest.cs b/src/NHibernate.Test/Async/Legacy/FumTest.cs index a63039aed4f..0c234e2b96f 100644 --- a/src/NHibernate.Test/Async/Legacy/FumTest.cs +++ b/src/NHibernate.Test/Async/Legacy/FumTest.cs @@ -547,7 +547,6 @@ public async Task CompositeIDsAsync() s.Close(); } - [Test] public async Task KeyManyToOneAsync() { @@ -599,7 +598,6 @@ public async Task KeyManyToOneAsync() s.Close(); } - [Test] public async Task CompositeKeyPathExpressionsAsync() { diff --git a/src/NHibernate.Test/Async/Legacy/MultiTableTest.cs b/src/NHibernate.Test/Async/Legacy/MultiTableTest.cs index d8b599db94a..f61cbeb88ff 100644 --- a/src/NHibernate.Test/Async/Legacy/MultiTableTest.cs +++ b/src/NHibernate.Test/Async/Legacy/MultiTableTest.cs @@ -40,7 +40,6 @@ public async Task FetchManyToOneAsync() s.Close(); } - [Test] public async Task JoinsAsync() { diff --git a/src/NHibernate.Test/Async/Legacy/SQLFunctionsTest.cs b/src/NHibernate.Test/Async/Legacy/SQLFunctionsTest.cs index ff9e5bf2d20..5acc3e36f8f 100644 --- a/src/NHibernate.Test/Async/Legacy/SQLFunctionsTest.cs +++ b/src/NHibernate.Test/Async/Legacy/SQLFunctionsTest.cs @@ -131,7 +131,6 @@ public async Task SetPropertiesAsync() s.Close(); } - [Test] public async Task BrokenAsync() { @@ -194,7 +193,6 @@ public async Task NothingToUpdateAsync() s.Close(); } - [Test] public async Task CachedQueryAsync() { diff --git a/src/NHibernate.Test/Async/Legacy/SQLLoaderTest.cs b/src/NHibernate.Test/Async/Legacy/SQLLoaderTest.cs index 7edc752c28d..fc607833a7c 100644 --- a/src/NHibernate.Test/Async/Legacy/SQLLoaderTest.cs +++ b/src/NHibernate.Test/Async/Legacy/SQLLoaderTest.cs @@ -370,7 +370,6 @@ public async Task EmbeddedCompositePropertiesAsync() Assert.IsTrue(list.Count == 1); - session.Clear(); query = diff --git a/src/NHibernate.Test/Async/Legacy/SimpleTest.cs b/src/NHibernate.Test/Async/Legacy/SimpleTest.cs index 2d1bc94c3a0..a810dbadf31 100644 --- a/src/NHibernate.Test/Async/Legacy/SimpleTest.cs +++ b/src/NHibernate.Test/Async/Legacy/SimpleTest.cs @@ -111,7 +111,6 @@ public async Task TestCRUDAsync() s4.Close(); } - [Test] public async Task SetPropertiesOnQueryAsync() { @@ -149,4 +148,4 @@ public async Task SetPropertiesOnQueryAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/Linq/ByMethod/GroupByTests.cs b/src/NHibernate.Test/Async/Linq/ByMethod/GroupByTests.cs index f405fda0f7c..7d55ec6b069 100644 --- a/src/NHibernate.Test/Async/Linq/ByMethod/GroupByTests.cs +++ b/src/NHibernate.Test/Async/Linq/ByMethod/GroupByTests.cs @@ -139,7 +139,6 @@ public async Task SingleKeyPropertyGroupAndOrderByProjectedCountAsync() AssertOrderedBy.Descending(orderCounts, oc => oc.OrderCount); } - [Test] public async Task SingleKeyPropertyGroupAndOrderByCountBeforeProjectionAsync() { @@ -902,7 +901,6 @@ public override int GetHashCode() } } - [Test(Description = "NH-3446"), KnownBug("NH-3446", "NHibernate.HibernateException")] public async Task GroupByOrderByKeySelectToClassAsync() { diff --git a/src/NHibernate.Test/Async/Linq/EnumTests.cs b/src/NHibernate.Test/Async/Linq/EnumTests.cs index 97a9354b36f..622a806ed30 100644 --- a/src/NHibernate.Test/Async/Linq/EnumTests.cs +++ b/src/NHibernate.Test/Async/Linq/EnumTests.cs @@ -32,7 +32,6 @@ public async Task CanQueryOnEnumStoredAsInt32_Unspecified_2Async() await (CanQueryOnEnumStoredAsInt32Async(EnumStoredAsInt32.Unspecified, 2)); } - public async Task CanQueryOnEnumStoredAsInt32Async(EnumStoredAsInt32 type, int expectedCount, CancellationToken cancellationToken = default(CancellationToken)) { var query = await ((from user in db.Users @@ -46,14 +45,12 @@ public async Task CanQueryOnEnumStoredAsInt32_Unspecified_2Async() public async Task CanQueryOnEnumStoredAsString_Meduim_2Async() { await (CanQueryOnEnumStoredAsStringAsync(EnumStoredAsString.Medium, 2)); - } [Test] public async Task CanQueryOnEnumStoredAsString_Small_1Async() { await (CanQueryOnEnumStoredAsStringAsync(EnumStoredAsString.Small, 1)); - } public async Task CanQueryOnEnumStoredAsStringAsync(EnumStoredAsString type, int expectedCount, CancellationToken cancellationToken = default(CancellationToken)) diff --git a/src/NHibernate.Test/Async/Linq/FunctionTests.cs b/src/NHibernate.Test/Async/Linq/FunctionTests.cs index df1606221ad..3097015a7e8 100644 --- a/src/NHibernate.Test/Async/Linq/FunctionTests.cs +++ b/src/NHibernate.Test/Async/Linq/FunctionTests.cs @@ -47,7 +47,6 @@ public async Task LikeFunctionWithEscapeCharacterAsync() await (session.SaveAsync(new Employee { FirstName = employeeName, LastName = "LastName" })); await (session.FlushAsync()); - var query = await ((from e in db.Employees where NHibernate.Linq.SqlMethods.Like(e.FirstName, employeeNameEscaped, escapeChar) select e).ToListAsync()); diff --git a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs index 45ebaa923ab..44fd7ef3cd8 100644 --- a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs +++ b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs @@ -1037,4 +1037,4 @@ group o by c into x await (ObjectDumper.WriteAsync(q)); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/Linq/LoggingTests.cs b/src/NHibernate.Test/Async/Linq/LoggingTests.cs index c47544dab35..8b4533304ff 100644 --- a/src/NHibernate.Test/Async/Linq/LoggingTests.cs +++ b/src/NHibernate.Test/Async/Linq/LoggingTests.cs @@ -39,7 +39,6 @@ public async Task PageBetweenProjectionsAsync() } } - [Test] public async Task CanLogLinqExpressionWithoutInitializingContainedProxyAsync() { diff --git a/src/NHibernate.Test/Async/Linq/ProjectionsTests.cs b/src/NHibernate.Test/Async/Linq/ProjectionsTests.cs index 9d25bac82cd..ecd7db50a9d 100644 --- a/src/NHibernate.Test/Async/Linq/ProjectionsTests.cs +++ b/src/NHibernate.Test/Async/Linq/ProjectionsTests.cs @@ -109,7 +109,6 @@ orderby user.Name Assert.AreEqual("nhibernate nhibernate", query[1].DoubleName); Assert.AreEqual("rahien rahien", query[2].DoubleName); - Assert.AreEqual(new DateTime(2010, 06, 17), query[0].RegisteredAt); Assert.AreEqual(new DateTime(2000, 1, 1), query[1].RegisteredAt); Assert.AreEqual(new DateTime(1998, 12, 31), query[2].RegisteredAt); @@ -127,7 +126,6 @@ orderby user.Id Assert.AreEqual("rahien", query[1].Key); Assert.AreEqual("nhibernate", query[2].Key); - Assert.AreEqual(new DateTime(2010, 06, 17), query[0].Value); Assert.AreEqual(new DateTime(1998, 12, 31), query[1].Value); Assert.AreEqual(new DateTime(2000, 1, 1), query[2].Value); @@ -144,7 +142,6 @@ orderby user.Id Assert.AreEqual("rahien", query[1].Name); Assert.AreEqual("nhibernate", query[2].Name); - Assert.AreEqual(new DateTime(2010, 06, 17), query[0].RegisteredAt); Assert.AreEqual(new DateTime(1998, 12, 31), query[1].RegisteredAt); Assert.AreEqual(new DateTime(2000, 1, 1), query[2].RegisteredAt); @@ -523,7 +520,6 @@ private string FormatName(string name, DateTime? lastLoginDate) return string.Format("User {0} logged in at {1}", name, lastLoginDate); } - /// /// This mimic classes in System.Data.Services.Internal. /// diff --git a/src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs b/src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs index 8a91aea24ff..4abcd24c0af 100644 --- a/src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs +++ b/src/NHibernate.Test/Async/Linq/QueryCacheableTests.cs @@ -336,7 +336,6 @@ public async Task FetchIsCachableAsync() Assert.That(Sfi.Statistics.QueryCachePutCount, Is.EqualTo(0), "Unexpected cache put count"); Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(0), "Unexpected cache miss count"); Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1), "Unexpected cache hit count"); - } [Test] diff --git a/src/NHibernate.Test/Async/Linq/QueryLock.cs b/src/NHibernate.Test/Async/Linq/QueryLock.cs index 4ecb0404c6c..5da649d48ba 100644 --- a/src/NHibernate.Test/Async/Linq/QueryLock.cs +++ b/src/NHibernate.Test/Async/Linq/QueryLock.cs @@ -19,7 +19,6 @@ using NHibernate.Linq; using NUnit.Framework; - namespace NHibernate.Test.Linq { using System.Threading.Tasks; diff --git a/src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs b/src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs index 2f3cdba95a4..d7ae3c3917e 100644 --- a/src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs +++ b/src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs @@ -37,7 +37,6 @@ protected override void Configure(Configuration configuration) typeof(TimeoutCatchingNonBatchingBatcherFactory).AssemblyQualifiedName); } - [Test] public async Task CanSetTimeoutOnLinqQueriesAsync() { @@ -50,7 +49,6 @@ public async Task CanSetTimeoutOnLinqQueriesAsync() Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - [Test] public async Task CanSetTimeoutOnLinqPagingQueryAsync() { @@ -64,7 +62,6 @@ public async Task CanSetTimeoutOnLinqPagingQueryAsync() Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - [Test] public async Task CanSetTimeoutBeforeSkipOnLinqOrderedPageQueryAsync() { @@ -78,7 +75,6 @@ orderby e.CompanyName Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - [Test] public async Task CanSetTimeoutOnLinqGroupPageQueryAsync() { @@ -98,13 +94,11 @@ into g Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - public partial class TimeoutCatchingNonBatchingBatcher : NonBatchingBatcher { // Is there an easier way to inspect the DbCommand instead of // creating a custom batcher? - public static int LastCommandTimeout; public TimeoutCatchingNonBatchingBatcher(ConnectionManager connectionManager, IInterceptor interceptor) @@ -125,7 +119,6 @@ public override DbDataReader ExecuteReader(DbCommand cmd) } } - public partial class TimeoutCatchingNonBatchingBatcherFactory : IBatcherFactory { public IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor interceptor) @@ -137,7 +130,6 @@ public IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor public partial class QueryTimeoutTests : LinqTestCase { - public partial class TimeoutCatchingNonBatchingBatcher : NonBatchingBatcher { diff --git a/src/NHibernate.Test/Async/Linq/WhereSubqueryTests.cs b/src/NHibernate.Test/Async/Linq/WhereSubqueryTests.cs index 70047db447d..2e67bea1c82 100644 --- a/src/NHibernate.Test/Async/Linq/WhereSubqueryTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereSubqueryTests.cs @@ -658,7 +658,6 @@ public async Task ProductsWithSubqueryReturningStringFirstOrDefaultEqAsync() Assert.That(result.Count, Is.EqualTo(13)); } - [Test(Description = "NH-3423")] public async Task NullComparedToNewExpressionInWhereClauseAsync() { diff --git a/src/NHibernate.Test/Async/Linq/WhereTests.cs b/src/NHibernate.Test/Async/Linq/WhereTests.cs index 5f09970ea4c..44615d96277 100644 --- a/src/NHibernate.Test/Async/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereTests.cs @@ -142,7 +142,6 @@ public async Task UsersRegisteredAtOrAfterY2KAsync() Assert.That(query.Count, Is.EqualTo(2)); } - [Test] public async Task UsersRegisteredAtOrAfterY2K_And_Before2001Async() { @@ -361,7 +360,6 @@ public async Task UsersWithStringContainsAndNotNullNameComplicatedAsync() await (query.ToListAsync()); } - [Test] [Description("NH-3337")] public async Task ProductWithDoubleStringContainsAndNotNullAsync() @@ -411,7 +409,6 @@ public async Task ProductWithDoubleStringContainsAndNotNullAsync() var results = await (db.Products.Where(expr).ToListAsync()); Assert.That(results, Has.Count.EqualTo(1)); } - [Test(Description = "NH-3261")] public async Task UsersWithStringContainsAndNotNullNameAsync() @@ -761,7 +758,6 @@ public async Task AnimalsWithFathersSerialNumberListContainsWithLocalVariableAsy Assert.That(query.Count, Is.EqualTo(1)); } - [Test(Description = "NH-3366")] public async Task CanUseCompareInQueryWithNonConstantZeroAsync() { @@ -781,7 +777,6 @@ public async Task CanUseCompareInQueryWithNonConstantZeroAsync() } } - [Test(Description = "NH-3366")] [TestCaseSource(typeof(WhereTestsAsync), nameof(CanUseCompareInQueryDataSource))] public async Task CanUseCompareInQueryAsync(Expression> expression, int expectedCount, bool expectCase) @@ -797,7 +792,6 @@ public async Task CanUseCompareInQueryAsync(Expression> expr } } - [Test(Description = "NH-3665")] public async Task SelectOnCollectionReturnsResultAsync() { diff --git a/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs b/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs index bb8b9291a5e..d5d172eca6f 100644 --- a/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs +++ b/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs @@ -760,7 +760,6 @@ public async Task UpdateOnDiscriminatorSubclassAsync() } using (var t = s.BeginTransaction()) { - var count = await (s.Query().UpdateBuilder().Set(y => y.Name, y => y.Name).UpdateAsync()); Assert.That(count, Is.EqualTo(2), "Incorrect discrim subclass update count"); @@ -804,7 +803,6 @@ public async Task UpdateOnAnimalAsync() await (s.Query().UpdateBuilder().Set(y => y.FireTemperature, 300).UpdateAsync()); Assert.That(count, Is.EqualTo(1), "Incorrect entity-updated count"); - count = await (s.Query().UpdateBuilder().Set(y => y.BodyWeight, y => y.BodyWeight + 1 + 1).UpdateAsync()); Assert.That(count, Is.EqualTo(10), "incorrect count on 'complex' update assignment"); @@ -1017,7 +1015,6 @@ public async Task SimpleDeleteOnAnimalAsync() using (var s = OpenSession()) using (var t = s.BeginTransaction()) { - var count = await (s.Query().Where(x => x.Id == _polliwog.Id).DeleteAsync()); Assert.That(count, Is.EqualTo(1), "Incorrect delete count"); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/BasicClassFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/BasicClassFixture.cs index d51b045511d..1db221f5158 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/BasicClassFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/BasicClassFixture.cs @@ -164,7 +164,6 @@ public async Task TestCRUDAsync() index++; - // update a property to make sure it picks up that it is dirty s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -395,7 +394,6 @@ public async Task TestArrayCRUDAsync() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -449,7 +447,6 @@ public async Task TestPrimitiveArrayCRUDAsync() index++; - // modify the array to a new array so it is recreated s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -465,7 +462,6 @@ public async Task TestPrimitiveArrayCRUDAsync() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -535,7 +531,6 @@ public async Task TestMapCRUDAsync() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -602,7 +597,6 @@ public async Task TestSetCRUDAsync() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -687,7 +681,6 @@ public async Task TestBagCRUDAsync() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -805,7 +798,6 @@ public async Task TestListCRUDAsync() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -1072,4 +1064,4 @@ private void InitializeBasicClass(int id, ref BasicClass basicClass) basicClass.AddToStringSet("zero"); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/BasicObjectFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/BasicObjectFixture.cs index 187e2881043..580836deb88 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/BasicObjectFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/BasicObjectFixture.cs @@ -60,7 +60,6 @@ public async Task TestCRUDAsync() s = OpenSession(); bo = (BasicObject) await (s.LoadAsync(typeof(BasicObject), bo.Id)); - Assert.IsNotNull(bo.AnyWithProxy, "AnyWithProxy should not be null"); Assert.IsTrue(bo.AnyWithProxy is IBasicObjectProxy, "AnyWithProxy should have been a IBasicObjectProxy instance"); Assert.AreEqual(anyProxy.Id, ((IBasicObjectProxy) bo.AnyWithProxy).Id); @@ -79,4 +78,4 @@ public async Task TestCRUDAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/CriteriaFromHql/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/CriteriaFromHql/Fixture.cs index df151e19960..a3f5fb16e8d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/CriteriaFromHql/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/CriteriaFromHql/Fixture.cs @@ -21,7 +21,6 @@ namespace NHibernate.Test.NHSpecificTest.CriteriaFromHql [TestFixture] public class FixtureAsync : TestCase { - protected override string[] Mappings { get { return new string[] { "NHSpecificTest.CriteriaFromHql.Mappings.hbm.xml" }; } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs index 0e37f90e566..e20ffc53de8 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs @@ -105,7 +105,6 @@ public async Task CanQueryByCriteriaOnSetOfElementAsync() } } - [TestCase(JoinType.LeftOuterJoin)] [TestCase(JoinType.InnerJoin)] public async Task CanQueryByCriteriaOnSetOfElementByCreateAliasAsync(JoinType joinType) @@ -124,7 +123,6 @@ public async Task CanQueryByCriteriaOnSetOfElementByCreateAliasAsync(JoinType jo } } - [Test] public async Task CanQueryByCriteriaOnSetOfCompositeElement_UsingDetachedCriteriaAsync() { @@ -144,7 +142,6 @@ public async Task CanQueryByCriteriaOnSetOfCompositeElement_UsingDetachedCriteri } } - protected override string[] Mappings { get { return new[] {"NHSpecificTest.CriteriaQueryOnComponentCollection.Mappings.hbm.xml"}; } @@ -154,6 +151,5 @@ protected override string MappingsAssembly { get { return "NHibernate.Test"; } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTime2Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTime2Fixture.cs index 04d26775f82..7dbe99aea2b 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTime2Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTime2Fixture.cs @@ -37,7 +37,6 @@ public async Task SavingAndRetrievingTestAsync() await (SavingAndRetrievingActionAsync(new AllDates {Sql_datetime2 = Now}, entity => DateTimeAssert.AreEqual(entity.Sql_datetime2, Now))); - await (SavingAndRetrievingActionAsync(new AllDates { Sql_datetime2 = DateTime.MinValue }, entity => DateTimeAssert.AreEqual(entity.Sql_datetime2, DateTime.MinValue))); @@ -54,4 +53,4 @@ public async Task SaveMillisecondAsync() entity => Assert.That(entity.Sql_datetime2, Is.EqualTo(datetime2)))); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs index e0e5cac9994..9485aff8ae1 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs @@ -49,7 +49,6 @@ protected override void Configure(Cfg.Configuration configuration) configuration.SetProperty(Environment.ShowSql, "true"); } - protected override void OnSetUp() { base.OnSetUp(); @@ -66,7 +65,6 @@ protected override void OnSetUp() } } - protected override void OnTearDown() { using (ISession s = OpenSession()) @@ -77,7 +75,6 @@ protected override void OnTearDown() } } - [Test] public async Task CanQueryWithCastInHqlAsync() { @@ -89,7 +86,6 @@ public async Task CanQueryWithCastInHqlAsync() } } - [Test(Description = "NH-3357")] public async Task CanQueryWithAggregateInLinqAsync() { @@ -104,7 +100,6 @@ public async Task CanQueryWithAggregateInLinqAsync() Assert.That(datesRecovered, Is.EqualTo(new DateTimeOffset(2012, 11, 1, 2, 0, 0, TimeSpan.FromHours(3)))); } - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/EntityNameAndInheritance/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/EntityNameAndInheritance/Fixture.cs index 7c85ffe89a2..f8392bb3c8a 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/EntityNameAndInheritance/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/EntityNameAndInheritance/Fixture.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using System.Collections; using NUnit.Framework; diff --git a/src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs index a8051706adc..ddd35ad0018 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs @@ -17,7 +17,6 @@ namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators { using System.Threading.Tasks; - [TestFixture] public class FixtureAsync : TestCase { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/Evicting/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/Evicting/Fixture.cs index 88c1cea3e76..26bf6401f42 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/Evicting/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/Evicting/Fixture.cs @@ -46,7 +46,6 @@ protected override void OnTearDown() base.OnTearDown(); } - [Test] public async Task Can_evict_entity_from_sessionAsync() { @@ -67,7 +66,6 @@ public async Task Can_evict_entity_from_sessionAsync() [Test] public async Task Can_evict_non_persistent_objectAsync() { - using (var session = Sfi.OpenSession()) using (var tx = session.BeginTransaction()) { @@ -85,11 +83,9 @@ public async Task Can_evict_non_persistent_objectAsync() [Test] public async Task Can_evict_when_trying_to_evict_entity_from_another_sessionAsync() { - using (var session1 = Sfi.OpenSession()) using (var tx1 = session1.BeginTransaction()) { - using (var session2 = Sfi.OpenSession()) using (var tx2 = session2.BeginTransaction()) { @@ -109,6 +105,5 @@ public async Task Can_evict_when_trying_to_evict_entity_from_another_sessionAsyn await (tx1.CommitAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1149/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1149/Fixture.cs index efa2cc99cd4..9015d86ad80 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/GH1149/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/GH1149/Fixture.cs @@ -83,7 +83,6 @@ public async Task StatelessSessionLoadsOneToOneRelatedObject_WithoutPropertyRefA } } - using (var stateless = Sfi.OpenStatelessSession()) { var loadedCompany = await (stateless.GetAsync(companyId)); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs index 4b6dc180cae..117d2290eb4 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/GH1496/Fixture.cs @@ -51,7 +51,6 @@ private void SetupPerson() session.Save(person); testPerson = person; - address = new Address("Postal T", "State T", "Street T"); person = new Person(2, "Tom", address); session.Save(address); @@ -77,7 +76,6 @@ private void SetupEmployee() session.Save(employee); testEmployee = employee; - employee = new Employee(2, "Tom"); contact = new Contact { Phone = "666-666-6666", ContactIdentifier = new ContactIdentifier(WORK_TYPENAME, "2") }; session.Save(contact); @@ -104,7 +102,6 @@ protected override void OnTearDown() [Test] public async Task EventListener_Entity_NoChangeAsync() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -177,8 +174,6 @@ public async Task SelectBeforeUpdate_Entity_ChangePropertyAsync() } } - - [Test] public async Task EventListener_EntityWithCompositeId_ChangePropertyAsync() { @@ -218,11 +213,9 @@ public async Task SelectBeforeUpdate_EntityWithCompositeId_ChangePropertyAsync() } } - [Test] public async Task EventListener_ManyToOne_ChangePropertyAsync() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -262,7 +255,6 @@ public async Task SelectBeforeUpdate_ManyToOne_ChangePropertyAsync() [Test] public async Task EventListener_Entity_SetNewManyToOneAsync() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -306,7 +298,6 @@ public async Task SelectBeforeUpdate_Entity_SetNewManyToOneAsync() [Test] public async Task EventListener_ManyToOneWithCompositeId_ChangePropertyAsync() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -346,7 +337,6 @@ public async Task SelectBeforeUpdate_ManyToOneWithCompositeId_ChangePropertyAsyn [Test] public async Task EventListener_Entity_SetNewManyToOneWithCompositeIdAsync() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -366,7 +356,6 @@ public async Task EventListener_Entity_SetNewManyToOneWithCompositeIdAsync() } } - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -407,7 +396,6 @@ public async Task SelectBeforeUpdate_Entity_SetNewManyToOneWithCompositeIdAsync( } } - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1515/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1515/Fixture.cs index a9eef211e65..4b5e798b68d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/GH1515/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/GH1515/Fixture.cs @@ -39,7 +39,5 @@ public async Task IntializeForwaredToPersistentCollectionAsync() await (collection.Received().ForceInitializationAsync(CancellationToken.None)); } - - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH1530/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH1530/Fixture.cs index b6c0fa8fb0d..4d3416ecc23 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/GH1530/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/GH1530/Fixture.cs @@ -112,5 +112,4 @@ public class NonInverseFixtureAsync : FixtureBaseAsync { protected override string[] Mappings => new[] { "NonInverseMappings.hbm.xml" }; } - } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/ListsWithHoles/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/ListsWithHoles/Fixture.cs index d7c789c65b5..4a473e6fa15 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/ListsWithHoles/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/ListsWithHoles/Fixture.cs @@ -56,7 +56,6 @@ public async Task CanHandleHolesInListAsync() await (tx.CommitAsync()); } - using (ISession sess = OpenSession()) using (ITransaction tx = sess.BeginTransaction()) { @@ -65,8 +64,6 @@ public async Task CanHandleHolesInListAsync() await (tx.CommitAsync()); } - - using (ISession sess = OpenSession()) using (ITransaction tx = sess.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs index 291287c9b0e..27da253ad58 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs @@ -21,7 +21,6 @@ namespace NHibernate.Test.NHSpecificTest.LoadingNullEntityInSet [TestFixture] public class FixtureAsync : TestCase { - protected override string[] Mappings { get { return new string[] { "NHSpecificTest.LoadingNullEntityInSet.Mappings.hbm.xml" }; } @@ -84,7 +83,6 @@ public async Task CanHandleNullEntityInListAsync() await (criteria.ListAsync()); } - using (ISession sess = OpenSession()) { await (sess.DeleteAsync("from WantedProfession")); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs index 7b1946e8d45..04b4336cdf7 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs @@ -267,6 +267,5 @@ public async Task Verify20BehaviourForPropertyRefAndFilterAsync() Assert.That(resHql[0].Address, Is.Not.Null); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/MapFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/MapFixture.cs index 93922431bd7..4af77a8f67c 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/MapFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/MapFixture.cs @@ -56,7 +56,6 @@ protected override void OnTearDown() } } - [Test] public async Task TestSelectAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1033/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1033/Fixture.cs index 6440b9d7647..c28da99d600 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1033/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1033/Fixture.cs @@ -26,7 +26,6 @@ protected override void OnSetUp() { using (var tran = session.BeginTransaction()) { - var animal0 = new Animal(); var animal1 = new Reptile(); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1039/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1039/Fixture.cs index ce655bf85f3..9f0849514df 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1039/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1039/Fixture.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.NHSpecificTest.NH1039 { using System.Threading.Tasks; diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1039Generic/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1039Generic/Fixture.cs index f3accaa4294..53e32d2423a 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1039Generic/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1039Generic/Fixture.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.NHSpecificTest.NH1039Generic { using System.Threading.Tasks; diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1080/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1080/Fixture.cs index c755659d3f5..c0d794c3911 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1080/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1080/Fixture.cs @@ -45,9 +45,6 @@ public async Task TestBugAsync() c.ID = 1; c.Value = "OneToOne"; - - - A a = new A(); a.ID = 1; a.Value = "Parent"; @@ -62,7 +59,6 @@ public async Task TestBugAsync() try { - using (ISession s = Sfi.OpenSession()) { await (s.SaveAsync(c)); @@ -85,7 +81,6 @@ public async Task TestBugAsync() { using (ISession s = Sfi.OpenSession()) { - await (s.DeleteAsync(a)); await (s.DeleteAsync(b1)); await (s.DeleteAsync(c)); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1097/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1097/Fixture.cs index 4dca355b01f..6be4f7b1679 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1097/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1097/Fixture.cs @@ -47,7 +47,6 @@ public void ThrowsExceptionWhenColumnNameIsUsedInQueryAsync() using (var session = this.OpenSession()) using (var tran = session.BeginTransaction()) { - Assert.ThrowsAsync(delegate { var query = session.CreateQuery("from Person p where p.namecolumn=:nameOfPerson"); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs index 55f6219548b..8be29780dca 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs @@ -24,7 +24,6 @@ protected override void OnSetUp() { using (ISession session = OpenSession()) { - var a1 = new A { Id = 1, ValueA = 5, Enabled = false }; session.Save(a1); @@ -209,4 +208,4 @@ public async Task QueryMapElementsAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1159/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1159/Fixture.cs index df8bddd77c2..77bb3e583d9 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1159/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1159/Fixture.cs @@ -20,7 +20,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1159 [TestFixture] public class FixtureAsync:BugTestCase { - protected override void OnSetUp() { using (ISession session = OpenSession()) @@ -31,8 +30,7 @@ protected override void OnSetUp() tran.Commit(); } HibernateInterceptor.CallCount = 0; - - } + } protected override void OnTearDown() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1179/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1179/Fixture.cs index 358f558661a..f3eac799e70 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1179/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1179/Fixture.cs @@ -67,7 +67,6 @@ public async Task ApplyFilterExplicitJoinAsync() await (s.DeleteAsync("from RelatedClass")); await (tx.CommitAsync()); } - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1235/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1235/Fixture.cs index 6de1b24944a..44f3aef26d7 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1235/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1235/Fixture.cs @@ -53,7 +53,6 @@ public async Task TestAsync() await (tx.CommitAsync()); } - using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) { @@ -67,6 +66,5 @@ public async Task TestAsync() await (tx.CommitAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1252/NH1252Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1252/NH1252Fixture.cs index e5727577ebb..1c3046d8760 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1252/NH1252Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1252/NH1252Fixture.cs @@ -58,7 +58,6 @@ public async Task TestAsync() Assert.IsNull(await (s.GetAsync(savedId))); await (tx.CommitAsync()); } - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs index bb8093267c8..cdcd11bb2f2 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs @@ -114,7 +114,6 @@ private Configuration GetConfiguration() return cfg; } - protected static string MappingsAssembly { get { return "NHibernate.Test"; } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1291AnonExample/NH1291AnonExampleFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1291AnonExample/NH1291AnonExampleFixture.cs index 3b93c39ccf6..5b1fe9c5637 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1291AnonExample/NH1291AnonExampleFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1291AnonExample/NH1291AnonExampleFixture.cs @@ -69,8 +69,6 @@ public int IQ } } - - [Test] public async Task CanCreateAnonExampleForIntAsync() { @@ -188,4 +186,4 @@ public async Task CanQueryUsingAnonRelationsAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1313/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1313/Fixture.cs index 2d0b9b77f40..004a7837e66 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1313/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1313/Fixture.cs @@ -50,6 +50,5 @@ public async Task BugAsync() await (tx.CommitAsync()); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1316/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1316/Fixture.cs index 5b96cf69613..f9f2e558682 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1316/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1316/Fixture.cs @@ -62,7 +62,6 @@ protected override void OnTearDown() } } - [Test] public async Task Correct_Id_Returned_When_Using_TriggerAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1332/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1332/Fixture.cs index c4bd314364b..e0c2d4714fb 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1332/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1332/Fixture.cs @@ -37,7 +37,6 @@ public async Task BugAsync() using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) { - await (s.SaveAsync(a)); await (tx.CommitAsync()); } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1359/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1359/Fixture.cs index 0d4464db461..efe68c3fb13 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1359/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1359/Fixture.cs @@ -138,7 +138,6 @@ public async Task CanGetSelectSubqueryWithSpecifiedParameterAsync() } } - [Test] public async Task CanPageAndSortResultsWithParametersAndFiltersAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture.cs index b72a783b7f8..9092c16a619 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture.cs @@ -57,7 +57,6 @@ protected override void OnSetUp() var sivasKangalForSivasKangals = new SivasKangal { Name = "Karabas4", Country = "Turkey", HouseAddress = "Atakoy", Owner = personWithSivasKangals }; personWithSivasKangals.AnimalsGeneric.Add(sivasKangalForSivasKangals); - session.Save(animalForCats); session.Save(dogForCats); @@ -71,8 +70,6 @@ protected override void OnSetUp() _idOfPersonWithCats = session.Save(personWithCats); _idOfPersonWithDogs = session.Save(personWithDogs); _idOfPersonWithSivasKangals = session.Save(personWithSivasKangals); - - tran.Commit(); } @@ -88,7 +85,6 @@ protected override void OnTearDown() } } - [Test] public async Task Can_discriminate_subclass_on_list_with_lazy_loading_when_used_getAsync() { @@ -110,4 +106,4 @@ public async Task Can_discriminate_subclass_on_list_with_lazy_loading_when_used_ } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture2.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture2.cs index 75030d31ede..a5269e97e7a 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture2.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1391/Fixture2.cs @@ -53,7 +53,6 @@ protected override void OnTearDown() } } - [Test] public async Task Can_discriminate_subclass_on_list_with_lazy_loading_when_used_and_person_had_multiple_listAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1443/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1443/Fixture.cs index cf89b57537f..9a588e23982 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1443/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1443/Fixture.cs @@ -27,14 +27,12 @@ public class FixtureAsync await (su.ExecuteAsync(x => sb.AppendLine(x), false, false, cancellationToken)); string script = sb.ToString(); - if (Dialect.Dialect.GetDialect(cfg.Properties).SupportsIfExistsBeforeTableName) Assert.That(script, Does.Match("drop table if exists nhibernate.dbo.Aclass")); else Assert.That(script, Does.Match("drop table nhibernate.dbo.Aclass")); Assert.That(script, Does.Match("create ((column|row) )?table nhibernate.dbo.Aclass")); - } [Test] diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1478/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1478/Fixture.cs index 3dac80ad57e..abd6551dfa3 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1478/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1478/Fixture.cs @@ -53,13 +53,10 @@ public async Task TestIfColonInStringIsNotInterpretedAsParameterInSQLAsync() { using (ISession session=OpenSession()) { - - IList lst = await (session.CreateSQLQuery("select Biography from Person where Biography='Born in Istanbul :Turkey'") .AddScalar("Biography", NHibernateUtil.String).ListAsync()); Assert.AreEqual(1,lst.Count); } - } [Test] @@ -67,14 +64,10 @@ public async Task TestIfColonInStringIsNotInterpretedAsParameterInHQLAsync() { using (ISession session = OpenSession()) { - - IList lst = await (session.CreateSQLQuery("select p.Biography from Person p where p.Biography='Born in Istanbul :Turkey'") .ListAsync()); Assert.AreEqual(1, lst.Count); } - } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1487/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1487/Fixture.cs index e6c959c81a5..feb240d4691 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1487/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1487/Fixture.cs @@ -25,7 +25,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1487 [TestFixture] public class FixtureAsync { - public Configuration GetConf() { var cfg = new Configuration(); @@ -212,6 +211,5 @@ public async Task GenerateSchemaUniqueOnIdAsync() await (new SchemaExport(cfg).DropAsync(false, true)); } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1495/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1495/Fixture.cs index a50092c2f97..1a62ac23dcb 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1495/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1495/Fixture.cs @@ -48,6 +48,5 @@ public async Task CreateTestAsync() } } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1499/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1499/Fixture.cs index 3748d1f1edd..9c3fd4d6824 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1499/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1499/Fixture.cs @@ -69,7 +69,5 @@ public void CheckIfDetachedCriteriaCanBeUsedOnPropertyRestrictionAsync() Assert.ThrowsAsync(() => criteria.ListAsync()); } } - - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1549/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1549/Fixture.cs index e7692c7575b..900f1648e4f 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1549/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1549/Fixture.cs @@ -89,7 +89,6 @@ public async Task CanLoadForEntitiesWithTheirOwnIdsAsync() protected override void OnTearDown() { using (ISession session = OpenSession()) { - using (ITransaction trans = session.BeginTransaction()) { session.Delete("from ProductWithId"); @@ -101,4 +100,4 @@ protected override void OnTearDown() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1552/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1552/Fixture.cs index a5a8f1ca69f..81f6e36eccd 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1552/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1552/Fixture.cs @@ -94,7 +94,6 @@ public async Task Paging_with_sql_works_as_expected_with_MaxResultAsync() } } - [Test] public async Task Paging_with_sql_works_as_expected_with_FirstResultMaxResultAsync() { @@ -114,4 +113,4 @@ public async Task Paging_with_sql_works_as_expected_with_FirstResultMaxResultAsy } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture1.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture1.cs index 1f261039983..34cc2026819 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture1.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture1.cs @@ -108,7 +108,6 @@ public async Task TestRefreshWithCountAsync() return project; } - public async Task LoadProjectAsync(CancellationToken cancellationToken = default(CancellationToken)) { ProjectWithOneList project; @@ -127,7 +126,6 @@ public async Task TestRefreshWithCountAsync() public async Task RefreshProjectAsync(ProjectWithOneList project, CancellationToken cancellationToken = default(CancellationToken)) { - using (ISession session = OpenSession()) using (ITransaction tx = session.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture2.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture2.cs index 7fc351741cd..36ed8f9862f 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture2.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1601/Fixture2.cs @@ -63,7 +63,6 @@ public async Task TestRefreshWithThreeCountsAsync() await (SaveLoadAndRefreshProjectAsync()); } - /// /// Create and save a Project /// @@ -85,7 +84,6 @@ public async Task TestRefreshWithThreeCountsAsync() await (RefreshProjectAsync(project, cancellationToken)); } - public async Task SaveProjectAsync( CancellationToken cancellationToken = default(CancellationToken)) { Project project; @@ -99,13 +97,11 @@ public async Task TestRefreshWithThreeCountsAsync() Scenario scenario2 = new Scenario(); Scenario scenario3 = new Scenario(); - //Add the scenario to all lists project.ScenarioList1.Add(scenario1); project.ScenarioList2.Add(scenario2); project.ScenarioList3.Add(scenario3); - //Set the primary key on the project project.Name = "Test"; @@ -117,7 +113,6 @@ public async Task TestRefreshWithThreeCountsAsync() return project; } - public async Task LoadProjectAsync(CancellationToken cancellationToken = default(CancellationToken)) { Project project; @@ -136,7 +131,6 @@ public async Task TestRefreshWithThreeCountsAsync() public async Task RefreshProjectAsync(Project project, CancellationToken cancellationToken = default(CancellationToken)) { - using (ISession session = OpenSession()) using (ITransaction tx = session.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs index 4b60f5f59f1..d8593466983 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs @@ -51,7 +51,6 @@ protected override void OnSetUp() } } - [Test] public async Task CanQueryOneToOneWithCompositeIdAsync() { @@ -63,10 +62,8 @@ public async Task CanQueryOneToOneWithCompositeIdAsync() IList list = await (criteria.ListAsync()); Assert.AreEqual("blarg", list[0].Description); Assert.AreEqual("nuts", list[0].Adjunct.AdjunctDescription); - } } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1632/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1632/Fixture.cs index 95c3f37665a..5cb05d3db21 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1632/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1632/Fixture.cs @@ -74,7 +74,6 @@ public async Task When_using_DTC_HiLo_knows_to_create_isolated_DTC_transactionAs Assert.AreNotEqual(scalar1, scalar2, "HiLo must run with in its own transaction"); } - [Test] public async Task When_commiting_items_in_DTC_transaction_will_add_items_to_2nd_level_cacheAsync() { @@ -88,7 +87,6 @@ public async Task When_commiting_items_in_DTC_transaction_will_add_items_to_2nd_ } try { - using (var tx = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) { using (var s = OpenSession()) @@ -189,7 +187,6 @@ public async Task When_using_two_sessions_with_explicit_flushAsync() using (ISession s1 = Sfi.OpenSession()) using (ISession s2 = Sfi.OpenSession()) { - id1 = await (s1.SaveAsync(new Nums { NumA = 1, NumB = 2, ID = 5 })); await (s1.FlushAsync()); @@ -229,7 +226,6 @@ public async Task When_using_two_sessionsAsync() using (ISession s1 = Sfi.OpenSession()) using (ISession s2 = Sfi.OpenSession()) { - id1 = await (s1.SaveAsync(new Nums { NumA = 1, NumB = 2, ID = 5 })); id2 = await (s2.SaveAsync(new Nums { NumA = 1, NumB = 2, ID = 6 })); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1643/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1643/Fixture.cs index 20d9ed12fab..117b7c42422 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1643/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1643/Fixture.cs @@ -53,8 +53,6 @@ public async Task TestAsync() await (tx.CommitAsync()); } - - using (ISession sess = OpenSession()) using (ITransaction tx = sess.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1689/SampleTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1689/SampleTest.cs index cb0e2a1fa61..65b410f0af4 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1689/SampleTest.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1689/SampleTest.cs @@ -54,5 +54,4 @@ public async Task ShouldBeAbleToCallGenericMethodAsync() } } } - } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1693/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1693/Fixture.cs index d61b0ac8bcb..5c73e3d25d4 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1693/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1693/Fixture.cs @@ -81,6 +81,5 @@ public async Task with_filterAsync() await (tx.CommitAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1727/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1727/Fixture.cs index a0e8b13062d..6213a98583e 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1727/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1727/Fixture.cs @@ -24,7 +24,6 @@ public class FixtureAsync : BugTestCase * The second test passes where I've just switched the order in the where clause */ - [Test] public async Task VerifyFilterAndInAndProperty_DoesNotWorkTodayAsync() { @@ -48,7 +47,6 @@ where a.Value in (:aValues) } } - [Test] public async Task VerifyFilterAndInAndProperty_WorksTodayAsync() { @@ -82,6 +80,5 @@ protected override void OnTearDown() t.Commit(); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1747/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1747/Fixture.cs index 6f39e46ad71..16624cdaf30 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1747/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1747/Fixture.cs @@ -52,5 +52,4 @@ public async Task TraversingBagToJoinChildElementShouldWorkAsync() } } } - } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1761/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1761/FixtureByCode.cs index fbbd94ba28f..f881f767239 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1761/FixtureByCode.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1761/FixtureByCode.cs @@ -30,7 +30,6 @@ protected override HbmMapping GetMappings() rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb)); rc.Property(x => x.Name); rc.Bag(x => x.FundingPrograms, m => {}, r => r.OneToMany()); - }); mapper.Class(rc => { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1788/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1788/Fixture.cs index c3826d8b826..2347fb080ce 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1788/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1788/Fixture.cs @@ -37,7 +37,6 @@ public async Task CanUseSqlTimestampWithDynamicInsertAsync() await (tx.CommitAsync()); } - using (var session = OpenSession()) using (var tx = session.BeginTransaction()) { @@ -46,14 +45,12 @@ public async Task CanUseSqlTimestampWithDynamicInsertAsync() await (tx.CommitAsync()); } - using (ISession session = OpenSession()) using (var tx = session.BeginTransaction()) { await (session.DeleteAsync(await (session.GetAsync(1)))); await (tx.CommitAsync()); } - } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1818/Fixture1818.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1818/Fixture1818.cs index 5c76c4d4a39..569c4e2e08d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1818/Fixture1818.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1818/Fixture1818.cs @@ -43,7 +43,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect) return dialect as PostgreSQL82Dialect != null; } - [Test] [Description("Test HQL query on a property mapped with a formula.")] public async Task ComputedPropertyShouldRetrieveDataCorrectlyAsync() @@ -55,4 +54,4 @@ public async Task ComputedPropertyShouldRetrieveDataCorrectlyAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1837/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1837/Fixture.cs index ef360e18c6d..708eb08f502 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1837/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1837/Fixture.cs @@ -48,7 +48,6 @@ protected override void OnTearDown() [Test] public async Task ExecutesOneQueryWithUniqueResultWithChildCriteriaNonGenericAsync() { - Sfi.Statistics.Clear(); using (ISession session = this.OpenSession()) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1845/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1845/Fixture.cs index 25db65d4a61..9b7ba54f564 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1845/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1845/Fixture.cs @@ -18,7 +18,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1845 [TestFixture] public class FixtureAsync : TestCaseMappingByCode { - protected override HbmMapping GetMappings() { var mapper = new ModelMapper(); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1850/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1850/Fixture.cs index ba9f0a8f99a..28b735d8ee4 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1850/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1850/Fixture.cs @@ -7,7 +7,6 @@ // //------------------------------------------------------------------------------ - using NUnit.Framework; namespace NHibernate.Test.NHSpecificTest.NH1850 diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1863/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1863/Fixture.cs index 7745b213f83..b189752c9e7 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1863/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1863/Fixture.cs @@ -66,7 +66,6 @@ public async Task CanGetCustomerWithCategoryWhenFilterIsEnabledAsync() Assert.That(hasCategoryResult.Count, Is.EqualTo(1)); } - } [Test] @@ -98,7 +97,6 @@ public async Task CanGetCustomerWithNoCategoryWhenFilterIsEnabledAsync() Assert.That(hasNoCategoryResult.Count, Is.EqualTo(1)); } - } [Test] @@ -114,7 +112,6 @@ public async Task CanGetCustomerWithNoCategoryWhenFilterIsDisabledAsync() Assert.That(hasNoCategoryResult.Count, Is.EqualTo(1)); } - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1908/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1908/Fixture.cs index 469d804f16f..9227c2eb47d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1908/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1908/Fixture.cs @@ -17,7 +17,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1908 [TestFixture] public class FixtureAsync : BugTestCase { - [Test] public async Task QueryPropertyInBothFilterAndQueryAsync() { @@ -69,4 +68,4 @@ Invoice inv } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1911/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1911/Fixture.cs index d3a4d261e02..678de458ba1 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1911/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1911/Fixture.cs @@ -16,11 +16,9 @@ namespace NHibernate.Test.NHSpecificTest.NH1911 { using System.Threading.Tasks; - [TestFixture] public class FixtureAsync : BugTestCase { - protected override void OnSetUp() { base.OnSetUp(); @@ -70,7 +68,5 @@ public async Task ConditionalAggregateProjectionAsync() Assert.That(actual[0][1], Is.EqualTo(2)); } } - } - } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1920/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1920/Fixture.cs index 5c9d4c99fc4..5bb3f51aae2 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1920/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1920/Fixture.cs @@ -18,7 +18,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1920 [TestFixture] public class FixtureAsync : BugTestCase { - [Test] public async Task Can_Query_Without_Collection_Size_ConditionAsync() { @@ -77,6 +76,5 @@ public async Task Can_Query_With_Collection_Size_ConditionAsync() await (tx.CommitAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1922/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1922/Fixture.cs index 6cd098c22ff..39fdbfa26ec 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1922/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1922/Fixture.cs @@ -46,7 +46,6 @@ protected override void OnTearDown() base.OnTearDown(); } - [Test] public async Task CanExecuteQueryOnStatelessSessionUsingDetachedCriteriaAsync() { @@ -61,7 +60,5 @@ public async Task CanExecuteQueryOnStatelessSessionUsingDetachedCriteriaAsync() Assert.IsNotNull(cust); } } - - - } + } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1927/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1927/Fixture.cs index 94009e1b626..3e57122ca0c 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1927/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1927/Fixture.cs @@ -72,8 +72,7 @@ protected override void OnTearDown() Assert.That(queryFactoryFunc(session), Is.Not.Null, "failed with filter on"); await (tx.CommitAsync(cancellationToken)); } - - } + } [Test] public async Task CriteriaWithEagerFetchAsync() diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1938/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1938/Fixture.cs index cdfde4cd8dc..58a96323e5b 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1938/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1938/Fixture.cs @@ -19,7 +19,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1938 [TestFixture] public class FixtureAsync : BugTestCase { - protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) { // Database needs to be case-sensitive @@ -59,6 +58,5 @@ public async Task Can_Query_By_Example_Case_InsensitiveAsync() await (t.RollbackAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1939/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1939/Fixture.cs index fc01172cb66..10c968d6f0b 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1939/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1939/Fixture.cs @@ -21,7 +21,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1939 [TestFixture] public class FixtureAsync : BugTestCase { - private StringBuilder schemaBuilder; private void AddString(string sqlString) @@ -34,7 +33,6 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) return (dialect is Dialect.MsSql2000Dialect); } - [Test] public async Task Can_Parameterise_Auxiliary_Database_ObjectsAsync() { @@ -51,6 +49,5 @@ public async Task Can_Parameterise_Auxiliary_Database_ObjectsAsync() Assert.That(schema.Contains("select 'create script'"), Is.True, "parameterised schema create script not exported"); } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1948/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1948/Fixture.cs index e514f1bec06..ab47efcd7d6 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1948/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1948/Fixture.cs @@ -17,7 +17,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1948 [TestFixture] public class FixtureAsync : BugTestCase { - [Test] public async Task CanUseDecimalScaleZeroAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1959/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1959/Fixture.cs index fd40501ad2c..e5ba4a06d25 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH1959/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH1959/Fixture.cs @@ -16,7 +16,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1959 [TestFixture] public class FixtureAsync : BugTestCase { - protected override void OnTearDown() { using (ISession s = OpenSession()) diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2037/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2037/Fixture.cs index 323fc0c8a7e..0891ca9b4ae 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2037/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2037/Fixture.cs @@ -8,17 +8,18 @@ //------------------------------------------------------------------------------ - using NUnit.Framework; +using NUnit.Framework; + namespace NHibernate.Test.NHSpecificTest.NH2037 { - using System.Threading.Tasks; - [TestFixture] - public class FixtureAsync : BugTestCase + using System.Threading.Tasks; + [TestFixture] + public class FixtureAsync : BugTestCase { - [Test] - public async Task TestAsync() - { - var country = new Country {Name = "Argentina"}; + [Test] + public async Task TestAsync() + { + var country = new Country { Name = "Argentina" }; var city = new City { @@ -27,41 +28,40 @@ public async Task TestAsync() Name = "Cordoba" }; - + using (ISession session = OpenSession()) - using(var tx = session.BeginTransaction()) + using (var tx = session.BeginTransaction()) { await (session.SaveAsync(city.Country)); await (session.SaveAsync(city)); await (tx.CommitAsync()); - } - - using(ISession session = OpenSession()) + } + + using (ISession session = OpenSession()) using (var tx = session.BeginTransaction()) - { + { //THROW await (session.SaveOrUpdateAsync(city)); await (tx.CommitAsync()); - } - + } + using (var session = OpenSession()) using (var tx = session.BeginTransaction()) - { + { Assert.IsNotNull(await (session.GetAsync(city.Id))); await (tx.CommitAsync()); - } + } } - + protected override void OnTearDown() { - using(var session = OpenSession()) - using(var tx = session.BeginTransaction()) - { + using (var session = OpenSession()) + using (var tx = session.BeginTransaction()) + { session.Delete("from City"); session.Delete("from Country"); tx.Commit(); } } - - } - } + } +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2044/SampleTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2044/SampleTest.cs index 86ca0bc0e3b..76204f45c17 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2044/SampleTest.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2044/SampleTest.cs @@ -45,7 +45,6 @@ protected override void OnTearDown() } } - [Test] public async Task IgnoreCaseShouldWorkWithCharCorrectlyAsync() { @@ -56,8 +55,7 @@ public async Task IgnoreCaseShouldWorkWithCharCorrectlyAsync() IList list = await (criteria.ListAsync()); Assert.AreEqual(1, list.Count); - - } + } } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2049/Fixture2049.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2049/Fixture2049.cs index 58de5b9cf80..ce5c05a14b0 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2049/Fixture2049.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2049/Fixture2049.cs @@ -37,7 +37,6 @@ protected override void OnSetUp() } } - protected override void OnTearDown() { base.OnTearDown(); @@ -48,7 +47,6 @@ protected override void OnTearDown() } } - [Test] [KnownBug("Known bug NH-2049.")] public async Task CanCriteriaQueryWithFilterOnJoinClassBaseClassPropertyAsync() @@ -66,7 +64,6 @@ public async Task CanCriteriaQueryWithFilterOnJoinClassBaseClassPropertyAsync() } } - [Test] [KnownBug("Known bug NH-2049.", "NHibernate.Exceptions.GenericADOException")] public async Task CanHqlQueryWithFilterOnJoinClassBaseClassPropertyAsync() diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2053/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2053/Fixture.cs index 37c670a0252..910c31b2494 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2053/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2053/Fixture.cs @@ -87,6 +87,5 @@ public async Task JoinedSubClass_FilterAsync() } } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs index 57fccf1c1fa..37e4fe39bc0 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2055/Fixture.cs @@ -52,6 +52,5 @@ public async Task CanCreateAndDropSchemaAsync() } } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2065/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2065/Fixture.cs index 402955be34a..68726d24ac9 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2065/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2065/Fixture.cs @@ -11,7 +11,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.NHSpecificTest.NH2065 { using System.Threading.Tasks; @@ -73,6 +72,5 @@ public async Task GetGoodErrorForDirtyReassociatedCollectionAsync() "reassociated object has dirty collection: NHibernate.Test.NHSpecificTest.NH2065.Person.Children")); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2074/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2074/Fixture.cs index 285fb991674..4ed53122158 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2074/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2074/Fixture.cs @@ -17,7 +17,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2074 [TestFixture] public class FixtureAsync : BugTestCase { - protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) { return dialect is MsSql2000Dialect; @@ -31,6 +30,5 @@ public async Task CanQueryOnPropertyUsingUnicodeTokenAsync() await (s.CreateQuery("from Person").ListAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2077/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2077/Fixture.cs index 506278859fe..242c38dcd86 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2077/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2077/Fixture.cs @@ -22,7 +22,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2077 [TestFixture] public class FixtureAsync : BugTestCase { - protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) { return dialect is MsSql2000Dialect; @@ -44,6 +43,5 @@ public async Task CanExecuteMultipleQueriesUsingNativeSQLAsync() .ExecuteUpdateAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2112/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2112/Fixture.cs index 02d30edf561..ee297d7a0c8 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2112/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2112/Fixture.cs @@ -84,6 +84,5 @@ protected void AssertDeleteCount(int expected) { Assert.That(Sfi.Statistics.EntityDeleteCount, Is.EqualTo(expected), "unexpected delete count"); } - - } + } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2113/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2113/Fixture.cs index 843558f2ad0..cc4fa3ef6e4 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2113/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2113/Fixture.cs @@ -22,7 +22,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2113 [TestFixture] public class FixtureAsync : BugTestCase { - [Test] public async Task ShouldNotEagerLoadKeyManyToOneWhenOverridingGetHashCodeAsync() { @@ -53,7 +52,6 @@ public async Task ShouldNotEagerLoadKeyManyToOneWhenOverridingGetHashCodeAsync() await (tx.CommitAsync()); } - using (var s = OpenSession()) using (var tx = s.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2148/BugFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2148/BugFixture.cs index 7ea2756eaf7..7cccfb4a7e1 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2148/BugFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2148/BugFixture.cs @@ -28,7 +28,6 @@ protected override void OnSetUp() }); tx.Commit(); } - } protected override void OnTearDown() diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2302/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2302/Fixture.cs index 3de5b772229..49fb2b1ccd9 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2302/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2302/Fixture.cs @@ -185,6 +185,5 @@ private static string GetFixedLengthString12000() { return new string('a', 12000); } - - } + } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2331/Nh2331Test.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2331/Nh2331Test.cs index 6fc7de64bfb..8e6ff501e0a 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2331/Nh2331Test.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2331/Nh2331Test.cs @@ -154,4 +154,4 @@ DetachedCriteria personCriteria } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2362/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2362/Fixture.cs index 5d512775722..41cc52163cd 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2362/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2362/Fixture.cs @@ -29,7 +29,6 @@ in session.Query() into g let totalPrice = g.Sum(p => p.Price) select new { g.Key.CategoryId, g.Key.SupplierId, TotalPrice = totalPrice }).ToListAsync()); - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2378/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2378/Fixture.cs index 70dcb164a61..d6579992b75 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2378/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2378/Fixture.cs @@ -70,9 +70,8 @@ public async Task ShortEntityCanBeQueryCorrectlyUsingLinqProviderAsync() .Where(o => o.PersonId == 2) .ToListAsync()); - Assert.That(m.Count, Is.EqualTo(1)); } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2467/NH2467Test.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2467/NH2467Test.cs index 9f5166eb198..1c51f7bc365 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2467/NH2467Test.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2467/NH2467Test.cs @@ -49,7 +49,6 @@ public async Task ShouldNotThrowOnFuturePagingAsync() { using (var session = OpenSession()) { - var contentQuery = session .CreateCriteria() .Add(Restrictions.Eq("Data", "Test")); @@ -73,7 +72,6 @@ public async Task ShouldNotThrowOnReversedFuturePagingAsync() { using (var session = OpenSession()) { - var countQuery = session .CreateCriteria() .Add(Restrictions.Eq("Data", "Test")); @@ -97,7 +95,6 @@ public async Task ShouldNotThrowOnFuturePagingUsingHqlAsync() { using (var session = OpenSession()) { - var contentQuery = session.CreateQuery("from DomainClass as d where d.Data = ?"); contentQuery.SetString(0, "Test"); contentQuery.SetMaxResults(2); @@ -118,7 +115,6 @@ public async Task ShouldNotThrowOnReversedFuturePagingUsingHqlAsync() { using (var session = OpenSession()) { - var contentQuery = session.CreateQuery("from DomainClass as d where d.Data = ?"); contentQuery.SetString(0, "Test"); contentQuery.SetMaxResults(2); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2484/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2484/Fixture.cs index 88685a31a0e..99f9c036ac1 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2484/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2484/Fixture.cs @@ -7,7 +7,6 @@ // //------------------------------------------------------------------------------ - using System; using System.Drawing; using System.Reflection; @@ -88,4 +87,4 @@ public async Task TestPersistenceOfClassWithSerializableTypeAsync() stream.Dispose(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2490/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2490/Fixture.cs index 364088e8576..5e0b6af1c61 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2490/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2490/Fixture.cs @@ -55,6 +55,5 @@ public async Task BadSqlFromJoinLogicErrorAsync() } } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs index 89dbb8258ab..ffade9a06f2 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs @@ -23,7 +23,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2500 { using System.Threading.Tasks; - [TestFixture] public class FixtureAsync : TestCaseMappingByCode { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2580/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2580/Fixture.cs index 02c080e8880..501d4890ebe 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2580/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2580/Fixture.cs @@ -18,7 +18,6 @@ public class FixtureAsync: BugTestCase { private class MyClass { - } [Test] diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2583/ManualTestFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2583/ManualTestFixture.cs index 0059c500dcb..50261537488 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2583/ManualTestFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2583/ManualTestFixture.cs @@ -166,8 +166,7 @@ public async Task OrShouldBeCompatibleWithAdditionForNullReferencesAsync() //Assert.AreEqual(0, leftResult.Count); //Assert.AreEqual(0, rightResult.Count); //Assert.AreEqual(0, orResult.Count); - - } + } } private static void TestCoreOrShouldBeCompatibleWithSum(ISession session, @@ -229,7 +228,6 @@ public async Task NHibernateLinqExploratoryTestWhichProvesNothingAsync() // ); //result.ToList(); - var result = from r in session.Query() orderby (r.Id == 1101 || r.Id == 1102 ? r.Id - 1000 : r.Id) select (r.Id == 1101 || r.Id == 1102 ? r.Id + 1000 : r.Id); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH266/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH266/Fixture.cs index 845c5ec998d..0d857bcfd58 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH266/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH266/Fixture.cs @@ -65,7 +65,6 @@ protected override void OnTearDown() s.Close(); } - [Test] public async Task BaseClassLoadAsync() { @@ -75,7 +74,6 @@ public async Task BaseClassLoadAsync() Assert.AreEqual("the a", a.Name); s.Close(); - // load instance through hql s = OpenSession(); IQuery q = s.CreateQuery("from A as a where a.id = :id "); @@ -125,4 +123,4 @@ public async Task SpecificSubclassAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH266/UserFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH266/UserFixture.cs index 08528e3fa51..79353df2b45 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH266/UserFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH266/UserFixture.cs @@ -59,7 +59,6 @@ protected override void OnTearDown() s.Close(); } - /// /// This is testing problems that existed in 0.8.0-2 with extra "AND" /// being added to the sql when there was an attribute where="some sql". @@ -93,7 +92,6 @@ public async Task WhereAttributeAsync() Assert.AreEqual(0, list.Count, "no 'inactive user' according to where clause"); s.Close(); - // // load a instance of B through hql // s = OpenSession(); // IQuery q = s.CreateQuery( "from B as b where b.id = :id" ); @@ -112,4 +110,4 @@ public async Task WhereAttributeAsync() // s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2662/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2662/Fixture.cs index e4899183bc7..347b8c4ae52 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2662/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2662/Fixture.cs @@ -47,7 +47,7 @@ public async Task WhenCastAliasInQueryOverThenDoNotThrowAsync() c => new {c.Id, c.Order.OrderDate, ((PizzaOrder)c.Order).PizzaName }) .ToArray(); - foreach (var item in temp) { Trace.WriteLine(item.PizzaName);} + foreach (var item in temp) { Trace.WriteLine(item.PizzaName); } }, Throws.Nothing); Assert.That(async () => @@ -67,7 +67,6 @@ public async Task WhenCastAliasInQueryOverThenDoNotThrowAsync() Assert.That(results.Count, Is.EqualTo(2)); Assert.That(results[0][2], Is.EqualTo("Margarita")); - }, Throws.Nothing); } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2664/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2664/Fixture.cs index 55c363b7edd..4bd1e0537af 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2664/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2664/Fixture.cs @@ -87,7 +87,6 @@ protected override void OnTearDown() tran.Commit(); } } - } [Test] @@ -129,4 +128,4 @@ public async Task Multiple_Query_Does_Not_CacheAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2673/CachingWithTransformerTests.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2673/CachingWithTransformerTests.cs index bc30da1c3cc..cad92efc004 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2673/CachingWithTransformerTests.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2673/CachingWithTransformerTests.cs @@ -63,7 +63,6 @@ public Scenario(ISessionFactory factory) blog.Posts.Add(new Post { Title = "Second post", Body = "Some other text" }); blog.Posts.Add(new Post { Title = "Third post", Body = "Third post text" }); - blog.Comments.Add(new Comment { Title = "First comment", Body = "Some text" }); blog.Comments.Add(new Comment { Title = "Second comment", Body = "Some other text" }); session.Save(blog); @@ -221,7 +220,6 @@ public async Task WhenEagerLoadingWithHqlThenNotThrowsAsync() } } - [Test(Description = "NH2961/3311")] public async Task CanCacheCriteriaWithLeftJoinAndResultTransformerAsync() { @@ -239,7 +237,6 @@ public async Task CanCacheCriteriaWithLeftJoinAndResultTransformerAsync() } } - [Test(Description = "NH2961/3311")] public async Task CanCacheCriteriaWithEagerLoadAndResultTransformerAsync() { @@ -255,7 +252,6 @@ public async Task CanCacheCriteriaWithEagerLoadAndResultTransformerAsync() } } - [Test(Description = "NH2961/3311")] public async Task CanCacheCriteriaWithLeftJoinAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2693/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2693/Fixture.cs index 865ba47293f..d3187ef2ee8 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2693/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2693/Fixture.cs @@ -43,7 +43,6 @@ protected override void OnSetUp() var fourthLevel2 = new FourthLevel { SomeString = "second", SpecificThirdLevel = thirdLevel1 }; thirdLevel1.FourthLevels.Add(fourthLevel2); - var firstLevel2 = new FirstLevel(); var secondLevel2 = new SecondLevelComponent { FirstLevel = firstLevel2 }; @@ -58,7 +57,6 @@ protected override void OnSetUp() var fourthLevel4 = new FourthLevel { SomeString = "fourth", SpecificThirdLevel = thirdLevel2 }; thirdLevel2.FourthLevels.Add(fourthLevel4); - var firstLevel3 = new FirstLevel(); var secondLevel3 = new SecondLevelComponent { FirstLevel = firstLevel3 }; @@ -68,7 +66,6 @@ protected override void OnSetUp() secondLevel3.ThirdLevel = thirdLevel3; secondLevel3.SpecificThirdLevel = thirdLevel3; - session.Save(thirdLevel1); session.Save(thirdLevel2); session.Save(thirdLevel3); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2697/SampleTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2697/SampleTest.cs index 6cb55ea3d91..5847a87e277 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2697/SampleTest.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2697/SampleTest.cs @@ -59,7 +59,6 @@ protected override void OnTearDown() { base.OnTearDown(); - using (ISession session = this.OpenSession()) { IList list = session.CreateCriteria("Article").List(); foreach (ArticleItem item in list) @@ -79,7 +78,6 @@ protected override void OnTearDown() session.Delete(hql); session.Flush(); } - } [Test] @@ -126,8 +124,6 @@ public async Task Can_GetListOfArticlesAsync() Assert.That(result.Count, Is.GreaterThan(0)); } - - [Test] public async Task Can_SetArticleFavoriteWithHQL_NamedParamAsync() { @@ -153,7 +149,6 @@ public async Task Can_SetArticleFavoriteWithHQL_NamedParamAsync() result = await (session.CreateQuery(HQL).ListAsync()); } Assert.That(result.Count, Is.GreaterThan(0)); - - } +} } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2705/Test.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2705/Test.cs index 6368b60455d..711ba18eeff 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2705/Test.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2705/Test.cs @@ -74,7 +74,6 @@ public void LinqQueryWithFetch_WhenDerivedClassesUseComponentAndManyToOne_DoesNo Assert.That(() => s.Query() .Fetch(p => p.SubItem).ToListAsync(), Throws.Nothing); - // fetching second level properties should work too Assert.That(() => s.Query() .Fetch(p => p.SubItem).ThenFetch(p => p.Details).ToListAsync(), Throws.Nothing); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2773/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2773/Fixture.cs index bcf8f13fc7b..d70a584b2b9 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2773/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2773/Fixture.cs @@ -62,7 +62,6 @@ public async Task DeserializedSession_ProxyType_ShouldBeEqualToOriginalProxyType await (tx.CommitAsync()); } - using (MemoryStream sessionMemoryStream = new MemoryStream()) { var formatter = new BinaryFormatter diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH280/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH280/Fixture.cs index a14dfac0d12..02c14828039 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH280/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH280/Fixture.cs @@ -60,7 +60,6 @@ public async Task ConstInSelectAsync() Assert.AreEqual(123, result[0]); Assert.AreEqual("Fiammy", (result[1] as Foo).Description); - l = await (s.CreateQuery("select 123, f.Description from Foo f").ListAsync()); result = l[0] as IList; Assert.AreEqual(123, result[0]); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2846/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2846/Fixture.cs index 71a6dd7fb6d..43650b4b5f2 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2846/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2846/Fixture.cs @@ -71,22 +71,18 @@ protected override void OnTearDown() } } - [Test] public async Task FetchOnCountWorksAsync() { using (var session = OpenSession()) { - var count = await (session.Query() .Fetch(p => p.Category) .FetchMany(p => p.Comments) .CountAsync()); Assert.AreEqual(1, count); - } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2951/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2951/Fixture.cs index 7b50f1db829..4a7cc36b7c1 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2951/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2951/Fixture.cs @@ -41,7 +41,6 @@ public async Task UpdateWithSubqueryToJoinedSubclassAsync() using (ISession session = OpenSession()) using (ITransaction transaction = session.BeginTransaction()) { - var c = new Customer { Name = "Bob" }; await (session.SaveAsync(c)); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs index dc8780ae67b..5397716af0d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs @@ -17,10 +17,8 @@ namespace NHibernate.Test.NHSpecificTest.NH298 { using System.Threading.Tasks; - [TestFixture] public class IndexedBidirectionalOneToManyTestAsync : BugTestCase { - protected override void OnSetUp() { base.OnSetUp(); using ( ISession session = this.OpenSession() ) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs index 052557dc4c0..ad960e60d4c 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs @@ -259,7 +259,6 @@ public async Task ConnectionPoolCorruptionAfterDeadlockAsync(bool distributed, b ? "Deadlock not reported on initial request, and initial request failed" : "Initial request failed", subsequentFailedRequests); - } while (tryCount < 3); // // I'll change this to while(true) sometimes so I don't have to keep running the test @@ -295,7 +294,6 @@ private void RunScript(string script) foreach (var batch in Regex.Split(sql, @"^go\s*$", RegexOptions.IgnoreCase | RegexOptions.Multiline) .Where(b => !string.IsNullOrEmpty(b))) { - using (var cmd = new System.Data.SqlClient.SqlCommand(batch, cxn)) { cmd.ExecuteNonQuery(); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3046/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3046/Fixture.cs index dd5fd4b837f..656b6c1dcc6 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3046/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3046/Fixture.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using System; using NUnit.Framework; using NHibernate.Mapping.ByCode; @@ -23,7 +22,6 @@ public class FixtureAsync : BugTestCase [Test, Explicit] public async Task MemoryLeakAsync() { - long initialMemory = GC.GetTotalMemory(true); long nextId = 1; long nextIdChild = 1; diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH309/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH309/Fixture.cs index 222040c8313..cd58ee89e2d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH309/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH309/Fixture.cs @@ -81,11 +81,10 @@ public async Task RemoveNodeFromNodesCollectionAsync() Assert.AreEqual(2, menu2.Nodes.Count, "Test count after removal"); Assert.AreEqual(rootNode, menu2.Nodes[0], "Test identity first node in menu"); - await (s.DeleteAsync("from Node")); await (s.DeleteAsync("from Menu")); await (s.FlushAsync()); s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3121/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3121/Fixture.cs index 3c6a760e9ec..599081849d2 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3121/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3121/Fixture.cs @@ -7,7 +7,6 @@ // //------------------------------------------------------------------------------ - using System; using System.Drawing; using System.Linq; @@ -58,7 +57,6 @@ public void ShouldThrowWhenByteArrayTooLongAsync() Is.EqualTo("The length of the byte[] value exceeds the length configured in the mapping/parameter.")); } - [Test] public void ShouldThrowWhenImageTooLargeAsync() { @@ -75,7 +73,6 @@ public void ShouldThrowWhenImageTooLargeAsync() Is.EqualTo("The length of the byte[] value exceeds the length configured in the mapping/parameter.")); } - [Test] public void ShouldThrowWhenImageAsISerializableTooLargeAsync() { @@ -92,7 +89,6 @@ public void ShouldThrowWhenImageAsISerializableTooLargeAsync() Is.EqualTo("The length of the byte[] value exceeds the length configured in the mapping/parameter.")); } - private async Task PersistReportAsync(Report report, CancellationToken cancellationToken = default(CancellationToken)) { using (var session = OpenSession()) diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3139/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3139/Fixture.cs index 62a33d27160..616a62d3264 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3139/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3139/Fixture.cs @@ -75,7 +75,6 @@ protected override void OnTearDown() tran.Commit(); } } - } [Test] diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3142/ChildrenTest.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3142/ChildrenTest.cs index c5f420db6de..7d0e2aa0c2f 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3142/ChildrenTest.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3142/ChildrenTest.cs @@ -68,7 +68,6 @@ protected override void OnTearDown() } } - [Test] public async Task ChildrenCollectionOfAllParentsShouldContainsThreeElementsAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3202/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3202/Fixture.cs index 61a8bf45526..0cbd29f617b 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3202/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3202/Fixture.cs @@ -73,7 +73,6 @@ protected override void OnTearDown() base.OnTearDown(); } - [Test] public async Task OffsetNotStartingAtOneSetsParameterToSkipValueAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3252/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3252/Fixture.cs index 3f2dd8084a8..753173fddca 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3252/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3252/Fixture.cs @@ -32,7 +32,6 @@ public async Task VerifyThatWeCanSaveAndLoadAsync() using (var session = OpenSession()) using (var transaction = session.BeginTransaction()) { - await (session.SaveAsync(new Note { Text = new String('0', 9000) })); await (transaction.CommitAsync()); } @@ -40,7 +39,6 @@ public async Task VerifyThatWeCanSaveAndLoadAsync() using (var session = OpenSession()) using (session.BeginTransaction()) { - var note = await (session.Query().FirstAsync()); Assert.AreEqual(9000, note.Text.Length); } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs index e9f029b6656..35d1fcc0004 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs @@ -82,13 +82,11 @@ from std in me.State.StateDescriptions } } - private void CreateObjects(ISession session) { // Create the English culture Culture englishCulture = new Culture(); - englishCulture.CountryCode = "CA"; englishCulture.LanguageCode = "en"; @@ -115,8 +113,6 @@ private void CreateObjects(ISession session) dataType1.DataTypeDescriptions.Add(dataTypeDescription1); - - // Create a State and attach it an English description and a Spanish description State state1 = new State(); @@ -136,7 +132,6 @@ private void CreateObjects(ISession session) state1.StateDescriptions.Add(spanishStateDescription); - MasterEntity masterEntity = new MasterEntity(); masterEntity.Name = "MasterEntity 1"; @@ -147,4 +142,4 @@ private void CreateObjects(ISession session) session.Flush(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3372/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3372/Fixture.cs index 13fa3c39930..1bb33d42d49 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3372/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3372/Fixture.cs @@ -53,6 +53,5 @@ public async Task CanGeneratePropertyOnUpdateOfEntityWithCustomLoaderAsync() Assert.That(entity.ShardId, Is.Not.Null & Has.Length.GreaterThan(0)); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3392/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3392/Fixture.cs index 20f576ab904..dcba14487df 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3392/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3392/Fixture.cs @@ -38,7 +38,6 @@ public async Task ExpandSubCollectionWithEmbeddedCompositeIDAsync() using (ISession s = OpenSession()) using (var tx = s.BeginTransaction()) { - var jenny = new Mum {Name = "Jenny"}; await (s.SaveAsync(jenny)); var benny = new Dad {Name = "Benny"}; @@ -67,7 +66,6 @@ public async Task ExpandSubCollectionWithCompositeIDAsync() using (ISession s = OpenSession()) using (var tx = s.BeginTransaction()) { - var jenny = new Mum { Name = "Jenny" }; await (s.SaveAsync(jenny)); var benny = new Dad { Name = "Benny" }; @@ -89,7 +87,5 @@ public async Task ExpandSubCollectionWithCompositeIDAsync() Assert.That(result[0].x.Friends, Is.EquivalentTo(result[0].Friends)); } } - - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3428/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3428/Fixture.cs index ce0c12df83c..be5ff595aac 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3428/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3428/Fixture.cs @@ -18,7 +18,6 @@ namespace NHibernate.Test.NHSpecificTest.NH3428 [TestFixture] public class FixtureAsync : BugTestCase { - protected override bool AppliesTo(Dialect.Dialect dialect) { return dialect is Dialect.MsSql2005Dialect; @@ -73,4 +72,4 @@ public async Task QueryFailsWhenDistinctOrderedResultIsPagedPastPageOneAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3453/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3453/Fixture.cs index 3f8743c547c..5b282c96762 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3453/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3453/Fixture.cs @@ -24,7 +24,6 @@ public async Task PropertyRefWithCompositeIdUpdateTestAsync() using (var session = OpenSession()) using (session.BeginTransaction()) { - var direction1 = new Direction { Id1 = 1, Id2 = 1, GUID = Guid.NewGuid() }; await (session.SaveAsync(direction1)); @@ -51,6 +50,5 @@ public async Task PropertyRefWithCompositeIdUpdateTestAsync() Assert.That(true); } } - - } -} \ No newline at end of file + } +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3487/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3487/Fixture.cs index 5616a72861a..541a2c57048 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3487/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3487/Fixture.cs @@ -89,7 +89,6 @@ public async Task CanDeserializeSessionWithEntityHashCollisionAsync() { formatter.Deserialize(serializationStream); } - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3567/NH3567Tests.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3567/NH3567Tests.cs index 5f539d42eb5..ec0564e5447 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3567/NH3567Tests.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3567/NH3567Tests.cs @@ -31,7 +31,6 @@ protected override void OnSetUp() session.Save(site1); session.Save(site2); - var p1 = new Post { Id = ++id, Content = "Post 1", Site = site1 }; var p2 = new Post { Id = ++id, Content = "Post 2", Site = site2 }; @@ -103,16 +102,9 @@ public async Task TestFlushModeAutoAsync() Assert.That(numberOfComments, Is.EqualTo(2), "Query with sub-query returned an invalid number of rows."); - await (transaction.RollbackAsync()); - } - } } - - } - - } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3571/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3571/Fixture.cs index 4c7241ba7a0..757c701fe2d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3571/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3571/Fixture.cs @@ -84,7 +84,6 @@ protected override void OnTearDown() tran.Commit(); } } - } [Test] @@ -103,7 +102,6 @@ public async Task CanQueryDynamicComponentInComponentAsync() } } - [Test] public async Task MultipleQueriesShouldNotCacheAsync() { @@ -124,4 +122,4 @@ public async Task MultipleQueriesShouldNotCacheAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3604/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3604/FixtureByCode.cs index 65857f6540e..4d20d5fb2af 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3604/FixtureByCode.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3604/FixtureByCode.cs @@ -52,7 +52,6 @@ protected override void OnSetUp() var e1 = new Entity { Name = "Bob" }; session.Save(e1); - var e2 = new Entity { Name = "Sally" }; var ed2 = new EntityDetail(e2) { ExtraInfo = "Jo" }; e2.Detail = ed2; diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3818/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3818/Fixture.cs index f657909653b..69ea1bebfdb 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3818/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3818/Fixture.cs @@ -70,9 +70,7 @@ public async Task SelectConditionalValuesTestAsync() //Console.WriteLine(spy.ToString()); Assert.That(catInfo2.AliveDays, Is.EqualTo(0)); - - } + } } - - } + } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3844/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3844/Fixture.cs index 006536ab127..58ca033f629 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3844/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3844/Fixture.cs @@ -65,7 +65,6 @@ protected override void OnSetUp() session.Save(compP3_x); session.Save(compP3_y); - session.Save(new TimeRecord { TimeInHours = 1, Project = project1, Components = { } }); session.Save(new TimeRecord { TimeInHours = 2, Project = project1, Components = { compP1_x } }); session.Save(new TimeRecord { TimeInHours = 3, Project = project1, Components = { compP1_y } }); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs index a7bbd5e8e8c..242e8fc5fd2 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs @@ -286,7 +286,6 @@ public virtual async Task ChildCollectionsWithSelectModeFetchAndWhereClauseShoul } } - [Test] public async Task ChildCollectionsFromLeftOuterJoinWithWhereClauseRestrictionOnCollectionShouldNotBeInSecondLevelCacheAsync() { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3909/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3909/FixtureByCode.cs index 18709a941d0..02e26378eb3 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3909/FixtureByCode.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3909/FixtureByCode.cs @@ -90,7 +90,6 @@ public async Task YourTestNameAsync() //select b; Assert.AreEqual(2, (await (q.ToListAsync())).Count); - } } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH440/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH440/Fixture.cs index 0d7bc046b96..94646285f5c 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH440/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH440/Fixture.cs @@ -32,7 +32,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect) return TestDialect.SupportsEmptyInsertsOrHasNonIdentityNativeGenerator; } - protected override void OnSetUp() { base.OnSetUp(); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH521/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH521/Fixture.cs index 36edb20ef78..e1a6b5128cb 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH521/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH521/Fixture.cs @@ -62,7 +62,6 @@ public async Task AttachUninitProxyCausesInitAsync() NHibernateUtil.IsInitialized(uninitEntity), "session.GetCurrentLockMode() causes initialization of an unitialized entity."); - await (session.DeleteAsync("from System.Object")); await (transaction.CommitAsync()); } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH681/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH681/Fixture.cs index 982ac3e3aae..2cf457e6646 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH681/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH681/Fixture.cs @@ -19,7 +19,6 @@ public class FixtureAsync : BugTestCase { protected override void Configure(NHibernate.Cfg.Configuration cfg) { - } [Test] diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH732/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH732/Fixture.cs index 55faa37363d..0e5c95f1c1d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH732/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH732/Fixture.cs @@ -23,7 +23,6 @@ namespace NHibernate.Test.NHSpecificTest.NH732 [TestFixture] public class FixtureAsync : BugTestCase { - protected override bool AppliesTo(Dialect.Dialect dialect) { return dialect is MsSql2000Dialect; diff --git a/src/NHibernate.Test/Async/NHSpecificTest/SimpleComponentFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/SimpleComponentFixture.cs index ca883765fe2..33d2abf1c64 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/SimpleComponentFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/SimpleComponentFixture.cs @@ -47,7 +47,6 @@ protected override void OnSetUp() simpleComp.Audit.UpdatedDate = DateTime.Now; simpleComp.Audit.UpdatedUserId = "TestUpdated"; - s.Save(simpleComp, 10L); t.Commit(); @@ -63,7 +62,6 @@ protected override void OnTearDown() } } - [Test] public async Task TestLoadAsync() { diff --git a/src/NHibernate.Test/Async/Naturalid/Mutable/MutableNaturalIdFixture.cs b/src/NHibernate.Test/Async/Naturalid/Mutable/MutableNaturalIdFixture.cs index cff588874ae..2efd6f13040 100644 --- a/src/NHibernate.Test/Async/Naturalid/Mutable/MutableNaturalIdFixture.cs +++ b/src/NHibernate.Test/Async/Naturalid/Mutable/MutableNaturalIdFixture.cs @@ -227,7 +227,6 @@ public async Task NaturalIdCacheAsync() await (t.CommitAsync()); s.Close(); - s = OpenSession(); t = s.BeginTransaction(); await (s.DeleteAsync("from User")); @@ -258,4 +257,4 @@ public async Task QueryingAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/Pagination/CustomDialectFixture.cs b/src/NHibernate.Test/Async/Pagination/CustomDialectFixture.cs index 6a0526e1272..fa53ce1ce4e 100644 --- a/src/NHibernate.Test/Async/Pagination/CustomDialectFixture.cs +++ b/src/NHibernate.Test/Async/Pagination/CustomDialectFixture.cs @@ -80,7 +80,6 @@ protected override void OnSetUp() protected override void OnTearDown() { - using (ISession s = OpenSession()) using (ITransaction t = s.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs b/src/NHibernate.Test/Async/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs index 233dcdfe2a8..1d35318f531 100644 --- a/src/NHibernate.Test/Async/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs +++ b/src/NHibernate.Test/Async/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs @@ -113,7 +113,6 @@ public void WhenSaveDeleteBaseClassCastedToInterfaceThenNotThrowsAsync() await (s.FlushAsync()); } }, Throws.Nothing); - } [Test] diff --git a/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs b/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs index b9b01442c88..420b86e42fd 100644 --- a/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs +++ b/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs @@ -75,7 +75,6 @@ protected override void OnTearDown() } } - [Test] public void ErrorFromDBWillGiveTheActualSQLExecutedAsync() { @@ -100,7 +99,6 @@ public void ErrorFromDBWillGiveTheActualSQLExecutedAsync() .Add(Projections.Count("child.Key.Area")) ); - var e = Assert.ThrowsAsync(async () => { using (var s = Sfi.OpenSession()) diff --git a/src/NHibernate.Test/Async/PropertyRef/KeyPropertyRefFixture.cs b/src/NHibernate.Test/Async/PropertyRef/KeyPropertyRefFixture.cs index 0f466622dd8..076a31d8567 100644 --- a/src/NHibernate.Test/Async/PropertyRef/KeyPropertyRefFixture.cs +++ b/src/NHibernate.Test/Async/PropertyRef/KeyPropertyRefFixture.cs @@ -63,7 +63,6 @@ public async Task PropertyRefUsesOtherColumnAsync() Assert.AreEqual(1, newA.Items.Count); s.Close(); - } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/QueryTest/MultiCriteriaFixture.cs b/src/NHibernate.Test/Async/QueryTest/MultiCriteriaFixture.cs index 16026d41f87..ff81250d911 100644 --- a/src/NHibernate.Test/Async/QueryTest/MultiCriteriaFixture.cs +++ b/src/NHibernate.Test/Async/QueryTest/MultiCriteriaFixture.cs @@ -498,7 +498,6 @@ public async Task MultiCriteriaAutoFlushAsync() await (tx.CommitAsync()); Assert.That(count, Is.EqualTo(0), "Session wasn't auto flushed."); - } } } diff --git a/src/NHibernate.Test/Async/QueryTest/QueryBatchFixture.cs b/src/NHibernate.Test/Async/QueryTest/QueryBatchFixture.cs index 6f42383623c..19340bf44e5 100644 --- a/src/NHibernate.Test/Async/QueryTest/QueryBatchFixture.cs +++ b/src/NHibernate.Test/Async/QueryTest/QueryBatchFixture.cs @@ -472,7 +472,6 @@ public async Task TwoMultiHqlWithDifferentPagingGetDifferentResultsWhenUsingCach [Test] public async Task CanUseSecondLevelCacheWithPositionalParametersAndHqlAsync() { - await (Sfi.QueryCache.ClearAsync(CancellationToken.None)); await (CreateItemsAsync()); @@ -736,7 +735,6 @@ public async Task TwoMultiQueriesWithDifferentPagingGetDifferentResultsWhenUsing [Test] public async Task CanUseSecondLevelCacheWithPositionalParametersAsync() { - await (Sfi.QueryCache.ClearAsync(CancellationToken.None)); await (CreateItemsAsync()); diff --git a/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs b/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs index 02f626a77e6..059ffec0eac 100644 --- a/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs +++ b/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs @@ -284,7 +284,6 @@ public async Task ExistingReadOnlyAfterSetSessionModifiableAsync() [Test] public async Task ExistingReadOnlyAfterSetSessionModifiableExistingAsync() { - Container cOrig = CreateContainer(); ISet expectedInitializedObjects = new HashSet( @@ -376,13 +375,11 @@ public async Task ExistingReadOnlyAfterSetSessionModifiableExistingAsync() await (s.CreateQuery("delete from Owner").ExecuteUpdateAsync()); await (t.CommitAsync()); s.Close(); - } [Test] public async Task ExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnlyAsync() { - Container cOrig = CreateContainer(); ISet expectedInitializedObjects = new HashSet( @@ -483,7 +480,6 @@ public async Task ExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnl [Test] public async Task ExistingReadOnlyAfterSetSessionModifiableProxyExistingAsync() { - Container cOrig = CreateContainer(); ISet expectedInitializedObjects = new HashSet( @@ -576,7 +572,6 @@ public async Task ExistingReadOnlyAfterSetSessionModifiableProxyExistingAsync() await (s.CreateQuery("delete from Owner").ExecuteUpdateAsync()); await (t.CommitAsync()); s.Close(); - } [Test] @@ -1398,8 +1393,7 @@ public async Task DefaultModifiableWithFilterCollectionEntitiesAsync() await (t.CommitAsync()); s.Close(); } - - + private Container CreateContainer() { Container c = new Container("container"); diff --git a/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionTest.cs b/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionTest.cs index c4c037cb7a8..2541e43a9c5 100644 --- a/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionTest.cs +++ b/src/NHibernate.Test/Async/ReadOnly/ReadOnlySessionTest.cs @@ -1043,7 +1043,6 @@ public async Task MergeWithReadOnlyEntityAsync() await (t.CommitAsync()); } } - } [Test] diff --git a/src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs b/src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs index a375e64c216..bf709eb7380 100644 --- a/src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs +++ b/src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs @@ -104,7 +104,6 @@ public async Task InvalidatesEntitiesAsync() await (tx.CommitAsync()); } - //Update Item using LINQ using (var tx = session.BeginTransaction()) { diff --git a/src/NHibernate.Test/Async/SqlTest/Custom/CustomSQLSupportTest.cs b/src/NHibernate.Test/Async/SqlTest/Custom/CustomSQLSupportTest.cs index 3b47237dc01..fad2a72a99d 100644 --- a/src/NHibernate.Test/Async/SqlTest/Custom/CustomSQLSupportTest.cs +++ b/src/NHibernate.Test/Async/SqlTest/Custom/CustomSQLSupportTest.cs @@ -92,6 +92,5 @@ public async Task HandSQLAsync() await (t.CommitAsync()); s.Close(); } - } } diff --git a/src/NHibernate.Test/Async/SqlTest/Custom/CustomStoredProcSupportTest.cs b/src/NHibernate.Test/Async/SqlTest/Custom/CustomStoredProcSupportTest.cs index 3baf9b8b792..5e91ba4870b 100644 --- a/src/NHibernate.Test/Async/SqlTest/Custom/CustomStoredProcSupportTest.cs +++ b/src/NHibernate.Test/Async/SqlTest/Custom/CustomStoredProcSupportTest.cs @@ -80,6 +80,5 @@ public async Task EntityStoredProcedureAsync() await (t.CommitAsync()); s.Close(); } - } } diff --git a/src/NHibernate.Test/Async/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs b/src/NHibernate.Test/Async/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs index a58ec17a5db..e88ed21e1ec 100644 --- a/src/NHibernate.Test/Async/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs +++ b/src/NHibernate.Test/Async/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs @@ -66,6 +66,5 @@ public async Task RefCursorOutStoredProcedureAsync() await (t.CommitAsync()); s.Close(); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/SqlTest/Query/NativeSQLQueriesFixture.cs b/src/NHibernate.Test/Async/SqlTest/Query/NativeSQLQueriesFixture.cs index 92f307a14c7..bd97e366e49 100644 --- a/src/NHibernate.Test/Async/SqlTest/Query/NativeSQLQueriesFixture.cs +++ b/src/NHibernate.Test/Async/SqlTest/Query/NativeSQLQueriesFixture.cs @@ -473,7 +473,6 @@ public async Task AutoDetectAliasingAsync() AssertClassAssignability(o[0].GetType(), typeof(long)); AssertClassAssignability(o[1].GetType(), typeof(Employment)); - IQuery queryWithCollection = s.GetNamedQuery("organizationEmploymentsExplicitAliases"); queryWithCollection.SetInt64("id", jboss.Id); list = await (queryWithCollection.ListAsync()); diff --git a/src/NHibernate.Test/Async/Stateless/Fetching/StatelessSessionFetchingTest.cs b/src/NHibernate.Test/Async/Stateless/Fetching/StatelessSessionFetchingTest.cs index 5c3c77af291..18a62a49bfd 100644 --- a/src/NHibernate.Test/Async/Stateless/Fetching/StatelessSessionFetchingTest.cs +++ b/src/NHibernate.Test/Async/Stateless/Fetching/StatelessSessionFetchingTest.cs @@ -81,5 +81,4 @@ public async System.Threading.Tasks.Task DynamicFetchAsync() } } } - } diff --git a/src/NHibernate.Test/Async/Stateless/StatelessWithRelationsFixture.cs b/src/NHibernate.Test/Async/Stateless/StatelessWithRelationsFixture.cs index 820b389c6b4..9417cba7b8a 100644 --- a/src/NHibernate.Test/Async/Stateless/StatelessWithRelationsFixture.cs +++ b/src/NHibernate.Test/Async/Stateless/StatelessWithRelationsFixture.cs @@ -97,6 +97,5 @@ public async Task ShouldWorkLoadingComplexEntitiesAsync() await (tx.CommitAsync()); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/TypesTest/CurrencyTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/CurrencyTypeFixture.cs index 09d7e9b215c..fb97ec4384e 100644 --- a/src/NHibernate.Test/Async/TypesTest/CurrencyTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/CurrencyTypeFixture.cs @@ -43,6 +43,5 @@ public async Task ReadWriteAsync() await (s.FlushAsync()); s.Close(); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/TypesTest/EnumCharTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/EnumCharTypeFixture.cs index efbd66c3730..5cac8dea7d8 100644 --- a/src/NHibernate.Test/Async/TypesTest/EnumCharTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/EnumCharTypeFixture.cs @@ -25,7 +25,6 @@ protected override string TypeName protected override void OnSetUp() { - EnumCharClass basic = new EnumCharClass(); basic.Id = 1; basic.EnumValue = SampleCharEnum.Dimmed; @@ -154,4 +153,4 @@ public async Task CanBeUsedAsDiscriminatorAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/TypesTest/EnumStringTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/EnumStringTypeFixture.cs index 522c7ffa045..255951b0b7a 100644 --- a/src/NHibernate.Test/Async/TypesTest/EnumStringTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/EnumStringTypeFixture.cs @@ -48,7 +48,6 @@ protected override void OnTearDown() s.Close(); } - [Test] public async Task ReadFromLoadAsync() { @@ -99,4 +98,4 @@ public async Task ReadFromQueryAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/TypesTest/GenericEnumStringTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/GenericEnumStringTypeFixture.cs index 16106ed63fc..699ef01850b 100644 --- a/src/NHibernate.Test/Async/TypesTest/GenericEnumStringTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/GenericEnumStringTypeFixture.cs @@ -50,7 +50,6 @@ protected override void OnTearDown() s.Close(); } - [Test] public async Task ReadFromLoadAsync() { diff --git a/src/NHibernate.Test/Async/TypesTest/PersistentEnumTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/PersistentEnumTypeFixture.cs index e02924826b8..aa434f8532f 100644 --- a/src/NHibernate.Test/Async/TypesTest/PersistentEnumTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/PersistentEnumTypeFixture.cs @@ -95,4 +95,4 @@ public async Task CanWriteAndReadUsingBothHeuristicAndExplicitGenericDeclaration } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/TypesTest/UriTypeFixture.cs b/src/NHibernate.Test/Async/TypesTest/UriTypeFixture.cs index e71c4ea67ed..23ebe6fcc5d 100644 --- a/src/NHibernate.Test/Async/TypesTest/UriTypeFixture.cs +++ b/src/NHibernate.Test/Async/TypesTest/UriTypeFixture.cs @@ -52,7 +52,6 @@ public async Task ReadWriteAsync() } } - [Test(Description = "NH-2887")] public async Task ReadWriteRelativeUriAsync() { @@ -101,6 +100,5 @@ public async Task InsertNullValueAsync() await (s.FlushAsync()); } } - } } diff --git a/src/NHibernate.Test/Async/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs b/src/NHibernate.Test/Async/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs index 1b85a8dc996..63fa322ba71 100644 --- a/src/NHibernate.Test/Async/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs +++ b/src/NHibernate.Test/Async/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs @@ -48,7 +48,6 @@ public async Task QueryOverPersonTestAsync() await (s.DeleteAsync(result)); await (t.CommitAsync()); } - } } @@ -69,7 +68,6 @@ public async Task QueryOverCompanyTestAsync() var result = await (s.QueryOver().Where(p => p.Name == "Limited").SingleOrDefaultAsync()); Assert.NotNull(result); } - } } } diff --git a/src/NHibernate.Test/Async/UserCollection/UserCollectionTypeTest.cs b/src/NHibernate.Test/Async/UserCollection/UserCollectionTypeTest.cs index d75f7cc699a..5e2393d93d5 100644 --- a/src/NHibernate.Test/Async/UserCollection/UserCollectionTypeTest.cs +++ b/src/NHibernate.Test/Async/UserCollection/UserCollectionTypeTest.cs @@ -28,7 +28,6 @@ protected override string[] Mappings get { return new string[] {"UserCollection.UserPermissions.hbm.xml"}; } } - [Test] public async Task BasicOperationAsync() { @@ -51,4 +50,4 @@ public async Task BasicOperationAsync() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Async/UtilityTest/LinkedHashMapFixture.cs b/src/NHibernate.Test/Async/UtilityTest/LinkedHashMapFixture.cs index 8d0477681f3..ff1e2011664 100644 --- a/src/NHibernate.Test/Async/UtilityTest/LinkedHashMapFixture.cs +++ b/src/NHibernate.Test/Async/UtilityTest/LinkedHashMapFixture.cs @@ -33,7 +33,6 @@ private static void Fill(IDictionary lhm) lhm.Add(player.Id, player); } - [Test, Explicit] public async Task ShowDiffAsync() { @@ -140,4 +139,3 @@ public async Task PerformanceAsync() } } } - diff --git a/src/NHibernate.Test/Async/UtilityTest/SequencedHashMapFixture.cs b/src/NHibernate.Test/Async/UtilityTest/SequencedHashMapFixture.cs index 077ff253646..1190cffab50 100644 --- a/src/NHibernate.Test/Async/UtilityTest/SequencedHashMapFixture.cs +++ b/src/NHibernate.Test/Async/UtilityTest/SequencedHashMapFixture.cs @@ -52,7 +52,6 @@ public void SetUp() } } - [Test, Explicit] public async Task PerformanceAsync() { @@ -143,7 +142,6 @@ public async Task PerformanceAsync() listItemTicks[runIndex] = DateTime.Now.Ticks - listStart; - list.Clear(); } @@ -181,4 +179,4 @@ public async Task PerformanceAsync() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/BulkManipulation/NativeSQLBulkOperationsWithCache.cs b/src/NHibernate.Test/BulkManipulation/NativeSQLBulkOperationsWithCache.cs index 96ea66124c4..77849de3697 100644 --- a/src/NHibernate.Test/BulkManipulation/NativeSQLBulkOperationsWithCache.cs +++ b/src/NHibernate.Test/BulkManipulation/NativeSQLBulkOperationsWithCache.cs @@ -39,7 +39,6 @@ public void SimpleNativeSQLInsert_DoesNotEvictEntireCacheWhenQuerySpacesAreAdded using (var t = s.BeginTransaction()) { - s.CreateSQLQuery(ssql).ExecuteUpdate(); t.Commit(); diff --git a/src/NHibernate.Test/Bytecode/ActivatorObjectFactoryFixture.cs b/src/NHibernate.Test/Bytecode/ActivatorObjectFactoryFixture.cs index daba1084d9a..f4ecb052d81 100644 --- a/src/NHibernate.Test/Bytecode/ActivatorObjectFactoryFixture.cs +++ b/src/NHibernate.Test/Bytecode/ActivatorObjectFactoryFixture.cs @@ -43,8 +43,6 @@ public void CreateInstanceDefCtor() Assert.That(instance, Is.InstanceOf()); } - - [Test, Obsolete] public void CreateInstanceWithNoPublicCtor() { diff --git a/src/NHibernate.Test/CacheTest/BatchableCacheFixture.cs b/src/NHibernate.Test/CacheTest/BatchableCacheFixture.cs index 036de1267e5..e8df7dca2de 100644 --- a/src/NHibernate.Test/CacheTest/BatchableCacheFixture.cs +++ b/src/NHibernate.Test/CacheTest/BatchableCacheFixture.cs @@ -1683,6 +1683,5 @@ private BatchableCache GetDefaultQueryCache() return cache; } - } } diff --git a/src/NHibernate.Test/CacheTest/SerializationFixture.cs b/src/NHibernate.Test/CacheTest/SerializationFixture.cs index eb21721f45b..f62b5e87f5e 100644 --- a/src/NHibernate.Test/CacheTest/SerializationFixture.cs +++ b/src/NHibernate.Test/CacheTest/SerializationFixture.cs @@ -108,7 +108,6 @@ public void TestAnyTypeObjectTypeCacheEntrySerialization() CheckObjectTypeCacheEntry(item, copy); } - [Serializable] public class MyEntity { diff --git a/src/NHibernate.Test/Cascade/Circle/MultiPathCircleCascadeTest.cs b/src/NHibernate.Test/Cascade/Circle/MultiPathCircleCascadeTest.cs index c32855efefd..6b1d36b49ae 100644 --- a/src/NHibernate.Test/Cascade/Circle/MultiPathCircleCascadeTest.cs +++ b/src/NHibernate.Test/Cascade/Circle/MultiPathCircleCascadeTest.cs @@ -4,7 +4,6 @@ namespace NHibernate.Test.Cascade.Circle { - /** * The test case uses the following model: * diff --git a/src/NHibernate.Test/Cascade/MultiPathCascadeTest.cs b/src/NHibernate.Test/Cascade/MultiPathCascadeTest.cs index 1ae1955c813..f6da41c7359 100644 --- a/src/NHibernate.Test/Cascade/MultiPathCascadeTest.cs +++ b/src/NHibernate.Test/Cascade/MultiPathCascadeTest.cs @@ -26,7 +26,6 @@ public void MultiPathMergeModifiedDetached() using (ISession s = OpenSession()) using (s.BeginTransaction()) { - a.Data = "Anna"; s.Save(a); s.Transaction.Commit(); diff --git a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/DeleteOneToOneOrphansTest.cs b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/DeleteOneToOneOrphansTest.cs index d4b40bc9af8..a6aa17f6c90 100644 --- a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/DeleteOneToOneOrphansTest.cs +++ b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/DeleteOneToOneOrphansTest.cs @@ -97,7 +97,6 @@ protected override string[] Mappings get { return Array.Empty(); } } - protected override void AddMappings(Cfg.Configuration configuration) { var mapper = new ModelMapper(); diff --git a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/Model.cs b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/Model.cs index 6e51d129423..7e09eac540d 100644 --- a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/Model.cs +++ b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/Model.cs @@ -10,7 +10,6 @@ public class Employee public Employee() { - } } @@ -23,7 +22,6 @@ public class Identifier public Identifier() { - } public Identifier(long companyId, long personId) @@ -32,7 +30,6 @@ public Identifier(long companyId, long personId) this.PersonId = personId; } - public override bool Equals(Object o) { if (this == o) @@ -43,7 +40,6 @@ public override bool Equals(Object o) var t = this.GetType(); var u = o.GetType(); - if (o == null || !t.IsAssignableFrom(u) || !u.IsAssignableFrom(t)) { return false; @@ -53,7 +49,6 @@ public override bool Equals(Object o) return CompanyId.Equals(id.CompanyId) && PersonId.Equals(id.PersonId); - } public override int GetHashCode() @@ -67,7 +62,6 @@ public override int GetHashCode() public EmployeeInfo() { - } public EmployeeInfo(long companyId, long personId) diff --git a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Reversed/Unidirectional/Model.cs b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Reversed/Unidirectional/Model.cs index cf3cedada54..a238a61ba64 100644 --- a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Reversed/Unidirectional/Model.cs +++ b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Reversed/Unidirectional/Model.cs @@ -8,7 +8,6 @@ public class Employee public Employee() { - } } @@ -18,7 +17,6 @@ public class EmployeeInfo public EmployeeInfo() { - } public EmployeeInfo(long id) diff --git a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Bidirectional/Model.cs b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Bidirectional/Model.cs index fb77ed67ec6..4383c6e8ea9 100644 --- a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Bidirectional/Model.cs +++ b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Bidirectional/Model.cs @@ -8,7 +8,6 @@ public class Employee public Employee() { - } } @@ -19,7 +18,6 @@ public class EmployeeInfo public EmployeeInfo() { - } public EmployeeInfo(Employee employee) diff --git a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/DeleteOneToOneOrphansTest.cs b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/DeleteOneToOneOrphansTest.cs index 0d54551499e..4cf8931e1bf 100644 --- a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/DeleteOneToOneOrphansTest.cs +++ b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/DeleteOneToOneOrphansTest.cs @@ -13,7 +13,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - protected override void OnSetUp() { base.OnSetUp(); diff --git a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/Model.cs b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/Model.cs index 54e04169711..d6c8a610b38 100644 --- a/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/Model.cs +++ b/src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Unidirectional/Model.cs @@ -8,7 +8,6 @@ public class Employee public Employee() { - } } @@ -18,7 +17,6 @@ public class EmployeeInfo public EmployeeInfo() { - } public EmployeeInfo(long id) diff --git a/src/NHibernate.Test/Cascade/RefreshFixture.cs b/src/NHibernate.Test/Cascade/RefreshFixture.cs index 83601225f88..67172170269 100644 --- a/src/NHibernate.Test/Cascade/RefreshFixture.cs +++ b/src/NHibernate.Test/Cascade/RefreshFixture.cs @@ -83,7 +83,6 @@ public void RefreshIgnoringTransientInCollection() { using (ITransaction txn = session.BeginTransaction()) { - var batch = new JobBatch(DateTime.Now); batch.CreateJob().ProcessingInstructions = "Just do it!"; session.Persist(batch); @@ -116,6 +115,5 @@ public void RefreshNotIgnoringTransientByUnsavedValue() session.Close(); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs b/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs index 7735cf05eb6..7fca6448984 100644 --- a/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs +++ b/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs @@ -425,7 +425,6 @@ public class SampleQueryProvider : DefaultQueryProvider { public SampleQueryProvider(ISessionImplementor session) : base(session) { - } protected SampleQueryProvider(ISessionImplementor session, object collection, NhQueryableOptions options) : base(session, collection, options) @@ -479,8 +478,6 @@ public void NH2890Xml() Assert.IsInstanceOf(typeof(SampleQueryProvider), query.Provider); } } - } - } } diff --git a/src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs b/src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs index 1708979ac92..f18cba454d2 100644 --- a/src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs +++ b/src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.CfgTest { - #region Classes used by the mappings defined in the Dynamic Assembly public class A diff --git a/src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs b/src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs index 327b32faddd..680a232cbf3 100644 --- a/src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs +++ b/src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs @@ -155,6 +155,5 @@ public void NH2890Loquacious() } } } - } } diff --git a/src/NHibernate.Test/Classic/LifecycleFixture.cs b/src/NHibernate.Test/Classic/LifecycleFixture.cs index e9f87627c3f..b687e19bcbb 100644 --- a/src/NHibernate.Test/Classic/LifecycleFixture.cs +++ b/src/NHibernate.Test/Classic/LifecycleFixture.cs @@ -98,7 +98,6 @@ public void Merge() Assert.That(Sfi.Statistics.EntityInsertCount, Is.EqualTo(0)); Assert.That(Sfi.Statistics.EntityUpdateCount, Is.EqualTo(0)); - // cleanup using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) @@ -131,4 +130,4 @@ public void Delete() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Classic/ValidatableFixture.cs b/src/NHibernate.Test/Classic/ValidatableFixture.cs index ec657f017d6..a7a399a0de5 100644 --- a/src/NHibernate.Test/Classic/ValidatableFixture.cs +++ b/src/NHibernate.Test/Classic/ValidatableFixture.cs @@ -133,7 +133,6 @@ public void Merge() // Ok } - // cleanup using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) @@ -156,6 +155,5 @@ public void Delete() s.Flush(); } } - } } diff --git a/src/NHibernate.Test/CollectionTest/A.cs b/src/NHibernate.Test/CollectionTest/A.cs index b619008c4e0..c12b34faca1 100644 --- a/src/NHibernate.Test/CollectionTest/A.cs +++ b/src/NHibernate.Test/CollectionTest/A.cs @@ -28,6 +28,5 @@ public IList Items get { return _items; } set { _items = value; } } - } } diff --git a/src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs b/src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs index 5cf758b76ef..0d2b479fe57 100644 --- a/src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs +++ b/src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs @@ -47,7 +47,6 @@ protected override void OnTearDown() } } - /// /// Test the basic CRUD operations for a class with a Composite Identifier /// diff --git a/src/NHibernate.Test/CompositeId/CompositeIdFixture.cs b/src/NHibernate.Test/CompositeId/CompositeIdFixture.cs index aee299e06eb..e63fed37cb1 100644 --- a/src/NHibernate.Test/CompositeId/CompositeIdFixture.cs +++ b/src/NHibernate.Test/CompositeId/CompositeIdFixture.cs @@ -127,7 +127,6 @@ public void CompositeIds() t.Commit(); } - using (s = OpenSession()) { t = s.BeginTransaction(); @@ -287,4 +286,4 @@ public void Query() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/CompositeId/Id.cs b/src/NHibernate.Test/CompositeId/Id.cs index bb3e4452594..b3fa40d7f2d 100644 --- a/src/NHibernate.Test/CompositeId/Id.cs +++ b/src/NHibernate.Test/CompositeId/Id.cs @@ -31,14 +31,14 @@ public string KeyString //KeyShort is commented to test access attributes; So expose it as method instead public short GetKeyShort() => _keyShort; // public short KeyShort { -// get { return _keyShort;} -// set {_keyShort = value;} +// get { return _keyShort; } +// set {_keyShort = value; } // } public DateTime KeyDateTime { get { return _keyDateTime; } -// set {_keyDateTime = value;} +// set {_keyDateTime = value; } } public override int GetHashCode() diff --git a/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs b/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs index 47c5bb86c5a..5030067e5e8 100644 --- a/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs +++ b/src/NHibernate.Test/ConnectionStringTest/NamedConnectionStringFixture.cs @@ -46,7 +46,6 @@ public void CanGetNamedConnectionStringFromConfiguration() public partial class MockConnectionProvider : ConnectionProvider { - public string PublicConnectionString { get @@ -54,7 +53,7 @@ public string PublicConnectionString return base.ConnectionString; } } - + /// /// Get an open . /// @@ -69,5 +68,4 @@ protected override void ConfigureDriver(IDictionary settings) return; } } - } diff --git a/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs b/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs index 0cd83f5276c..b173b8c6987 100644 --- a/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs +++ b/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs @@ -389,7 +389,6 @@ public void CloningCriteria_AddCount_RemoveOrdering() .AddOrder(Order.Asc("a.bodyWeight")); ICriteria cloned = CriteriaTransformer.TransformToRowCount(c); - cloned.List(); t.Rollback(); s.Close(); @@ -762,7 +761,6 @@ public void NH_1155_ShouldNotLoadAllChildrenInPagedSubSelect() course.Description = "Hibernate Training"; s.Save(course); - Student gavin = new Student(); gavin.Name = "Gavin King"; gavin.StudentNumber = 667; @@ -773,7 +771,6 @@ public void NH_1155_ShouldNotLoadAllChildrenInPagedSubSelect() ayende.StudentNumber = 1337; s.Save(ayende); - Student xam = new Student(); xam.Name = "Max Rydahl Andersen"; xam.StudentNumber = 101; @@ -818,7 +815,7 @@ public void NH_1155_ShouldNotLoadAllChildrenInPagedSubSelect() Enrolment key = new Enrolment(); key.CourseCode = "HIB"; - key.StudentNumber = 101;// xam + key.StudentNumber = 101; // xam //since we didn't load xam's entrollments before (skipped by orderring) //it should not be already loaded Enrolment shouldNotBeLoaded = (Enrolment)s.Load(typeof(Enrolment), key); @@ -901,7 +898,6 @@ public void ProjectionsTest() Assert.AreEqual(101L, result[2]); Assert.AreEqual(384.0D, (Double)result[3], 0.01D); - IList resultWithMaps = s.CreateCriteria(typeof(Enrolment)) .SetProjection(Projections.Distinct(Projections.ProjectionList() .Add(Projections.Property("StudentNumber"), "stNumber") @@ -932,7 +928,6 @@ public void ProjectionsTest() Assert.AreEqual(101L, m1["stNumber"]); Assert.AreEqual(667L, m0["stNumber"]); - IList resultWithAliasedBean = s.CreateCriteria(typeof(Enrolment)) .CreateAlias("Student", "st") .CreateAlias("Course", "co") @@ -989,7 +984,6 @@ public void ProjectionsTest() ProjectionList pp1 = Projections.ProjectionList().Add(Projections.RowCountInt64()); - object r = s.CreateCriteria(typeof(Enrolment)) .SetProjection(pp1) .UniqueResult(); @@ -1093,7 +1087,6 @@ public void CloningProjectionsTest() Assert.AreEqual(101L, result[2]); Assert.AreEqual(384.0D, (Double)result[3], 0.01D); - ICriteria criteriaToClone2 = s.CreateCriteria(typeof(Enrolment)) .SetProjection(Projections.Distinct(Projections.ProjectionList() .Add(Projections.Property("StudentNumber"), "stNumber") @@ -1126,7 +1119,6 @@ public void CloningProjectionsTest() Assert.AreEqual(101L, m1["stNumber"]); Assert.AreEqual(667L, m0["stNumber"]); - ICriteria criteriaToClone3 = s.CreateCriteria(typeof(Enrolment)) .CreateAlias("Student", "st") .CreateAlias("Course", "co") @@ -1877,7 +1869,6 @@ public void CloningProjectionsUsingProperty() Assert.AreEqual(101L, result[2]); Assert.AreEqual(384.0D, (double)result[3], 0.01D); - CriteriaTransformer.Clone( s.CreateCriteria(typeof(Enrolment)) .Add(Property.ForName("StudentNumber").Gt(665L)) @@ -1921,7 +1912,6 @@ public void CloningProjectionsUsingProperty() Assert.AreEqual(101L, m1["stNumber"]); Assert.AreEqual(667L, m0["stNumber"]); - IList resultWithAliasedBean = CriteriaTransformer.Clone(s.CreateCriteria(typeof(Enrolment)) .CreateAlias("Student", "st") .CreateAlias("Course", "co") @@ -2469,7 +2459,6 @@ public void SameColumnAndAliasNames() .Add(Projections.Property("StudentNumber"), "StudentNumber") .Add(Projections.Property("Name"), "Name")); - ISession session = OpenSession(); ITransaction t = session.BeginTransaction(); @@ -2506,7 +2495,6 @@ public void SameColumnAndAliasNamesResultTransformer() .Add(Property.ForName("Name").Eq("Gavin King")) .AddOrder(Order.Asc("StudentNumber")); - ISession session = OpenSession(); ITransaction t = session.BeginTransaction(); @@ -2638,7 +2626,6 @@ public void TransformToRowCountTest() ICriteria subCriterium = crit.CreateCriteria("PreferredCourse"); subCriterium.Add(Property.ForName("CourseCode").Eq("PREFFERED_CODE")); - ICriteria countCriteria = CriteriaTransformer.TransformToRowCount(crit); countCriteria.List(); @@ -2674,7 +2661,6 @@ public void OrderProjectionAliasedTest() using (ISession session = OpenSession()) using (ITransaction t = session.BeginTransaction()) { - Course courseA = new Course(); courseA.CourseCode = "HIB-A"; courseA.Description = "Hibernate Training A"; diff --git a/src/NHibernate.Test/Criteria/EntityJoinCriteriaTest.cs b/src/NHibernate.Test/Criteria/EntityJoinCriteriaTest.cs index 0ecebb750c6..f2c6360fee3 100644 --- a/src/NHibernate.Test/Criteria/EntityJoinCriteriaTest.cs +++ b/src/NHibernate.Test/Criteria/EntityJoinCriteriaTest.cs @@ -197,7 +197,6 @@ public void MixOfJoinsForAssociatedAndNotAssociatedEntities() using (var sqlLog = new SqlLogSpy()) using (var session = OpenSession()) { - EntityComplex root = null; EntityComplex ejLevel1 = null; EntitySimpleChild customChildForEjLevel1 = null; @@ -282,7 +281,6 @@ public void NullLeftEntityJoinWithEntityProjection() [Test] public void EntityJoinForCustomEntityName() { - using (var sqlLog = new SqlLogSpy()) using (var session = OpenSession()) { @@ -303,7 +301,6 @@ public void EntityJoinForCustomEntityName() [Test] public void EntityJoinForCustomEntityName_Expression() { - using (var sqlLog = new SqlLogSpy()) using (var session = OpenSession()) { @@ -404,7 +401,6 @@ protected override HbmMapping GetMappings() m.Inverse(true); }, a => a.OneToMany()); - }); mapper.Class( @@ -454,7 +450,6 @@ protected override HbmMapping GetMappings() rc.Property(e => e.Composite1Key1); rc.Property(e => e.Composite1Key2); rc.Property(e => e.CustomEntityNameId); - }); mapper.Class( diff --git a/src/NHibernate.Test/Criteria/EntityProjectionsTest.cs b/src/NHibernate.Test/Criteria/EntityProjectionsTest.cs index 98c67dcf547..e377106dcd2 100644 --- a/src/NHibernate.Test/Criteria/EntityProjectionsTest.cs +++ b/src/NHibernate.Test/Criteria/EntityProjectionsTest.cs @@ -50,7 +50,6 @@ protected override HbmMapping GetMappings() m.Inverse(true); }, a => a.OneToMany()); - }); mapper.Class( @@ -181,7 +180,6 @@ public void RootEntityProjectionLazy() .Select(Projections.RootEntity().SetLazy(true)) .Take(1).SingleOrDefault(); - Assert.That(NHibernateUtil.IsInitialized(entityRoot), Is.False, "Object must be lazy loaded."); } } @@ -314,7 +312,6 @@ public void MultipleLazyEntityProjections() //make sure objects are populated from different aliases for the same types Assert.That(root.Id, Is.Not.EqualTo(sameTypeChild.Id), "Different objects are expected for root and sameTypeChild."); Assert.That(child1.Id, Is.Not.EqualTo(child2.Id), "Different objects are expected for child1 and child2."); - } } @@ -444,7 +441,6 @@ public void MultipleEntitiesProjectionsToResultTransformer() } } - [Test] public void ReadOnlyProjection() { @@ -476,7 +472,6 @@ public void EntityProjectionForCompositeKeyInitialized() Assert.That(composite, Is.EqualTo(_entityWithCompositeId).Using((EntityWithCompositeId x, EntityWithCompositeId y) => (Equals(x.Key, y.Key) && Equals(x.Name, y.Name)) ? 0 : 1)); Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected"); } - } [Test] diff --git a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs index 8e092f9620e..c93a92bf1dd 100644 --- a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs @@ -1,5 +1,4 @@ - -using System; +using System; using NUnit.Framework; @@ -8,11 +7,9 @@ namespace NHibernate.Test.Criteria.Lambda { - [TestFixture] public class CriteriaAssertFixture : LambdaFixtureBase { - private void AssertCriteriaAreNotEqual(ICriteria expected, ICriteria actual) { try @@ -236,7 +233,5 @@ public void DifferentSubquery() AssertCriteriaAreNotEqual(expected, actual); } - } - } diff --git a/src/NHibernate.Test/Criteria/Lambda/CriteriaGenerationBenchmarks.cs b/src/NHibernate.Test/Criteria/Lambda/CriteriaGenerationBenchmarks.cs index ed6ce2d9ae4..0d2410ac642 100644 --- a/src/NHibernate.Test/Criteria/Lambda/CriteriaGenerationBenchmarks.cs +++ b/src/NHibernate.Test/Criteria/Lambda/CriteriaGenerationBenchmarks.cs @@ -88,7 +88,6 @@ public void ManyAliases() .Where(p => p.Name == father.Name && p.Father.Id == 10 && child.Nickname == "nickname" && child.Age > person.Age).UnderlyingCriteria; BenchQuery(s, criteria); - } } diff --git a/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs b/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs index d98df133848..26b0a48cce4 100644 --- a/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFixture.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq; @@ -10,11 +9,9 @@ namespace NHibernate.Test.Criteria.Lambda { - [TestFixture] public class ExpressionProcessorFixture { - [Test] public void TestFindMemberExpressionReference() { @@ -353,7 +350,5 @@ public void TestSignatureQualifiedGeneric() Assert.That(ExpressionProcessor.Signature(genericMethodWithQualifiedType), Is.EqualTo("NHibernate.Test.Criteria.Lambda.ExpressionProcessorFixture:T GenericMethod[T](T)")); } - } - } diff --git a/src/NHibernate.Test/Criteria/Lambda/FunctionsIntegrationFixture.cs b/src/NHibernate.Test/Criteria/Lambda/FunctionsIntegrationFixture.cs index 0ad2fe3ed96..7d5b7d014cf 100644 --- a/src/NHibernate.Test/Criteria/Lambda/FunctionsIntegrationFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/FunctionsIntegrationFixture.cs @@ -51,7 +51,6 @@ public void SqrtSingleOrDefault() } } - [Test] public void RoundDoubleWithOneArgument() { diff --git a/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs b/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs index 8394d11fb66..19ad76bc17b 100644 --- a/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs +++ b/src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs @@ -1,4 +1,3 @@ - using System; using System.Collections; using System.Collections.Generic; @@ -13,10 +12,8 @@ namespace NHibernate.Test.Criteria.Lambda { - public class LambdaFixtureBase { - private Hashtable _visitedObjects = new Hashtable(); private Stack _fieldPath = new Stack(); @@ -184,7 +181,5 @@ private void AssertObjectsAreEqual(object expected, object actual) _fieldPath.Clear(); AssertObjectsAreEqual(expected, actual, expected.GetType().Name); } - } - } diff --git a/src/NHibernate.Test/Criteria/Lambda/Model.cs b/src/NHibernate.Test/Criteria/Lambda/Model.cs index 557bce18ecb..1ca4ddfae0b 100644 --- a/src/NHibernate.Test/Criteria/Lambda/Model.cs +++ b/src/NHibernate.Test/Criteria/Lambda/Model.cs @@ -1,10 +1,8 @@ - using System; using System.Collections.Generic; namespace NHibernate.Test.Criteria.Lambda { - public enum PersonGender { Male = 1, @@ -13,7 +11,6 @@ public enum PersonGender public class Person { - public Person() { Children = new List(); @@ -51,7 +48,6 @@ public virtual Person AddChild(Child child) (Children as IList).Add(child); return this; } - } public class PersonDetail @@ -76,7 +72,6 @@ public class Child public class Relation { - public virtual Relation Related1 { get; set; } public virtual Relation Related2 { get; set; } public virtual Relation Related3 { get; set; } @@ -88,7 +83,6 @@ public class Relation public virtual IEnumerable Collection4 { get; set; } public virtual IEnumerable People { get; set; } - } public class PersonSummary @@ -122,4 +116,3 @@ public class JoinedChild public virtual Parent Parent { get; set; } } } - diff --git a/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs b/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs index 6b590fab678..2ae382b30a5 100644 --- a/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs @@ -7,11 +7,9 @@ namespace NHibernate.Test.Criteria.Lambda { - [TestFixture] public class ProjectionsFixture : LambdaFixtureBase { - private Child _subqueryChildAlias = null; private DetachedCriteria DetachedCriteriaAge @@ -202,7 +200,5 @@ public void SelectMultipleFunctionOfDateTimeOffset() AssertCriteriaAreEqual(expected, actual); } - } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs b/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs index a39b29c4747..f3ec4cb8458 100644 --- a/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs @@ -11,11 +11,9 @@ namespace NHibernate.Test.Criteria.Lambda { - [TestFixture] public class QueryOverFixture : LambdaFixtureBase { - [Test] public void SimpleCriterion_NoAlias() { @@ -170,7 +168,6 @@ public void Negation() .Add(Restrictions.Not(Restrictions.Eq("personAlias.Name", "test name"))) .Add(Restrictions.Not(Restrictions.Eq("Name", "not test name"))); - Person personAlias = null; IQueryOver actual = CreateTestQueryOver(() => personAlias) @@ -1039,7 +1036,5 @@ public void TransformQueryOverToRowCount64() AssertCriteriaAreEqual(expected.UnderlyingCriteria, actual); } - } - } diff --git a/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs b/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs index 9d59d86d77a..6f6d89386c1 100644 --- a/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs @@ -7,11 +7,9 @@ namespace NHibernate.Test.Criteria.Lambda { - [TestFixture] public class RestrictionsFixture : LambdaFixtureBase { - [Test] public void ArbitraryCriterion() { diff --git a/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs b/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs index a2a1b653595..d28e9493e38 100644 --- a/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs +++ b/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs @@ -11,11 +11,9 @@ namespace NHibernate.Test.Criteria.Lambda { - [TestFixture] public class SubqueryFixture : LambdaFixtureBase { - private Child _subqueryChildAlias = null; private DetachedCriteria DetachedCriteriaChild @@ -592,7 +590,5 @@ public void UntypedSubqueriesCriterion() AssertCriteriaAreEqual(expected, actual); } - } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Criteria/ProjectionsTest.cs b/src/NHibernate.Test/Criteria/ProjectionsTest.cs index 2d855f60bc2..0eb03b33a60 100644 --- a/src/NHibernate.Test/Criteria/ProjectionsTest.cs +++ b/src/NHibernate.Test/Criteria/ProjectionsTest.cs @@ -186,7 +186,6 @@ public void UsingConditionals() .UniqueResult(); Assert.AreEqual("yes", result); - result = session.CreateCriteria(typeof(Student)) .SetProjection( Projections.Conditional( @@ -211,7 +210,6 @@ public void UseInWithProjection() } } - [Test] public void UseLikeWithProjection() { @@ -260,7 +258,6 @@ public void UseEqWithProjection() } } - [Test] public void UseGtWithProjection() { diff --git a/src/NHibernate.Test/Criteria/SelectModeTest/SelectModeTest.cs b/src/NHibernate.Test/Criteria/SelectModeTest/SelectModeTest.cs index 8595e443c5d..033833e37ad 100644 --- a/src/NHibernate.Test/Criteria/SelectModeTest/SelectModeTest.cs +++ b/src/NHibernate.Test/Criteria/SelectModeTest/SelectModeTest.cs @@ -686,7 +686,6 @@ private static void MapList(IClassMapper rc, Express ckm.Name("ParentId"); }); km.ForeignKey("none"); - }); m.Cascade(Mapping.ByCode.Cascade.All); if (fetchMode != null) diff --git a/src/NHibernate.Test/DialectTest/DialectFixture.cs b/src/NHibernate.Test/DialectTest/DialectFixture.cs index 952e3e6c154..e80ef4d495a 100644 --- a/src/NHibernate.Test/DialectTest/DialectFixture.cs +++ b/src/NHibernate.Test/DialectTest/DialectFixture.cs @@ -33,7 +33,6 @@ public class DialectFixture // be. protected string[] tableThatNeedsToBeQuoted; - [SetUp] public virtual void SetUp() { @@ -92,7 +91,6 @@ public void QuoteTableNameAlreadyQuoted() d.QuoteForTableName(tableAlreadyQuoted[BeforeQuoteIndex])); } - /// /// Test that it does not matter if the name passed in has been quoted or not /// already. The UnQuote should take care of it and return the same result. diff --git a/src/NHibernate.Test/DialectTest/FunctionTests/SequenceSupportFixture.cs b/src/NHibernate.Test/DialectTest/FunctionTests/SequenceSupportFixture.cs index d96f03f438f..c93756b4f79 100644 --- a/src/NHibernate.Test/DialectTest/FunctionTests/SequenceSupportFixture.cs +++ b/src/NHibernate.Test/DialectTest/FunctionTests/SequenceSupportFixture.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.DialectTest.FunctionTests { /// @@ -25,7 +24,6 @@ public class SequenceSupportFixture .ToList(); } - [TestCaseSource(nameof(GetAllDialectTypes))] public void DialectSupportingSequencesMustFullfillSequenceContract(System.Type dialectType) { @@ -48,7 +46,6 @@ public void DialectSupportingSequencesMustFullfillSequenceContract(System.Type d dialect.GetSelectSequenceNextValString("foo"); dialect.GetSequenceNextValString("foo"); var sql = dialect.QuerySequencesString; - } } } diff --git a/src/NHibernate.Test/DialectTest/FunctionTests/SubstringSupportFixture.cs b/src/NHibernate.Test/DialectTest/FunctionTests/SubstringSupportFixture.cs index d80744439e2..84c83344946 100644 --- a/src/NHibernate.Test/DialectTest/FunctionTests/SubstringSupportFixture.cs +++ b/src/NHibernate.Test/DialectTest/FunctionTests/SubstringSupportFixture.cs @@ -5,7 +5,6 @@ using NHibernate.Dialect.Function; using NUnit.Framework; - namespace NHibernate.Test.DialectTest.FunctionTests { [TestFixture] @@ -23,7 +22,6 @@ public class SubstringSupportFixture .ToList(); } - [TestCaseSource(nameof(GetAllDialectTypes))] public void DialectShouldUseCorrectSubstringImplementation(System.Type dialectType) { diff --git a/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs b/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs index 838841e821f..1736282b48c 100644 --- a/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs +++ b/src/NHibernate.Test/DialectTest/SQLiteDialectFixture.cs @@ -103,7 +103,6 @@ public void QuotedTableNameWithSqlLite() Assert.AreEqual("\"Group\"", tbl.GetQualifiedName(dialect)); } - [Test] public void SchemaNameWithSqlLite() { diff --git a/src/NHibernate.Test/DialectTest/SchemaTests/ColumnMetaDataFixture.cs b/src/NHibernate.Test/DialectTest/SchemaTests/ColumnMetaDataFixture.cs index a8f9d8efa2b..f8d496fd9c9 100644 --- a/src/NHibernate.Test/DialectTest/SchemaTests/ColumnMetaDataFixture.cs +++ b/src/NHibernate.Test/DialectTest/SchemaTests/ColumnMetaDataFixture.cs @@ -5,7 +5,6 @@ namespace NHibernate.Test.DialectTest.SchemaTests { - [TestFixture] public class ColumnMetaDataFixture { @@ -22,7 +21,7 @@ public TestableColumnMetaData(DataRow rs, object columnSizeValue, object numeric [TestCase(null, null, 0, 0)] // No size and no precision. [TestCase(null, "7", 0, 7)] // No size, but with numerical precision. [TestCase("13", null, 13, 0)] // Size, but no precision. - [TestCase("5000000000", null, int.MaxValue, 0)] // Oversize column should be bounded to int.MaxValue. + [TestCase("5000000000", null, int.MaxValue, 0)] // Oversize column should be bounded to int.MaxValue. [TestCase("13", "7", 13, 7)] // Can handle both size and precision together. public void SetColumnSizeAndNumericalPrecision(object columnSizeInput, object precisionInput, int expectedColumnSize, int expectedPrecision) diff --git a/src/NHibernate.Test/DriverTest/OracleDataClientDriverFixture.cs b/src/NHibernate.Test/DriverTest/OracleDataClientDriverFixture.cs index 808a1b68dea..93034e9dc3d 100644 --- a/src/NHibernate.Test/DriverTest/OracleDataClientDriverFixture.cs +++ b/src/NHibernate.Test/DriverTest/OracleDataClientDriverFixture.cs @@ -110,7 +110,6 @@ public void HasSameUnicodeDefaultThanDialect(bool managed) $"Default {nameof(Oracle8iDialect.UseNPrefixedTypesForUnicode)} values mismatch between driver and dialect"); } - private static OracleDataClientDriverBase GetDriver(bool managed, IDictionary settings) { OracleDataClientDriverBase driver = null; @@ -151,4 +150,4 @@ private static object GetOracleParameterType(DbParameter dbParameter) return typeProperty.GetValue(dbParameter); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/DriverTest/Sql2008DateTime2Test.cs b/src/NHibernate.Test/DriverTest/Sql2008DateTime2Test.cs index 6958a8fc13d..a28f40eed48 100644 --- a/src/NHibernate.Test/DriverTest/Sql2008DateTime2Test.cs +++ b/src/NHibernate.Test/DriverTest/Sql2008DateTime2Test.cs @@ -69,6 +69,5 @@ public void Crud() t.Commit(); } } - } } diff --git a/src/NHibernate.Test/DynamicEntity/Address.cs b/src/NHibernate.Test/DynamicEntity/Address.cs index 160eab8ebcf..f074f51b0f9 100644 --- a/src/NHibernate.Test/DynamicEntity/Address.cs +++ b/src/NHibernate.Test/DynamicEntity/Address.cs @@ -2,9 +2,9 @@ namespace NHibernate.Test.DynamicEntity { public interface Address { - long Id { get; set;} - string Street { get; set;} - string City { get; set;} - string PostalCode { get; set;} + long Id { get; set; } + string Street { get; set; } + string City { get; set; } + string PostalCode { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/DynamicEntity/Company.cs b/src/NHibernate.Test/DynamicEntity/Company.cs index 0f5f2337d21..1e6ee757628 100644 --- a/src/NHibernate.Test/DynamicEntity/Company.cs +++ b/src/NHibernate.Test/DynamicEntity/Company.cs @@ -2,7 +2,7 @@ namespace NHibernate.Test.DynamicEntity { public interface Company { - long Id { get; set;} - string Name { get; set;} + long Id { get; set; } + string Name { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/DynamicEntity/Customer.cs b/src/NHibernate.Test/DynamicEntity/Customer.cs index c1ec9b348fb..9c0e8fd4cff 100644 --- a/src/NHibernate.Test/DynamicEntity/Customer.cs +++ b/src/NHibernate.Test/DynamicEntity/Customer.cs @@ -2,6 +2,6 @@ namespace NHibernate.Test.DynamicEntity { public interface Customer:Person { - Company Company { get; set;} + Company Company { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/DynamicEntity/IProxyMarker.cs b/src/NHibernate.Test/DynamicEntity/IProxyMarker.cs index 7d420fd1df9..f10da0d1ebf 100644 --- a/src/NHibernate.Test/DynamicEntity/IProxyMarker.cs +++ b/src/NHibernate.Test/DynamicEntity/IProxyMarker.cs @@ -5,6 +5,6 @@ namespace NHibernate.Test.DynamicEntity [Obsolete("Require dynamic proxies")] public interface IProxyMarker { - DataProxyHandler DataHandler { get;} + DataProxyHandler DataHandler { get; } } } diff --git a/src/NHibernate.Test/DynamicEntity/Person.cs b/src/NHibernate.Test/DynamicEntity/Person.cs index c87c73f08a8..95c86209bbb 100644 --- a/src/NHibernate.Test/DynamicEntity/Person.cs +++ b/src/NHibernate.Test/DynamicEntity/Person.cs @@ -4,9 +4,9 @@ namespace NHibernate.Test.DynamicEntity { public interface Person { - long Id { get; set;} - string Name { get; set;} - Address Address { get;set;} - ISet Family { get; set;} + long Id { get; set; } + string Name { get; set; } + Address Address { get; set; } + ISet Family { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs b/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs index 30f891e9417..b2b1745d52e 100644 --- a/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs +++ b/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs @@ -12,7 +12,6 @@ private static T NewProxy(object id) { return (T)proxyGenerator.CreateProxy(typeof(T), new DataProxyHandler(typeof (T).FullName, id), new[] {typeof (IProxyMarker), typeof (T)}); - } public static Person NewPersonProxy() diff --git a/src/NHibernate.Test/EngineTest/NativeSQLQuerySpecificationTest.cs b/src/NHibernate.Test/EngineTest/NativeSQLQuerySpecificationTest.cs index 6d49b7a63a1..0d83f648c7a 100644 --- a/src/NHibernate.Test/EngineTest/NativeSQLQuerySpecificationTest.cs +++ b/src/NHibernate.Test/EngineTest/NativeSQLQuerySpecificationTest.cs @@ -54,6 +54,5 @@ public void WhenChangeSpace_NotEqualHashCode() var sr2 = new NativeSQLQuerySpecification("SELECT * FROM SOMETHING", new INativeSQLQueryReturn[] { new NativeSQLQueryScalarReturn("myAlias", NHibernateUtil.Int32), new NativeSQLQueryScalarReturn("otherAlias", NHibernateUtil.Int32) }, new List { "ANOTHER" }); Assert.AreNotEqual(sr1.GetHashCode(), sr2.GetHashCode()); } - } } diff --git a/src/NHibernate.Test/EngineTest/ParameterParserFixture.cs b/src/NHibernate.Test/EngineTest/ParameterParserFixture.cs index 30d7ed2b0c8..28bf19e59a0 100644 --- a/src/NHibernate.Test/EngineTest/ParameterParserFixture.cs +++ b/src/NHibernate.Test/EngineTest/ParameterParserFixture.cs @@ -58,6 +58,5 @@ FROM tablea Assert.DoesNotThrow(() => p = recognizer.NamedParameterDescriptionMap["name"]); Assert.DoesNotThrow(() => p = recognizer.NamedParameterDescriptionMap["pizza"]); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/EngineTest/TypedValueFixture.cs b/src/NHibernate.Test/EngineTest/TypedValueFixture.cs index a82ddbdc3f2..aaa719dd8b5 100644 --- a/src/NHibernate.Test/EngineTest/TypedValueFixture.cs +++ b/src/NHibernate.Test/EngineTest/TypedValueFixture.cs @@ -48,7 +48,6 @@ public void WhenTheTypeIsAnArray_ChoseTheDefaultComparer() { byte[] value = new byte[]{1,2,3}; - var tv = new TypedValue(NHibernateUtil.BinaryBlob, value); Assert.That(tv.Comparer, Is.TypeOf()); diff --git a/src/NHibernate.Test/Events/Collections/Association/Bidirectional/OneToMany/ParentWithBidirectionalOneToMany.cs b/src/NHibernate.Test/Events/Collections/Association/Bidirectional/OneToMany/ParentWithBidirectionalOneToMany.cs index e1f06a1a863..53760e5011d 100644 --- a/src/NHibernate.Test/Events/Collections/Association/Bidirectional/OneToMany/ParentWithBidirectionalOneToMany.cs +++ b/src/NHibernate.Test/Events/Collections/Association/Bidirectional/OneToMany/ParentWithBidirectionalOneToMany.cs @@ -50,8 +50,7 @@ public override void RemoveChild(IChild child) if (!Children.Contains(child)) { ((ChildWithManyToOne)child).Parent = null; - } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Events/Collections/IChild.cs b/src/NHibernate.Test/Events/Collections/IChild.cs index 9841fe6679c..b170245df92 100644 --- a/src/NHibernate.Test/Events/Collections/IChild.cs +++ b/src/NHibernate.Test/Events/Collections/IChild.cs @@ -2,6 +2,6 @@ namespace NHibernate.Test.Events.Collections { public interface IChild { - string Name { get; set;} + string Name { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Events/Collections/IEntity.cs b/src/NHibernate.Test/Events/Collections/IEntity.cs index 6e93ff045cd..4e5857fb389 100644 --- a/src/NHibernate.Test/Events/Collections/IEntity.cs +++ b/src/NHibernate.Test/Events/Collections/IEntity.cs @@ -2,6 +2,6 @@ namespace NHibernate.Test.Events.Collections { public interface IEntity { - long Id { get; set;} + long Id { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/ExceptionsTest/SQLExceptionConversionTest.cs b/src/NHibernate.Test/ExceptionsTest/SQLExceptionConversionTest.cs index b8c59551c07..b6e2c0231a5 100644 --- a/src/NHibernate.Test/ExceptionsTest/SQLExceptionConversionTest.cs +++ b/src/NHibernate.Test/ExceptionsTest/SQLExceptionConversionTest.cs @@ -69,7 +69,6 @@ protected override void Configure(Cfg.Configuration configuration) [Test] public void IntegrityViolation() { - //ISQLExceptionConverter converter = Dialect.BuildSQLExceptionConverter(); ISQLExceptionConverter converter = Sfi.Settings.SqlExceptionConverter; diff --git a/src/NHibernate.Test/ExpressionTest/Projection/ProjectionSqlFixture.cs b/src/NHibernate.Test/ExpressionTest/Projection/ProjectionSqlFixture.cs index 4738aff6e94..4867332b8c4 100644 --- a/src/NHibernate.Test/ExpressionTest/Projection/ProjectionSqlFixture.cs +++ b/src/NHibernate.Test/ExpressionTest/Projection/ProjectionSqlFixture.cs @@ -81,7 +81,7 @@ public void QueryTest1() .Add(Projections.Max("Pay")) .Add(Projections.Min("Pay"))) ; - IList result = c.List();// c.UniqueResult(); + IList result = c.List(); // c.UniqueResult(); Assert.IsTrue(result.Count == 1, "More than one record was found, while just one was expected"); Assert.IsTrue(result[0] is object[], "expected object[] as result, but found " + result[0].GetType().Name); @@ -105,7 +105,7 @@ public void SelectSqlProjectionTest() new string[] { "MyPay" }, new IType[] { NHibernateUtil.Double }))); - IList result = c.List();// c.UniqueResult(); + IList result = c.List(); // c.UniqueResult(); Assert.IsTrue(result.Count == 1); object results = result[0]; Assert.AreEqual(results, 2.5); diff --git a/src/NHibernate.Test/ExpressionTest/QueryByExampleTest.cs b/src/NHibernate.Test/ExpressionTest/QueryByExampleTest.cs index 4ac51e3ab9c..d8cbe01b60a 100644 --- a/src/NHibernate.Test/ExpressionTest/QueryByExampleTest.cs +++ b/src/NHibernate.Test/ExpressionTest/QueryByExampleTest.cs @@ -96,7 +96,6 @@ public void TestJunctionNotExpressionQBE() ICriteria crit = s.CreateCriteria(typeof(Componentizable)); Example ex = Example.Create(master).EnableLike(); - crit.Add(Expression.Or(Expression.Not(ex), ex)); IList result = crit.List(); @@ -188,4 +187,4 @@ private Componentizable GetMaster(String name, String subName, String subName1) return master; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/ExpressionTest/SubQueries/Classes.cs b/src/NHibernate.Test/ExpressionTest/SubQueries/Classes.cs index 57c4bd0417d..d02bc616dc9 100644 --- a/src/NHibernate.Test/ExpressionTest/SubQueries/Classes.cs +++ b/src/NHibernate.Test/ExpressionTest/SubQueries/Classes.cs @@ -130,7 +130,6 @@ public virtual string PostTitle set { post_title = value; } } - public virtual Blog Blog { get { return _blog; } @@ -218,4 +217,4 @@ public ISet Posts set { posts = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs b/src/NHibernate.Test/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs index 622c1f45783..4d630773e4a 100644 --- a/src/NHibernate.Test/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs +++ b/src/NHibernate.Test/ExpressionTest/SubQueries/SubQueriesSqlFixture.cs @@ -45,7 +45,6 @@ protected override void OnSetUp() comment.IndexInPost = 0; post1.Comments.Add(comment); - session.Save(category); session.Save(author); session.Save(commenter); @@ -105,4 +104,4 @@ public void ComplexSubQuery_QueryingByGrandChildren() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Extralazy/Photo.cs b/src/NHibernate.Test/Extralazy/Photo.cs index b18bc390c02..38562cae427 100644 --- a/src/NHibernate.Test/Extralazy/Photo.cs +++ b/src/NHibernate.Test/Extralazy/Photo.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.Extralazy { public class Photo { - protected Photo() {} public Photo(string title, User owner) { diff --git a/src/NHibernate.Test/Extralazy/User.cs b/src/NHibernate.Test/Extralazy/User.cs index 5279d6d0dd6..979fed54be4 100644 --- a/src/NHibernate.Test/Extralazy/User.cs +++ b/src/NHibernate.Test/Extralazy/User.cs @@ -40,11 +40,10 @@ public virtual ISet Documents set { documents = value; } } - public virtual ISet Photos { get { return photos; } set { photos = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/FetchLazyProperties/Animal.cs b/src/NHibernate.Test/FetchLazyProperties/Animal.cs index f18a8b76ffe..a4b9dde5a05 100644 --- a/src/NHibernate.Test/FetchLazyProperties/Animal.cs +++ b/src/NHibernate.Test/FetchLazyProperties/Animal.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.FetchLazyProperties +namespace NHibernate.Test.FetchLazyProperties { public abstract class Animal { diff --git a/src/NHibernate.Test/FetchLazyProperties/Cat.cs b/src/NHibernate.Test/FetchLazyProperties/Cat.cs index 790b230983d..7a95f212af8 100644 --- a/src/NHibernate.Test/FetchLazyProperties/Cat.cs +++ b/src/NHibernate.Test/FetchLazyProperties/Cat.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.FetchLazyProperties +namespace NHibernate.Test.FetchLazyProperties { public class Cat : Animal { diff --git a/src/NHibernate.Test/FetchLazyProperties/Dog.cs b/src/NHibernate.Test/FetchLazyProperties/Dog.cs index 1019be4df3b..82d0dc5ecfa 100644 --- a/src/NHibernate.Test/FetchLazyProperties/Dog.cs +++ b/src/NHibernate.Test/FetchLazyProperties/Dog.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.FetchLazyProperties +namespace NHibernate.Test.FetchLazyProperties { public class Dog : Animal { diff --git a/src/NHibernate.Test/FetchLazyProperties/FetchLazyPropertiesFixture.cs b/src/NHibernate.Test/FetchLazyProperties/FetchLazyPropertiesFixture.cs index 2f5bf5442d3..04cb354f3f4 100644 --- a/src/NHibernate.Test/FetchLazyProperties/FetchLazyPropertiesFixture.cs +++ b/src/NHibernate.Test/FetchLazyProperties/FetchLazyPropertiesFixture.cs @@ -184,7 +184,6 @@ private static void AssertFetchProperty(Person person) #endregion - #region FetchComponentAndFormulaTwoQueryReadOnly [TestCase(true)] @@ -331,7 +330,6 @@ public void TestLinqFetchFormulaAndManyToOneComponent() .Fetch(o => o.Formula) .Fetch(o => o.BestFriend).ThenFetch(o => o.Address) .FirstOrDefault(o => o.Id == 1); - } AssertFetchFormulaAndManyToOneComponent(person); diff --git a/src/NHibernate.Test/FilterTest/DynamicFilterTest.cs b/src/NHibernate.Test/FilterTest/DynamicFilterTest.cs index 5e247ef72e1..b345b642ab8 100644 --- a/src/NHibernate.Test/FilterTest/DynamicFilterTest.cs +++ b/src/NHibernate.Test/FilterTest/DynamicFilterTest.cs @@ -187,7 +187,6 @@ public void CriteriaQueryFilters() } } - [Test] public void CriteriaControl() { @@ -282,7 +281,6 @@ public void CriteriaSubqueryWithFilters() Assert.That(orders.Count, Is.EqualTo(1), "Incorrect orders count"); - log.Info("query against Order with a subquery for line items with a subquery line items where the product name is Acme Hair Gel and the quantity is greater than 1 in a given region and the product is effective as of 4 months ago"); session.EnableFilter("region").SetParameter("region", "APAC"); session.EnableFilter("effectiveDate").SetParameter("asOfDate", testData.fourMonthsAgo.Date); @@ -298,7 +296,6 @@ public void CriteriaSubqueryWithFilters() } } - [Test] public void GetFilters() { @@ -710,7 +707,6 @@ public void Release() using (var session = outer.OpenSession()) using (var transaction = session.BeginTransaction()) { - foreach (var obj in entitiesToCleanUp) { session.Delete(obj); diff --git a/src/NHibernate.Test/FilterTest/FilterConfig.cs b/src/NHibernate.Test/FilterTest/FilterConfig.cs index 4d70dc3136e..26c5d590aeb 100644 --- a/src/NHibernate.Test/FilterTest/FilterConfig.cs +++ b/src/NHibernate.Test/FilterTest/FilterConfig.cs @@ -53,7 +53,6 @@ public void FiltersLoaded() filter2.Validate(); } - [Test] public void TestFilterThrowsWithNoParameterSet() { @@ -67,4 +66,4 @@ public void TestFilterThrowsWithNoParameterSet() Assert.Throws(() => filter.Validate()); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Futures/Entities.cs b/src/NHibernate.Test/Futures/Entities.cs index c68a0574850..8d042d4a808 100644 --- a/src/NHibernate.Test/Futures/Entities.cs +++ b/src/NHibernate.Test/Futures/Entities.cs @@ -19,7 +19,6 @@ public class EntityComplex public virtual IList ChildrenList { get; set; } = new List(); public virtual IList ChildrenListEmpty { get; set; } = new List(); - } public class EntitySimpleChild diff --git a/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs b/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs index e557c6538a9..5e23ef745ef 100644 --- a/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs +++ b/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs @@ -39,12 +39,10 @@ public void CanUseFutureCriteria() { foreach (var person in persons5.GetEnumerable()) { - } foreach (var person in persons10.GetEnumerable()) { - } var events = logSpy.Appender.GetEvents(); @@ -101,7 +99,6 @@ public void CanCombineSingleFutureValueWithEnumerableFutures() foreach (var person in persons.GetEnumerable()) { - } var events = logSpy.Appender.GetEvents(); diff --git a/src/NHibernate.Test/Futures/FutureQueryFixture.cs b/src/NHibernate.Test/Futures/FutureQueryFixture.cs index fb71dcda52f..8c06b87a94b 100644 --- a/src/NHibernate.Test/Futures/FutureQueryFixture.cs +++ b/src/NHibernate.Test/Futures/FutureQueryFixture.cs @@ -52,12 +52,10 @@ public void CanUseFutureQuery() { foreach (var person in persons5.GetEnumerable()) { - } foreach (var person in persons10.GetEnumerable()) { - } var events = logSpy.Appender.GetEvents(); diff --git a/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs b/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs index bcc51d60714..721ccade26c 100644 --- a/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs +++ b/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.Futures [TestFixture] public class FutureQueryOverFixture : FutureFixture { - protected override void OnSetUp() { base.OnSetUp(); @@ -130,7 +129,6 @@ public void CanCombineSingleFutureValueWithEnumerableFutures() foreach (var person in persons.GetEnumerable()) { - } var events = logSpy.Appender.GetEvents(); diff --git a/src/NHibernate.Test/Futures/LinqFutureFixture.cs b/src/NHibernate.Test/Futures/LinqFutureFixture.cs index dd38fe4a8f0..b9b0177ee21 100644 --- a/src/NHibernate.Test/Futures/LinqFutureFixture.cs +++ b/src/NHibernate.Test/Futures/LinqFutureFixture.cs @@ -249,7 +249,6 @@ public void CanUseFutureFetchQuery() using (var logSpy = new SqlLogSpy()) { - Assert.That(persons.GetEnumerable().Any(x => x.Children.Any()), "No children found"); Assert.That(persons10.GetEnumerable().Any(x => x.Children.Any()), "No children found"); diff --git a/src/NHibernate.Test/Futures/QueryBatchFixture.cs b/src/NHibernate.Test/Futures/QueryBatchFixture.cs index 0f959a54559..0d8220500b7 100644 --- a/src/NHibernate.Test/Futures/QueryBatchFixture.cs +++ b/src/NHibernate.Test/Futures/QueryBatchFixture.cs @@ -193,7 +193,6 @@ public void SameCollectionFetches() Assert.That(NHibernateUtil.IsInitialized(parent), Is.True); Assert.That(NHibernateUtil.IsInitialized(parent.ChildrenList), Is.True); Assert.That(parent.ChildrenList.Count, Is.EqualTo(2)); - } } diff --git a/src/NHibernate.Test/Generatedkeys/Select/SelectGeneratorTest.cs b/src/NHibernate.Test/Generatedkeys/Select/SelectGeneratorTest.cs index eaa04d884d1..6ca45755682 100644 --- a/src/NHibernate.Test/Generatedkeys/Select/SelectGeneratorTest.cs +++ b/src/NHibernate.Test/Generatedkeys/Select/SelectGeneratorTest.cs @@ -37,6 +37,5 @@ public void GetGeneratedKeysSupport() session.Transaction.Commit(); session.Close(); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/GenericTest/BagGeneric/A.cs b/src/NHibernate.Test/GenericTest/BagGeneric/A.cs index 6feda251b06..a30a5b9e04f 100644 --- a/src/NHibernate.Test/GenericTest/BagGeneric/A.cs +++ b/src/NHibernate.Test/GenericTest/BagGeneric/A.cs @@ -29,6 +29,5 @@ public IList Items get { return _items; } set { _items = value; } } - } } diff --git a/src/NHibernate.Test/GenericTest/BagGeneric/BagGenericFixture.cs b/src/NHibernate.Test/GenericTest/BagGeneric/BagGenericFixture.cs index b754ffee503..f0934770996 100644 --- a/src/NHibernate.Test/GenericTest/BagGeneric/BagGenericFixture.cs +++ b/src/NHibernate.Test/GenericTest/BagGeneric/BagGenericFixture.cs @@ -8,7 +8,6 @@ namespace NHibernate.Test.GenericTest.BagGeneric [TestFixture] public class BagGenericFixture : TestCase { - protected override string[] Mappings { get { return new string[] { "GenericTest.BagGeneric.BagGenericFixture.hbm.xml" }; } diff --git a/src/NHibernate.Test/GenericTest/IdBagGeneric/A.cs b/src/NHibernate.Test/GenericTest/IdBagGeneric/A.cs index 567c9965045..ef0f69eeb35 100644 --- a/src/NHibernate.Test/GenericTest/IdBagGeneric/A.cs +++ b/src/NHibernate.Test/GenericTest/IdBagGeneric/A.cs @@ -29,6 +29,5 @@ public IList Items get { return _items; } set { _items = value; } } - } } diff --git a/src/NHibernate.Test/GenericTest/ListGeneric/A.cs b/src/NHibernate.Test/GenericTest/ListGeneric/A.cs index d4dfb2a3ebd..4ae1cb8c6aa 100644 --- a/src/NHibernate.Test/GenericTest/ListGeneric/A.cs +++ b/src/NHibernate.Test/GenericTest/ListGeneric/A.cs @@ -29,6 +29,5 @@ public IList Items get { return _items; } set { _items = value; } } - } } diff --git a/src/NHibernate.Test/GenericTest/ListGeneric/ListGenericFixture.cs b/src/NHibernate.Test/GenericTest/ListGeneric/ListGenericFixture.cs index 305b998c81f..cf4327ae8fd 100644 --- a/src/NHibernate.Test/GenericTest/ListGeneric/ListGenericFixture.cs +++ b/src/NHibernate.Test/GenericTest/ListGeneric/ListGenericFixture.cs @@ -9,7 +9,6 @@ namespace NHibernate.Test.GenericTest.ListGeneric [TestFixture] public class ListGenericFixture : TestCase { - protected override string[] Mappings { get { return new string[] { "GenericTest.ListGeneric.ListGenericFixture.hbm.xml" }; } diff --git a/src/NHibernate.Test/GenericTest/Overall/Fixture.cs b/src/NHibernate.Test/GenericTest/Overall/Fixture.cs index 9374883c24d..8097060cb30 100644 --- a/src/NHibernate.Test/GenericTest/Overall/Fixture.cs +++ b/src/NHibernate.Test/GenericTest/Overall/Fixture.cs @@ -68,5 +68,4 @@ public void CRUDAB() } } } - } diff --git a/src/NHibernate.Test/GenericTest/SetGeneric/A.cs b/src/NHibernate.Test/GenericTest/SetGeneric/A.cs index 70cf884e727..cfc1b21e6b6 100644 --- a/src/NHibernate.Test/GenericTest/SetGeneric/A.cs +++ b/src/NHibernate.Test/GenericTest/SetGeneric/A.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Text; - namespace NHibernate.Test.GenericTest.SetGeneric { public class A @@ -30,6 +29,5 @@ public ISet Items get { return _items; } set { _items = value; } } - } } diff --git a/src/NHibernate.Test/GenericTest/SetGeneric/SetGenericFixture.cs b/src/NHibernate.Test/GenericTest/SetGeneric/SetGenericFixture.cs index 58e2598cfcb..d930f504644 100644 --- a/src/NHibernate.Test/GenericTest/SetGeneric/SetGenericFixture.cs +++ b/src/NHibernate.Test/GenericTest/SetGeneric/SetGenericFixture.cs @@ -9,7 +9,6 @@ namespace NHibernate.Test.GenericTest.SetGeneric [TestFixture] public class SetGenericFixture : TestCase { - protected override string[] Mappings { get { return new string[] { "GenericTest.SetGeneric.SetGenericFixture.hbm.xml" }; } diff --git a/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs b/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs index b8fccac67c1..13a3c6e0e7b 100644 --- a/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs +++ b/src/NHibernate.Test/GhostProperty/GhostPropertyFixture.cs @@ -48,7 +48,6 @@ protected override void OnSetUp() }); tx.Commit(); } - } protected override void OnTearDown() diff --git a/src/NHibernate.Test/Hql/Ast/BulkManipulation.cs b/src/NHibernate.Test/Hql/Ast/BulkManipulation.cs index 8d8bfe625e2..50702573d5d 100644 --- a/src/NHibernate.Test/Hql/Ast/BulkManipulation.cs +++ b/src/NHibernate.Test/Hql/Ast/BulkManipulation.cs @@ -92,7 +92,6 @@ public void SimpleInsertFromAggregate() data.Cleanup(); } - [Test] public void InsertWithManyToOne() { diff --git a/src/NHibernate.Test/Hql/Ast/HqlFixture.cs b/src/NHibernate.Test/Hql/Ast/HqlFixture.cs index fea98840262..3829536f7ce 100644 --- a/src/NHibernate.Test/Hql/Ast/HqlFixture.cs +++ b/src/NHibernate.Test/Hql/Ast/HqlFixture.cs @@ -320,7 +320,6 @@ public void InsertIntoFromSelect_WithSelectClauseParameters() } } - [Test] public void UnaryMinusBeforeParenthesesHandledCorrectly() { @@ -341,4 +340,4 @@ public void UnaryMinusBeforeParenthesesHandledCorrectly() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Hql/Ast/KeyManyToOneEntity.cs b/src/NHibernate.Test/Hql/Ast/KeyManyToOneEntity.cs index 22d76cd5521..1a9f8008fe1 100644 --- a/src/NHibernate.Test/Hql/Ast/KeyManyToOneEntity.cs +++ b/src/NHibernate.Test/Hql/Ast/KeyManyToOneEntity.cs @@ -37,7 +37,6 @@ public Id(KeyManyToOneKeyEntity key1, string key2) this.key1 = key1; this.key2 = key2; - } public virtual KeyManyToOneKeyEntity Key1 @@ -83,4 +82,4 @@ public override int GetHashCode() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Hql/Ast/OrderByTest.cs b/src/NHibernate.Test/Hql/Ast/OrderByTest.cs index 03bb8220491..4fb2a345355 100644 --- a/src/NHibernate.Test/Hql/Ast/OrderByTest.cs +++ b/src/NHibernate.Test/Hql/Ast/OrderByTest.cs @@ -355,7 +355,6 @@ private void CheckTestOrderByResult(object result, Zoo zooExpected, HashSet zoosUnordered) { - Assert.IsInstanceOf(result); var resultArray = (object[]) result; Assert.AreEqual(2, resultArray.Length); @@ -376,7 +375,6 @@ private void CheckTestOrderByResult(object result, } } - private class TestData { private readonly OrderByTest tc; @@ -540,4 +538,4 @@ public void Cleanup() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Hql/EntityJoinHqlTest.cs b/src/NHibernate.Test/Hql/EntityJoinHqlTest.cs index 18e14f1a435..0b8d0c11a6b 100644 --- a/src/NHibernate.Test/Hql/EntityJoinHqlTest.cs +++ b/src/NHibernate.Test/Hql/EntityJoinHqlTest.cs @@ -202,7 +202,6 @@ public void EntityJoinWithEntityAssociationComparison2ShouldAddJoin() } } - [Test] public void WithClauseOnOtherAssociation() { @@ -299,10 +298,8 @@ protected override HbmMapping GetMappings() rc.ManyToOne(ep => ep.SameTypeChild, m => m.Column("SameTypeChildId")); rc.ManyToOne(ep => ep.SameTypeChild2, m => m.Column("SameTypeChild2Id")); - }); - mapper.Class( rc => { @@ -343,7 +340,6 @@ protected override HbmMapping GetMappings() rc.Property(e => e.Composite1Key1); rc.Property(e => e.Composite1Key2); rc.Property(e => e.CustomEntityNameId); - }); mapper.Class( @@ -387,7 +383,6 @@ protected override void OnSetUp() { Name = "ComplexEntityChild2" } - }; _entityWithCompositeId = new EntityWithCompositeId diff --git a/src/NHibernate.Test/Hql/EntityJoinHqlTestEntities.cs b/src/NHibernate.Test/Hql/EntityJoinHqlTestEntities.cs index 51304d8643f..2b897d81b6a 100644 --- a/src/NHibernate.Test/Hql/EntityJoinHqlTestEntities.cs +++ b/src/NHibernate.Test/Hql/EntityJoinHqlTestEntities.cs @@ -14,7 +14,6 @@ public class EntityComplex public virtual EntityComplex SameTypeChild { get; set; } public virtual EntityComplex SameTypeChild2 { get; set; } - } public class EntityWithCompositeId diff --git a/src/NHibernate.Test/Hql/HQLFunctions.cs b/src/NHibernate.Test/Hql/HQLFunctions.cs index 3c84a3d2050..89671f6a025 100644 --- a/src/NHibernate.Test/Hql/HQLFunctions.cs +++ b/src/NHibernate.Test/Hql/HQLFunctions.cs @@ -204,8 +204,7 @@ public void AggregatesAndMathNH959() Assert.DoesNotThrow(() => s.CreateQuery("select a.Id, sum(BodyWeight)/avg(BodyWeight) from Animal a group by a.Id having sum(BodyWeight)>0").List()); } } - - + [Test] public void SubStringTwoParameters() { @@ -246,8 +245,7 @@ public void SubStringTwoParameters() Assert.AreEqual("abcdef", result.Description); } } - - + [Test] public void SubString() { @@ -272,7 +270,6 @@ public void SubString() .UniqueResult(); Assert.AreEqual("abcdef", result.Description); - // Following tests verify that parameters can be used. hql = "from Animal a where substring(a.Description, 2, ?) = 'bcd'"; @@ -281,7 +278,6 @@ public void SubString() .UniqueResult(); Assert.AreEqual("abcdef", result.Description); - hql = "from Animal a where substring(a.Description, ?, ?) = ?"; result = (Animal)s.CreateQuery(hql) .SetParameter(0, 2) diff --git a/src/NHibernate.Test/Hql/Human.cs b/src/NHibernate.Test/Hql/Human.cs index 92935ebf084..535406ec806 100644 --- a/src/NHibernate.Test/Hql/Human.cs +++ b/src/NHibernate.Test/Hql/Human.cs @@ -24,6 +24,5 @@ public virtual DateTime Birthdate get { return _birthdate; } set { _birthdate = value; } } - } } diff --git a/src/NHibernate.Test/Hql/MaterialResource.cs b/src/NHibernate.Test/Hql/MaterialResource.cs index 536cd7ddbf9..24cab7d0ac0 100644 --- a/src/NHibernate.Test/Hql/MaterialResource.cs +++ b/src/NHibernate.Test/Hql/MaterialResource.cs @@ -11,7 +11,6 @@ public enum MaterialState : int public MaterialResource() { - } public MaterialResource(string description, string serialNumber, MaterialState state) diff --git a/src/NHibernate.Test/Hql/Name.cs b/src/NHibernate.Test/Hql/Name.cs index 353ee14a88a..61ffe2225c0 100644 --- a/src/NHibernate.Test/Hql/Name.cs +++ b/src/NHibernate.Test/Hql/Name.cs @@ -4,7 +4,6 @@ namespace NHibernate.Test.Hql { public class Name { - protected Name() { } public Name(string first, char initial, string last) diff --git a/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/Entity.cs b/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/Entity.cs index e3c6871816d..49794820b49 100644 --- a/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/Entity.cs +++ b/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/Entity.cs @@ -2,7 +2,6 @@ { public class Entity { - // Assigned by reflection #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value private long _id; @@ -25,4 +24,4 @@ public Entity(string name) Name = name; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/IdGen/Enhanced/OptimizerTests.cs b/src/NHibernate.Test/IdGen/Enhanced/OptimizerTests.cs index 1952612cbb7..8f0fd01986f 100644 --- a/src/NHibernate.Test/IdGen/Enhanced/OptimizerTests.cs +++ b/src/NHibernate.Test/IdGen/Enhanced/OptimizerTests.cs @@ -28,7 +28,7 @@ public void TestBasicNoOptimizerUsage() long next = (long)optimizer.Generate(sequence); Assert.That(next, Is.EqualTo(i)); } - Assert.That(sequence.TimesCalled, Is.EqualTo(11)); // an extra time to get to 1 initially + Assert.That(sequence.TimesCalled, Is.EqualTo(11)); // an extra time to get to 1 initially Assert.That(sequence.CurrentValue, Is.EqualTo(10)); } @@ -55,7 +55,6 @@ public void TestBasicHiLoOptimizerUsage() Assert.That(sequence.TimesCalled, Is.EqualTo(2)); Assert.That(sequence.CurrentValue, Is.EqualTo(2)); - // test historic table behavior, where the initial values started at 0 (we now force 1 to be the first used id value) sequence = new SourceMock(0); optimizer = OptimizerFactory.BuildOptimizer(OptimizerFactory.HiLo, typeof(long), increment, -1); @@ -239,4 +238,4 @@ public void TestRecoveredPooledLoOptimizerUsage() Assert.That(sequence.CurrentValue, Is.EqualTo(4)); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/BasicTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/BasicTableTest.cs index 54d2ffe7497..16b8e768641 100644 --- a/src/NHibernate.Test/IdGen/Enhanced/Table/BasicTableTest.cs +++ b/src/NHibernate.Test/IdGen/Enhanced/Table/BasicTableTest.cs @@ -17,7 +17,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - [Test] public void TestNormalBoundary() { @@ -41,12 +40,10 @@ public void TestNormalBoundary() Assert.That(entities[i].Id, Is.EqualTo(expectedId)); Assert.That(generator.TableAccessCount, Is.EqualTo(expectedId)); Assert.That(generator.Optimizer.LastSourceValue, Is.EqualTo(expectedId)); - } transaction.Commit(); } - using (ITransaction transaction = s.BeginTransaction()) { for (int i = 0; i < count; i++) diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/HiLoTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/HiLoTableTest.cs index 28b0b72d2bc..878252ce3dd 100644 --- a/src/NHibernate.Test/IdGen/Enhanced/Table/HiLoTableTest.cs +++ b/src/NHibernate.Test/IdGen/Enhanced/Table/HiLoTableTest.cs @@ -54,7 +54,6 @@ public void TestNormalBoundary() transaction.Commit(); } - using (ITransaction transaction = s.BeginTransaction()) { for (int i = 0; i < entities.Length; i++) diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/PooledLoTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/PooledLoTableTest.cs index 14b1a4fbb3d..bd5245dbe9a 100644 --- a/src/NHibernate.Test/IdGen/Enhanced/Table/PooledLoTableTest.cs +++ b/src/NHibernate.Test/IdGen/Enhanced/Table/PooledLoTableTest.cs @@ -17,7 +17,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - [Test] public void TestNormalBoundary() { @@ -40,7 +39,7 @@ public void TestNormalBoundary() entities[i] = new Entity("" + (i + 1)); s.Save(entities[i]); Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization - Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization + Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization Assert.That(optimizer.LastValue, Is.EqualTo(i + 1)); } diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/PooledTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/PooledTableTest.cs index 9cdc166b0d7..3a7ca042514 100644 --- a/src/NHibernate.Test/IdGen/Enhanced/Table/PooledTableTest.cs +++ b/src/NHibernate.Test/IdGen/Enhanced/Table/PooledTableTest.cs @@ -17,7 +17,6 @@ protected override string MappingsAssembly get { return "NHibernate.Test"; } } - [Test] public void TestNormalBoundary() { @@ -40,7 +39,7 @@ public void TestNormalBoundary() entities[i] = new Entity("" + (i + 1)); s.Save(entities[i]); Assert.That(generator.TableAccessCount, Is.EqualTo(2)); // initialization calls seq twice - Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice + Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice Assert.That(optimizer.LastValue, Is.EqualTo(i + 1)); } diff --git a/src/NHibernate.Test/IdTest/AssignedFixture.cs b/src/NHibernate.Test/IdTest/AssignedFixture.cs index 137c3e7ac9d..07a483cb8d5 100644 --- a/src/NHibernate.Test/IdTest/AssignedFixture.cs +++ b/src/NHibernate.Test/IdTest/AssignedFixture.cs @@ -6,11 +6,9 @@ namespace NHibernate.Test.IdTest { - [TestFixture] public class AssignedFixture : IdFixtureBase { - private string[] GetAssignedIdentifierWarnings(LogSpy ls) { List warnings = new List(); @@ -249,7 +247,5 @@ public void InsertCascadeNoWarning() Assert.That(warnings.Length, Is.EqualTo(0)); } } - } - } diff --git a/src/NHibernate.Test/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs b/src/NHibernate.Test/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs index 0fa40be3831..1e77060ab44 100644 --- a/src/NHibernate.Test/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs +++ b/src/NHibernate.Test/Immutable/EntityWithMutableCollection/AbstractEntityWithManyToManyTest.cs @@ -485,7 +485,7 @@ public void CreateWithNonEmptyManyToManyCollectionMergeWithNewElement() s.Close(); AssertInsertCount(1); - AssertUpdateCount(isContractVersioned && isPlanVersioned ? 1 : 0); // NH-specific: Hibernate issues a separate UPDATE for the version number + AssertUpdateCount(isContractVersioned && isPlanVersioned ? 1 : 0); // NH-specific: Hibernate issues a separate UPDATE for the version number ClearCounts(); s = OpenSession(); diff --git a/src/NHibernate.Test/Immutable/ImmutableTest.cs b/src/NHibernate.Test/Immutable/ImmutableTest.cs index 0d0f8b76cd5..214252925b1 100644 --- a/src/NHibernate.Test/Immutable/ImmutableTest.cs +++ b/src/NHibernate.Test/Immutable/ImmutableTest.cs @@ -1038,7 +1038,6 @@ public void ImmutableParentEntityWithMerge() AssertUpdateCount(0); AssertDeleteCount(3); - } [Test] diff --git a/src/NHibernate.Test/Join/Customer.cs b/src/NHibernate.Test/Join/Customer.cs index fe57cc30d70..d5c07e43401 100644 --- a/src/NHibernate.Test/Join/Customer.cs +++ b/src/NHibernate.Test/Join/Customer.cs @@ -17,6 +17,5 @@ public virtual string Comments get { return _Comments; } set { _Comments = value; } } - } } diff --git a/src/NHibernate.Test/Join/JoinTest.cs b/src/NHibernate.Test/Join/JoinTest.cs index 463cd0184b9..50d2e6d1306 100644 --- a/src/NHibernate.Test/Join/JoinTest.cs +++ b/src/NHibernate.Test/Join/JoinTest.cs @@ -431,7 +431,6 @@ private Employee[] CreateAndInsertEmployees(ISession s, int count) return result; } - [Test] public void TestSimpleInsertAndRetrieveEmployee() { @@ -574,4 +573,4 @@ public void PolymorphicGetByTypeofSuperclass() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Join/User.cs b/src/NHibernate.Test/Join/User.cs index 2726c5eb851..39875a727ba 100644 --- a/src/NHibernate.Test/Join/User.cs +++ b/src/NHibernate.Test/Join/User.cs @@ -14,6 +14,5 @@ public virtual string Login get { return _Login; } set { _Login = value; } } - } } diff --git a/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs b/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs index ba5b88d1455..2a516e5e5b4 100644 --- a/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs +++ b/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs @@ -21,7 +21,6 @@ protected override string[] Mappings get { return new string[] {"JoinedSubclass.JoinedSubclass.hbm.xml"}; } } - private DateTime testDateTime = new DateTime(2003, 8, 16); private DateTime updateDateTime = new DateTime(2003, 8, 17); diff --git a/src/NHibernate.Test/LazyGroup/LazyGroupFixture.cs b/src/NHibernate.Test/LazyGroup/LazyGroupFixture.cs index 82b51aa0c4a..e7be24d19db 100644 --- a/src/NHibernate.Test/LazyGroup/LazyGroupFixture.cs +++ b/src/NHibernate.Test/LazyGroup/LazyGroupFixture.cs @@ -213,7 +213,6 @@ private static Person GeneratePerson(int i) Image = new byte[i], NickName = $"NickName{i}" }; - } } } diff --git a/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs b/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs index af65b929e69..8a2b2d6939a 100644 --- a/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs +++ b/src/NHibernate.Test/LazyProperty/LazyPropertyFixture.cs @@ -61,7 +61,6 @@ protected override void OnSetUp() }); tx.Commit(); } - } protected override void OnTearDown() @@ -319,7 +318,6 @@ public void CacheShouldNotContainLazyProperties() using (var s = OpenSession()) using (var tx = s.BeginTransaction()) { - book = s.CreateQuery("from Book b fetch all properties where b.Id = :id") .SetParameter("id", 1) .UniqueResult(); @@ -332,7 +330,6 @@ public void CacheShouldNotContainLazyProperties() using (var s = OpenSession()) using (var tx = s.BeginTransaction()) { - book = s.Get(1); tx.Commit(); } @@ -366,7 +363,6 @@ public void CanMergeTransientWithLazyPropertyInCollection() Assert.That(book, Is.Not.Null); Assert.That(book.Name, Is.EqualTo("some name two")); Assert.That(book.ALotOfText, Is.EqualTo("a lot of text two...")); - } using (var s = OpenSession()) using (var tx = s.BeginTransaction()) diff --git a/src/NHibernate.Test/Legacy/CriteriaTest.cs b/src/NHibernate.Test/Legacy/CriteriaTest.cs index 2158acbc1e0..d0ad5b3d2f3 100644 --- a/src/NHibernate.Test/Legacy/CriteriaTest.cs +++ b/src/NHibernate.Test/Legacy/CriteriaTest.cs @@ -187,6 +187,5 @@ public void DetachedCriteria_can_get_query_entity_type() DetachedCriteria.For().GetRootEntityTypeIfAvailable() ); } - } } diff --git a/src/NHibernate.Test/Legacy/FooBarTest.cs b/src/NHibernate.Test/Legacy/FooBarTest.cs index 628ed9dd212..cd95652152b 100644 --- a/src/NHibernate.Test/Legacy/FooBarTest.cs +++ b/src/NHibernate.Test/Legacy/FooBarTest.cs @@ -440,7 +440,6 @@ public void Query() list = s.CreateQuery("select foo, bar from Foo foo left outer join foo.TheFoo bar where foo = ?") .SetEntity(0, foo).List(); - object[] row1 = (object[]) list[0]; Assert.IsTrue(row1[0] == foo && row1[1] == foo2); @@ -599,7 +598,6 @@ public void Query() enumerable = s.CreateQuery( "select foo.Component.Name, elements(foo.Component.ImportantDates) from foo in class Foo where foo.TheFoo.id=?"). SetString(0, foo.TheFoo.Key).Enumerable(); - int i = 0; foreach (object[] row in enumerable) @@ -1005,7 +1003,6 @@ public void NonlazyCollections() } } - [Test] public void ReuseDeletedCollection() { @@ -1254,7 +1251,6 @@ public void FetchInitializedCollection() s.Close(); } - [Test] public void LateCollectionAdd() { @@ -1317,7 +1313,6 @@ public void Update() s.Close(); } - [Test] public void ListRemove() { @@ -1463,7 +1458,6 @@ public void Sortables() s.Close(); } - [Test] public void FetchList() { @@ -1491,7 +1485,6 @@ public void FetchList() s.Close(); } - [Test] public void BagOneToMany() { @@ -1515,7 +1508,6 @@ public void BagOneToMany() s.Close(); } - [Test] public void QueryLockMode() { @@ -1590,7 +1582,6 @@ public void QueryLockMode() s.Close(); } - [Test] public void ManyToManyBag() { @@ -1617,7 +1608,6 @@ public void ManyToManyBag() s.Close(); } - [Test] public void IdBag() { @@ -1677,7 +1667,6 @@ public void IdBag() s.Close(); } - [Test] public void ForceOuterJoin() { @@ -1714,7 +1703,6 @@ public void ForceOuterJoin() s.Close(); } - [Test] public void EmptyCollection() { @@ -1735,7 +1723,6 @@ public void EmptyCollection() s.Close(); } - [Test] public void OneToOneGenerator() { @@ -1756,7 +1743,6 @@ public void OneToOneGenerator() Assert.AreEqual(x.Id, y.Id); - s = OpenSession(); x = new X(); y = new Y(); @@ -1772,7 +1758,6 @@ public void OneToOneGenerator() Assert.AreEqual(x.Id, y.Id); - s = OpenSession(); x = new X(); y = new Y(); @@ -1804,7 +1789,6 @@ public void OneToOneGenerator() s.Close(); } - [Test] public void Limit() { @@ -1834,7 +1818,6 @@ public void Limit() s.Close(); } - [Test] public void Custom() { @@ -1867,7 +1850,6 @@ public void Custom() s.Close(); } - [Test] public void SaveAddDelete() { @@ -1883,7 +1865,6 @@ public void SaveAddDelete() s.Close(); } - [Test] public void NamedParams() { @@ -2077,7 +2058,6 @@ public void FindByCriteria() Assert.IsTrue(list.Count == 1 && list[0] == f); - list = s.CreateCriteria(typeof(Foo)) .SetMaxResults(5) .AddOrder(Order.Asc("Date")) @@ -2125,7 +2105,6 @@ public void FindByCriteria() s.Close(); } - [Test] public void AfterDelete() { @@ -2140,7 +2119,6 @@ public void AfterDelete() s.Close(); } - [Test] public void CollectionWhere() { @@ -2179,7 +2157,6 @@ public void CollectionWhere() s.Close(); } - [Test] public void ComponentParent() { @@ -2211,7 +2188,6 @@ public void ComponentParent() s.Close(); } - [Test] public void CollectionCache() { @@ -2234,7 +2210,6 @@ public void CollectionCache() s.Close(); } - [Test] //[Ignore("TimeZone Portions commented out - http://nhibernate.jira.com/browse/NH-88")] public void AssociationId() @@ -2280,7 +2255,6 @@ public void AssociationId() NHibernateUtil.String }; - //IList results = s.List( hqlString, values, types ); IQuery q = s.CreateQuery(hqlString); for (int i = 0; i < values.Length; i++) @@ -2307,7 +2281,6 @@ public void AssociationId() results = q.List(); Assert.AreEqual(1, results.Count); - hqlString = "from s in class Stuff where s.Foo.String is not null"; s.CreateQuery(hqlString).List(); @@ -2350,7 +2323,6 @@ public void AssociationId() } } - [Test] public void CascadeSave() { @@ -2377,7 +2349,6 @@ public void CascadeSave() s.Close(); } - [Test] public void CompositeKeyPathExpressions() { @@ -2408,7 +2379,6 @@ public void CompositeKeyPathExpressions() s.Close(); } - [Test] public void CollectionsInSelect() { @@ -2445,7 +2415,6 @@ public void CollectionsInSelect() Assert.AreEqual(1, r.Count); Assert.AreEqual(foos[1].Long, r.Amount); - list = s.CreateQuery( "select new Result( baz.Name, max(foo.Long), count(foo) ) from Baz baz join baz.FooArray foo group by baz.Name"). @@ -2545,7 +2514,6 @@ public void CollectionsInSelect() s.Close(); } - [Test] public void NewFlushing() { @@ -2628,7 +2596,6 @@ public void NewFlushing() s.Close(); } - [Test] public void PersistCollections() { @@ -2676,7 +2643,6 @@ public void PersistCollections() list = s.CreateQuery( "select foo from foo in class NHibernate.DomainModel.Foo, baz in class NHibernate.DomainModel.Baz where foo in elements(baz.FooArray) and 3 = some elements(baz.IntArray) and 4 > all indices(baz.IntArray)") .List(); - Assert.AreEqual(2, list.Count, "collection.elements find"); } @@ -2904,7 +2870,6 @@ public void PersistCollections() s.Close(); } - [Test] public void SaveFlush() { @@ -2924,7 +2889,6 @@ public void SaveFlush() s.Close(); } - [Test] public void CreateUpdate() { @@ -2958,7 +2922,6 @@ public void CreateUpdate() s.Close(); } - [Test] public void UpdateCollections() { @@ -3026,7 +2989,6 @@ public void UpdateCollections() s.Close(); } - [Test] public void Load() { @@ -3055,7 +3017,6 @@ public void Load() s.Close(); } - [Test] public void Create() { @@ -3075,7 +3036,6 @@ public void Create() s.Close(); } - [Test] public void Callback() { @@ -3113,7 +3073,6 @@ public void Callback() s.Close(); } - [Test] public void Polymorphism() { @@ -3133,7 +3092,6 @@ public void Polymorphism() s.Close(); } - [Test] public void RemoveContains() { @@ -3156,7 +3114,6 @@ public void RemoveContains() s.Close(); } - [Test] public void CollectionOfSelf() { @@ -3197,7 +3154,6 @@ public void CollectionOfSelf() s.Close(); } - [Test] public void Find() { @@ -3272,8 +3228,7 @@ public void Find() txn.Commit(); s.Close(); } - - + [Test] public void DeleteRecursive() { @@ -3290,8 +3245,7 @@ public void DeleteRecursive() s.Flush(); s.Close(); } - - + [Test] public void Reachability() { @@ -3414,8 +3368,7 @@ public void Reachability() s.Flush(); s.Close(); } - - + [Test] public void PersistentLifecycle() { @@ -3441,8 +3394,7 @@ public void PersistentLifecycle() s.Flush(); s.Close(); } - - + [Test] public void Enumerable() { @@ -3779,7 +3731,6 @@ public void VersionedCollections() s.Close(); } - [Test] public void RecursiveLoad() { @@ -3982,7 +3933,6 @@ public void MultiColumnQueries() s.Close(); } - [Test] public void DeleteTransient() { @@ -4207,7 +4157,6 @@ public void UpdateFromTransient() s.Close(); } - [Test] public void ArraysOfTimes() { @@ -4285,7 +4234,6 @@ public void Components() s.Close(); } - [Test] public void Enum() { @@ -4351,8 +4299,7 @@ public void Enum() s.Flush(); s.Close(); } - - + [Test] public void NoForeignKeyViolations() { @@ -4921,7 +4868,6 @@ public void AutoFlushCollections() e = s.CreateQuery("select elements(baz.StringArray) from baz in class NHibernate.DomainModel.Baz").Enumerable(). GetEnumerator(); - bool found = false; while (e.MoveNext()) @@ -5127,7 +5073,6 @@ public void LoadAfterDelete() s.Close(); } - [Test] public void ObjectType() { @@ -5154,7 +5099,6 @@ public void ObjectType() } } - [Test] public void Any() { diff --git a/src/NHibernate.Test/Legacy/FumTest.cs b/src/NHibernate.Test/Legacy/FumTest.cs index ebd83bb9ed0..8cefd0d38e1 100644 --- a/src/NHibernate.Test/Legacy/FumTest.cs +++ b/src/NHibernate.Test/Legacy/FumTest.cs @@ -536,7 +536,6 @@ public void CompositeIDs() s.Close(); } - [Test] public void KeyManyToOne() { @@ -588,7 +587,6 @@ public void KeyManyToOne() s.Close(); } - [Test] public void CompositeKeyPathExpressions() { diff --git a/src/NHibernate.Test/Legacy/MultiTableTest.cs b/src/NHibernate.Test/Legacy/MultiTableTest.cs index 32ecfca5e4d..fcdd25f93a1 100644 --- a/src/NHibernate.Test/Legacy/MultiTableTest.cs +++ b/src/NHibernate.Test/Legacy/MultiTableTest.cs @@ -29,7 +29,6 @@ public void FetchManyToOne() s.Close(); } - [Test] public void Joins() { @@ -51,7 +50,6 @@ public void Joins() s.Close(); } - [Test] public void JoinOpenBug() { diff --git a/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs b/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs index f96677909ea..8a2fcd8a6cd 100644 --- a/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs +++ b/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs @@ -137,7 +137,6 @@ public void SetProperties() s.Close(); } - [Test] public void Broken() { @@ -200,7 +199,6 @@ public void NothingToUpdate() s.Close(); } - [Test] public void CachedQuery() { diff --git a/src/NHibernate.Test/Legacy/SQLLoaderTest.cs b/src/NHibernate.Test/Legacy/SQLLoaderTest.cs index f7960c7192b..ba2429530b4 100644 --- a/src/NHibernate.Test/Legacy/SQLLoaderTest.cs +++ b/src/NHibernate.Test/Legacy/SQLLoaderTest.cs @@ -409,7 +409,6 @@ public void EmbeddedCompositeProperties() Assert.IsTrue(list.Count == 1); - session.Clear(); query = diff --git a/src/NHibernate.Test/Legacy/SimpleTest.cs b/src/NHibernate.Test/Legacy/SimpleTest.cs index 459d76c576f..50f6797a199 100644 --- a/src/NHibernate.Test/Legacy/SimpleTest.cs +++ b/src/NHibernate.Test/Legacy/SimpleTest.cs @@ -100,7 +100,6 @@ public void TestCRUD() s4.Close(); } - [Test] public void SetPropertiesOnQuery() { @@ -138,4 +137,4 @@ public void SetPropertiesOnQuery() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Linq/ByMethod/DistinctTests.cs b/src/NHibernate.Test/Linq/ByMethod/DistinctTests.cs index a6a5e73927c..65b49b79155 100644 --- a/src/NHibernate.Test/Linq/ByMethod/DistinctTests.cs +++ b/src/NHibernate.Test/Linq/ByMethod/DistinctTests.cs @@ -120,7 +120,6 @@ public void DistinctOnTypeProjectionWithCustomProjectionMethodsIsBlocked1() "Cannot use distinct on result that depends on methods for which no SQL equivalent exist.")); } - [Test] public void DistinctOnTypeProjectionWithCustomProjectionMethodsIsBlocked2() { diff --git a/src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs b/src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs index 4601013f556..02612fec2e8 100644 --- a/src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs +++ b/src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs @@ -128,7 +128,6 @@ public void SingleKeyPropertyGroupAndOrderByProjectedCount() AssertOrderedBy.Descending(orderCounts, oc => oc.OrderCount); } - [Test] public void SingleKeyPropertyGroupAndOrderByCountBeforeProjection() { @@ -891,7 +890,6 @@ public override int GetHashCode() } } - [Test(Description = "NH-3446"), KnownBug("NH-3446", "NHibernate.HibernateException")] public void GroupByOrderByKeySelectToClass() { @@ -901,7 +899,6 @@ public void GroupByOrderByKeySelectToClass() .ToList(); } - [Test(Description = "NH-3743")] public void FetchBeforeGroupBy() { diff --git a/src/NHibernate.Test/Linq/EnumTests.cs b/src/NHibernate.Test/Linq/EnumTests.cs index 83507fc93d8..4050c7ddb97 100644 --- a/src/NHibernate.Test/Linq/EnumTests.cs +++ b/src/NHibernate.Test/Linq/EnumTests.cs @@ -19,7 +19,6 @@ public void CanQueryOnEnumStoredAsInt32_Unspecified_2() CanQueryOnEnumStoredAsInt32(EnumStoredAsInt32.Unspecified, 2); } - public void CanQueryOnEnumStoredAsInt32(EnumStoredAsInt32 type, int expectedCount) { var query = (from user in db.Users @@ -33,14 +32,12 @@ public void CanQueryOnEnumStoredAsInt32(EnumStoredAsInt32 type, int expectedCoun public void CanQueryOnEnumStoredAsString_Meduim_2() { CanQueryOnEnumStoredAsString(EnumStoredAsString.Medium, 2); - } [Test] public void CanQueryOnEnumStoredAsString_Small_1() { CanQueryOnEnumStoredAsString(EnumStoredAsString.Small, 1); - } public void CanQueryOnEnumStoredAsString(EnumStoredAsString type, int expectedCount) diff --git a/src/NHibernate.Test/Linq/FunctionTests.cs b/src/NHibernate.Test/Linq/FunctionTests.cs index b4ad91c53cb..81c369b0374 100644 --- a/src/NHibernate.Test/Linq/FunctionTests.cs +++ b/src/NHibernate.Test/Linq/FunctionTests.cs @@ -36,7 +36,6 @@ public void LikeFunctionWithEscapeCharacter() session.Save(new Employee { FirstName = employeeName, LastName = "LastName" }); session.Flush(); - var query = (from e in db.Employees where NHibernate.Linq.SqlMethods.Like(e.FirstName, employeeNameEscaped, escapeChar) select e).ToList(); diff --git a/src/NHibernate.Test/Linq/LinqQuerySamples.cs b/src/NHibernate.Test/Linq/LinqQuerySamples.cs index d70b0f89b37..efe18a3caad 100755 --- a/src/NHibernate.Test/Linq/LinqQuerySamples.cs +++ b/src/NHibernate.Test/Linq/LinqQuerySamples.cs @@ -289,7 +289,7 @@ public void DLinq17() var dbOrders3 = s.CreateQuery("select o.OrderId from Order o").List(); //var q3 = dbOrders3.SubQueryBatcher(orderId => orderId, - // ids => from subO in db.Orders.ToList() // Note that ToList is just because current group by code is incorrent in our linq provider + // ids => from subO in db.Orders.ToList() // Note that ToList is just because current group by code is incorrent in our linq provider // where ids.Contains(subO.OrderId) // from orderLine in subO.OrderLines // group new {orderLine, FreeShippingDiscount = subO.Freight} @@ -332,7 +332,6 @@ from ol in o.OrderLines DiscountedProducts = input.Batcher.GetData(index) }); - foreach (var x in q3) { Console.WriteLine(x.OrderId); @@ -740,7 +739,6 @@ from o in db.Orders ObjectDumper.Write(q); } - [Category("ORDER BY")] [Test(Description = "This sample uses Orderby, Max and Group By to find the Products that have " + "the highest unit price in each category, and sorts the group by category id.")] @@ -1628,7 +1626,6 @@ public void DLinq2C() where o.ShippingDate != null select o.OrderId).ToArray(); - var withNullShippingDate = new[] { @@ -1731,4 +1728,4 @@ public class Name public string FirstName; public string LastName; } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Linq/LoggingTests.cs b/src/NHibernate.Test/Linq/LoggingTests.cs index b89ef0f49fd..8d6924e2144 100644 --- a/src/NHibernate.Test/Linq/LoggingTests.cs +++ b/src/NHibernate.Test/Linq/LoggingTests.cs @@ -27,7 +27,6 @@ public void PageBetweenProjections() } } - [Test] public void CanLogLinqExpressionWithoutInitializingContainedProxy() { diff --git a/src/NHibernate.Test/Linq/ProjectionsTests.cs b/src/NHibernate.Test/Linq/ProjectionsTests.cs index 9966e2ceb76..2072964783a 100644 --- a/src/NHibernate.Test/Linq/ProjectionsTests.cs +++ b/src/NHibernate.Test/Linq/ProjectionsTests.cs @@ -97,7 +97,6 @@ orderby user.Name Assert.AreEqual("nhibernate nhibernate", query[1].DoubleName); Assert.AreEqual("rahien rahien", query[2].DoubleName); - Assert.AreEqual(new DateTime(2010, 06, 17), query[0].RegisteredAt); Assert.AreEqual(new DateTime(2000, 1, 1), query[1].RegisteredAt); Assert.AreEqual(new DateTime(1998, 12, 31), query[2].RegisteredAt); @@ -115,7 +114,6 @@ orderby user.Id Assert.AreEqual("rahien", query[1].Key); Assert.AreEqual("nhibernate", query[2].Key); - Assert.AreEqual(new DateTime(2010, 06, 17), query[0].Value); Assert.AreEqual(new DateTime(1998, 12, 31), query[1].Value); Assert.AreEqual(new DateTime(2000, 1, 1), query[2].Value); @@ -132,7 +130,6 @@ orderby user.Id Assert.AreEqual("rahien", query[1].Name); Assert.AreEqual("nhibernate", query[2].Name); - Assert.AreEqual(new DateTime(2010, 06, 17), query[0].RegisteredAt); Assert.AreEqual(new DateTime(1998, 12, 31), query[1].RegisteredAt); Assert.AreEqual(new DateTime(2000, 1, 1), query[2].RegisteredAt); @@ -511,7 +508,6 @@ private string FormatName(string name, DateTime? lastLoginDate) return string.Format("User {0} logged in at {1}", name, lastLoginDate); } - /// /// This mimic classes in System.Data.Services.Internal. /// diff --git a/src/NHibernate.Test/Linq/QueryCacheableTests.cs b/src/NHibernate.Test/Linq/QueryCacheableTests.cs index 93f41608fee..79aedf77c5f 100644 --- a/src/NHibernate.Test/Linq/QueryCacheableTests.cs +++ b/src/NHibernate.Test/Linq/QueryCacheableTests.cs @@ -325,7 +325,6 @@ public void FetchIsCachable() Assert.That(Sfi.Statistics.QueryCachePutCount, Is.EqualTo(0), "Unexpected cache put count"); Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(0), "Unexpected cache miss count"); Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1), "Unexpected cache hit count"); - } [Test] diff --git a/src/NHibernate.Test/Linq/QueryLock.cs b/src/NHibernate.Test/Linq/QueryLock.cs index ab6396ebc43..16964d9db30 100644 --- a/src/NHibernate.Test/Linq/QueryLock.cs +++ b/src/NHibernate.Test/Linq/QueryLock.cs @@ -9,7 +9,6 @@ using NHibernate.Linq; using NUnit.Framework; - namespace NHibernate.Test.Linq { [TestFixture] diff --git a/src/NHibernate.Test/Linq/QueryTimeoutTests.cs b/src/NHibernate.Test/Linq/QueryTimeoutTests.cs index ae8a2b7fbf2..bf6ba97bec5 100644 --- a/src/NHibernate.Test/Linq/QueryTimeoutTests.cs +++ b/src/NHibernate.Test/Linq/QueryTimeoutTests.cs @@ -27,7 +27,6 @@ protected override void Configure(Configuration configuration) typeof(TimeoutCatchingNonBatchingBatcherFactory).AssemblyQualifiedName); } - [Test] public void CanSetTimeoutOnLinqQueries() { @@ -40,7 +39,6 @@ public void CanSetTimeoutOnLinqQueries() Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - [Test] public void CanSetTimeoutOnLinqPagingQuery() { @@ -54,7 +52,6 @@ public void CanSetTimeoutOnLinqPagingQuery() Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - [Test] public void CanSetTimeoutBeforeSkipOnLinqOrderedPageQuery() { @@ -68,7 +65,6 @@ orderby e.CompanyName Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - [Test] public void CanSetTimeoutOnLinqGroupPageQuery() { @@ -88,13 +84,11 @@ into g Assert.That(TimeoutCatchingNonBatchingBatcher.LastCommandTimeout, Is.EqualTo(17)); } - public partial class TimeoutCatchingNonBatchingBatcher : NonBatchingBatcher { // Is there an easier way to inspect the DbCommand instead of // creating a custom batcher? - public static int LastCommandTimeout; public TimeoutCatchingNonBatchingBatcher(ConnectionManager connectionManager, IInterceptor interceptor) @@ -109,7 +103,6 @@ public override DbDataReader ExecuteReader(DbCommand cmd) } } - public partial class TimeoutCatchingNonBatchingBatcherFactory : IBatcherFactory { public IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor interceptor) diff --git a/src/NHibernate.Test/Linq/WhereSubqueryTests.cs b/src/NHibernate.Test/Linq/WhereSubqueryTests.cs index 060d6bc1710..f272d438707 100644 --- a/src/NHibernate.Test/Linq/WhereSubqueryTests.cs +++ b/src/NHibernate.Test/Linq/WhereSubqueryTests.cs @@ -739,7 +739,6 @@ public void ProductsWithSubqueryReturningStringFirstOrDefaultEq() Assert.That(result.Count, Is.EqualTo(13)); } - [Test(Description = "NH-3423")] public void NullComparedToNewExpressionInWhereClause() { diff --git a/src/NHibernate.Test/Linq/WhereTests.cs b/src/NHibernate.Test/Linq/WhereTests.cs index e75e232939a..b331d2604ef 100644 --- a/src/NHibernate.Test/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Linq/WhereTests.cs @@ -131,7 +131,6 @@ public void UsersRegisteredAtOrAfterY2K() Assert.That(query.Count, Is.EqualTo(2)); } - [Test] public void UsersRegisteredAtOrAfterY2K_And_Before2001() { @@ -350,7 +349,6 @@ public void UsersWithStringContainsAndNotNullNameComplicated() query.ToList(); } - [Test] [Description("NH-3337")] public void ProductWithDoubleStringContainsAndNotNull() @@ -400,7 +398,6 @@ public void ProductWithDoubleStringContainsAndNotNull() var results = db.Products.Where(expr).ToList(); Assert.That(results, Has.Count.EqualTo(1)); } - [Test(Description = "NH-3261")] public void UsersWithStringContainsAndNotNullName() @@ -763,7 +760,6 @@ public void AnimalsWithFathersSerialNumberListContainsWithLocalVariable() Assert.That(query.Count, Is.EqualTo(1)); } - [Test(Description = "NH-3366")] public void CanUseCompareInQueryWithNonConstantZero() { @@ -783,7 +779,6 @@ public void CanUseCompareInQueryWithNonConstantZero() } } - [Test(Description = "NH-3366")] [TestCaseSource(typeof(WhereTests), nameof(CanUseCompareInQueryDataSource))] public void CanUseCompareInQuery(Expression> expression, int expectedCount, bool expectCase) @@ -799,7 +794,6 @@ public void CanUseCompareInQuery(Expression> expression, int } } - [Test(Description = "NH-3665")] public void SelectOnCollectionReturnsResult() { diff --git a/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs b/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs index d41510c4947..1a593281dc0 100644 --- a/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs +++ b/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs @@ -749,7 +749,6 @@ public void UpdateOnDiscriminatorSubclass() } using (var t = s.BeginTransaction()) { - var count = s.Query().UpdateBuilder().Set(y => y.Name, y => y.Name).Update(); Assert.That(count, Is.EqualTo(2), "Incorrect discrim subclass update count"); @@ -793,7 +792,6 @@ public void UpdateOnAnimal() s.Query().UpdateBuilder().Set(y => y.FireTemperature, 300).Update(); Assert.That(count, Is.EqualTo(1), "Incorrect entity-updated count"); - count = s.Query().UpdateBuilder().Set(y => y.BodyWeight, y => y.BodyWeight + 1 + 1).Update(); Assert.That(count, Is.EqualTo(10), "incorrect count on 'complex' update assignment"); @@ -1006,7 +1004,6 @@ public void SimpleDeleteOnAnimal() using (var s = OpenSession()) using (var t = s.BeginTransaction()) { - var count = s.Query().Where(x => x.Id == _polliwog.Id).Delete(); Assert.That(count, Is.EqualTo(1), "Incorrect delete count"); diff --git a/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs b/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs index 9462807e97b..16204e812cc 100644 --- a/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs +++ b/src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/SafePoidTests.cs @@ -9,7 +9,6 @@ public class SafePoidTests { private class MyClassWithoutPoid { - } private class MyClass diff --git a/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/AllPropertiesRegistrationTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/AllPropertiesRegistrationTests.cs index d0b169cd2ff..11f66934fa3 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/AllPropertiesRegistrationTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/AllPropertiesRegistrationTests.cs @@ -110,7 +110,6 @@ private class Related private class Inherited:MyClass { - } [Test] @@ -266,7 +265,6 @@ public void WhenMapComponentWithWrongElementTypeThenThrows() }), Throws.TypeOf()); } - [Test] public void WhenMapOneToOneWithWrongTypeThenThrows() { diff --git a/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/JoinGenericDynamicComponentTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/JoinGenericDynamicComponentTests.cs index d21147c6acd..b19e304b860 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/JoinGenericDynamicComponentTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/JoinGenericDynamicComponentTests.cs @@ -192,4 +192,4 @@ public void WhenJoinedDynamicComponentIsMappedOnJoinThenItBelongsToJoinTable() Assert.That(hbmPropJoinedAttributes, Is.TypeOf()); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/ComponentMappingRegistrationTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/ComponentMappingRegistrationTests.cs index f7621dcce61..16bf43111db 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/ComponentMappingRegistrationTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/ComponentMappingRegistrationTests.cs @@ -8,7 +8,6 @@ public class ComponentMappingRegistrationTests { private class MyComponent { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassMappingStrategyTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassMappingStrategyTests.cs index 93cff8f772d..2d080531291 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassMappingStrategyTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassMappingStrategyTests.cs @@ -8,15 +8,12 @@ public class JoinedSubclassMappingStrategyTests { private class MyClass { - } private class Inherited1 : MyClass { - } private class Inherited2 : Inherited1 { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassSequenceRegistrationTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassSequenceRegistrationTests.cs index e90888414cf..1ce252f60e6 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassSequenceRegistrationTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassSequenceRegistrationTests.cs @@ -8,11 +8,9 @@ public class JoinedSubclassSequenceRegistrationTests { private class MyClass { - } private class Inherited1 : MyClass { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/RootClassMappingStrategyTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/RootClassMappingStrategyTests.cs index 11c77180841..22b3ca35fb5 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/RootClassMappingStrategyTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/RootClassMappingStrategyTests.cs @@ -8,15 +8,12 @@ public class RootClassMappingStrategyTests { private class MyClass { - } private class Inherited1: MyClass { - } private class Inherited2 : Inherited1 { - } [Test] @@ -74,7 +71,6 @@ public void WhenRegisteredDeepSubclassThenTheStrategyIsDefinedEvenForRoot() Assert.That(inspector.IsTablePerConcreteClass(typeof(MyClass)), Is.False); } - [Test] public void WhenRegisteredConcreteClassThenTheStrategyIsDefinedEvenForRoot() { diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassMappingStrategyTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassMappingStrategyTests.cs index 5438c6c9341..384f2015815 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassMappingStrategyTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassMappingStrategyTests.cs @@ -8,15 +8,12 @@ public class SubclassMappingStrategyTests { private class MyClass { - } private class Inherited1 : MyClass { - } private class Inherited2 : Inherited1 { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassSequenceRegistrationTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassSequenceRegistrationTests.cs index 580a50f1884..4bac9ebf561 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassSequenceRegistrationTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassSequenceRegistrationTests.cs @@ -8,11 +8,9 @@ public class SubclassSequenceRegistrationTests { private class MyClass { - } private class Inherited1 : MyClass { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassMappingStrategyTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassMappingStrategyTests.cs index f221bf93e0e..ba43e701107 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassMappingStrategyTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassMappingStrategyTests.cs @@ -8,15 +8,12 @@ public class UnionSubclassMappingStrategyTests { private class MyClass { - } private class Inherited1 : MyClass { - } private class Inherited2 : Inherited1 { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassSequenceRegistrationTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassSequenceRegistrationTests.cs index c1c11b785fe..e7c67a2a609 100644 --- a/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassSequenceRegistrationTests.cs +++ b/src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassSequenceRegistrationTests.cs @@ -8,11 +8,9 @@ public class UnionSubclassSequenceRegistrationTests { private class MyClass { - } private class Inherited1 : MyClass { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs index 2a6f1377a2c..5fa24d6e91e 100644 --- a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs +++ b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728 +namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728 { public class Dog : IAnimal { diff --git a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs index 7548cd1a216..1ab3f3ac78a 100644 --- a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs +++ b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728 +namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728 { public interface IAnimal { diff --git a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH3105/Fixture.cs b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH3105/Fixture.cs index f7c0e410cfb..f248093a368 100644 --- a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH3105/Fixture.cs +++ b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH3105/Fixture.cs @@ -27,7 +27,6 @@ public void CanMapComponentAsIdWhenComponentIsDeclaredInBaseClass() Assert.That(key.Columns.Single().name, Is.EqualTo("IdColumn")); } - [Test] public void CanMapIdWhenIdIsDeclaredInBaseClass() { @@ -66,4 +65,4 @@ public void CanMapComponentAsIdWhenComponentIsDeclaredInClass() Assert.That(key.Columns.Single().name, Is.EqualTo("IdColumn")); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/ComponetAsIdTests.cs b/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/ComponetAsIdTests.cs index 0b628645201..92367f86348 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/ComponetAsIdTests.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperTests/ComponetAsIdTests.cs @@ -83,6 +83,5 @@ public void WhenMapExternalMemberAsComponentIdThenThrows() Assert.That(() => mapper.ComponentAsId(For.Property(x => x.Id), map => map.Access(Accessor.Field)), Throws.TypeOf()); } - } } diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/ComponentWithBagOfNestedComponentsTests.cs b/src/NHibernate.Test/MappingByCode/MappersTests/ComponentWithBagOfNestedComponentsTests.cs index 5ab7056215e..7bea39764f8 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/ComponentWithBagOfNestedComponentsTests.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/ComponentWithBagOfNestedComponentsTests.cs @@ -219,7 +219,6 @@ public void PropertyCustomizerDifferentiatesBetweenChildClasses() var mappings = mapper.CompileMappingForAllExplicitlyAddedEntities(); - HbmBag bag1 = mappings .Items.Cast() .Where(c => c.Name == typeof(OwnerChildOne).FullName) @@ -242,7 +241,5 @@ public void PropertyCustomizerDifferentiatesBetweenChildClasses() HbmProperty propertyMapping2 = childElement2.Properties.Cast().Single(); Assert.That(propertyMapping2.Columns.Single().name, Is.EqualTo("OwnerChildTwo_CustomColumnName")); } - - } } diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs b/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs index 91c56775013..23cbbb1f6c3 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynCompAttributesSettingTest.cs @@ -75,6 +75,5 @@ public void CanAddSimpleProperty() Assert.That(component.Properties.Single(), Is.TypeOf().And.Property("Name").EqualTo("Pizza")); } - } } diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs b/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs index 8d8fc4fcd50..b08be0a53b5 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/DynamicComponentMapperTests/DynComponentPropertyOnDynamicCompoTests.cs @@ -36,14 +36,13 @@ public IDictionary Info } } - [Test] public void WhenAddThenHas() { var mapdoc = new HbmMapping(); var component = new HbmDynamicComponent(); var mapper = new DynamicComponentMapper(component, For.Property(p => p.Info), mapdoc); - var propertyInfo = For.Property(p => p.Info);//just as another dyn-compo + var propertyInfo = For.Property(p => p.Info); //just as another dyn-compo mapper.Component(propertyInfo, (IDynamicComponentMapper x) => { }); @@ -56,7 +55,7 @@ public void WhenAddThenHasGeneric() var mapdoc = new HbmMapping(); var component = new HbmDynamicComponent(); var mapper = new DynamicComponentMapper(component, For.Property(p => p.Info), mapdoc); - var propertyInfo = For.Property(p => p.Info);//just as another dyn-compo + var propertyInfo = For.Property(p => p.Info); //just as another dyn-compo mapper.Component(propertyInfo, (IDynamicComponentMapper x) => { }); @@ -69,7 +68,7 @@ public void WhenCustomizeThenCallCustomizer() var mapdoc = new HbmMapping(); var component = new HbmDynamicComponent(); var mapper = new DynamicComponentMapper(component, For.Property(p => p.Info), mapdoc); - var propertyInfo = For.Property(p => p.Info);//just as another dyn-compo + var propertyInfo = For.Property(p => p.Info); //just as another dyn-compo var called = false; mapper.Component(propertyInfo, (IDynamicComponentMapper x) => called = true); @@ -83,7 +82,7 @@ public void WhenCustomizeThenCallCustomizerGeneric() var mapdoc = new HbmMapping(); var component = new HbmDynamicComponent(); var mapper = new DynamicComponentMapper(component, For.Property(p => p.Info), mapdoc); - var propertyInfo = For.Property(p => p.Info);//just as another dyn-compo + var propertyInfo = For.Property(p => p.Info); //just as another dyn-compo var called = false; mapper.Component(propertyInfo, (IDynamicComponentMapper x) => called = true); @@ -97,7 +96,7 @@ public void WhenCustomizeAccessorThenIgnore() var mapdoc = new HbmMapping(); var component = new HbmDynamicComponent(); var mapper = new DynamicComponentMapper(component, For.Property(p => p.Info), mapdoc); - var propertyInfo = For.Property(p => p.Info);//just as another dyn-compo + var propertyInfo = For.Property(p => p.Info); //just as another dyn-compo mapper.Component(propertyInfo, (IDynamicComponentMapper x) => x.Access(Accessor.Field)); @@ -110,7 +109,7 @@ public void WhenCustomizeAccessorThenIgnoreGeneric() var mapdoc = new HbmMapping(); var component = new HbmDynamicComponent(); var mapper = new DynamicComponentMapper(component, For.Property(p => p.Info), mapdoc); - var propertyInfo = For.Property(p => p.Info);//just as another dyn-compo + var propertyInfo = For.Property(p => p.Info); //just as another dyn-compo mapper.Component(propertyInfo, (IDynamicComponentMapper x) => x.Access(Accessor.Field)); diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/IdMapperTest.cs b/src/NHibernate.Test/MappingByCode/MappersTests/IdMapperTest.cs index 9b9f4eb4b5f..a6213e0eba6 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/IdMapperTest.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/IdMapperTest.cs @@ -137,7 +137,6 @@ public int Id private class Entity : BaseEntity { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs b/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs index 9216e072c42..070765d784a 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs @@ -37,7 +37,6 @@ public void Access(Accessor accessor) public void Access(System.Type accessorType) { - } } [Test] diff --git a/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs b/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs index cebceb91b0f..cd1af378a33 100644 --- a/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs +++ b/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs @@ -25,7 +25,6 @@ private class Entity private enum Something { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/MixAutomapping/EntityTests.cs b/src/NHibernate.Test/MappingByCode/MixAutomapping/EntityTests.cs index 65ac232b6a9..00b3565a7f4 100644 --- a/src/NHibernate.Test/MappingByCode/MixAutomapping/EntityTests.cs +++ b/src/NHibernate.Test/MappingByCode/MixAutomapping/EntityTests.cs @@ -24,7 +24,6 @@ private class Entity private enum Something { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/MixAutomapping/OneToManyTests.cs b/src/NHibernate.Test/MappingByCode/MixAutomapping/OneToManyTests.cs index 82297d18b5b..47b62ae8b56 100644 --- a/src/NHibernate.Test/MappingByCode/MixAutomapping/OneToManyTests.cs +++ b/src/NHibernate.Test/MappingByCode/MixAutomapping/OneToManyTests.cs @@ -20,7 +20,6 @@ private class MyClass private class Related { - } private class Bidirectional diff --git a/src/NHibernate.Test/MappingByCode/MixAutomapping/PolymorphicPropertiesMapping.cs b/src/NHibernate.Test/MappingByCode/MixAutomapping/PolymorphicPropertiesMapping.cs index 0e66a60053c..783813ea6d0 100644 --- a/src/NHibernate.Test/MappingByCode/MixAutomapping/PolymorphicPropertiesMapping.cs +++ b/src/NHibernate.Test/MappingByCode/MixAutomapping/PolymorphicPropertiesMapping.cs @@ -23,7 +23,7 @@ private class BaseEntity : IBaseEntity private interface IProduct : IBaseEntity { - string Description { get;} + string Description { get; } } private abstract class BaseProduct : BaseEntity, IProduct diff --git a/src/NHibernate.Test/MappingByCode/MixAutomapping/PropertiesExclusionTests.cs b/src/NHibernate.Test/MappingByCode/MixAutomapping/PropertiesExclusionTests.cs index b9fc52ad283..ba3166d8f78 100644 --- a/src/NHibernate.Test/MappingByCode/MixAutomapping/PropertiesExclusionTests.cs +++ b/src/NHibernate.Test/MappingByCode/MixAutomapping/PropertiesExclusionTests.cs @@ -112,6 +112,5 @@ public void IncludesAutoprop() var pi = typeof(MyEntity).GetProperty("AutoPropWithPrivateSet"); Assert.That(inspector.IsPersistentProperty(pi), Is.True); } - } } diff --git a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorConcreteClassesTest.cs b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorConcreteClassesTest.cs index 75cb8fdcdca..322a988b2bc 100644 --- a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorConcreteClassesTest.cs +++ b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorConcreteClassesTest.cs @@ -8,19 +8,15 @@ public class GetFirstImplementorConcreteClassesTest { private class MyClass1 { - } private class MyClass2 : MyClass1 { - } private class MyClass3 : MyClass2 { - } private class MyClass4 : MyClass3 { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorTest.cs b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorTest.cs index 1e6b77fd3bb..e02c1d7fc07 100644 --- a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorTest.cs +++ b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetFirstImplementorTest.cs @@ -9,35 +9,27 @@ public class GetFirstImplementorTest { private interface IInterfaceNoImpl { - } private interface IInterface1 { - } private interface IInterface2 { - } private interface IInterface3 { - } private class MyClassNoInterface { - } private class MyClass1: IInterface1 { - } private class MyClass2: MyClass1, IInterface2 { - } private class MyClass3 : MyClass2, IInterface3 { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetMemberFromInterfacesTest.cs b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetMemberFromInterfacesTest.cs index 2e9c7ec3472..fc891725f88 100644 --- a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetMemberFromInterfacesTest.cs +++ b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/GetMemberFromInterfacesTest.cs @@ -41,7 +41,6 @@ private interface IInheritedHasSomething : IHasSomething string Blah { get; set; } } - [Test] public void WhenNullArgumentThenThrows() { diff --git a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/TypeExtensionsTest.cs b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/TypeExtensionsTest.cs index 7c695b8480a..d7b4072f870 100644 --- a/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/TypeExtensionsTest.cs +++ b/src/NHibernate.Test/MappingByCode/TypeExtensionsTests/TypeExtensionsTest.cs @@ -48,7 +48,6 @@ private class MyBaseClass private class MyClass : MyBaseClass { - } [Test] @@ -181,7 +180,6 @@ public void GetFirstPropertyOfType_WhenPropertyNotExistThenNull() private interface IMyEntity : IEntity { - } [Test] diff --git a/src/NHibernate.Test/MappingByCode/TypeNameUtilTests.cs b/src/NHibernate.Test/MappingByCode/TypeNameUtilTests.cs index 0fcb18da9d6..5a6f4acffe0 100644 --- a/src/NHibernate.Test/MappingByCode/TypeNameUtilTests.cs +++ b/src/NHibernate.Test/MappingByCode/TypeNameUtilTests.cs @@ -7,11 +7,9 @@ namespace NHibernate.Test.MappingByCode { public class MyEntity { - } public class MyGenericEntity { - } [TestFixture] diff --git a/src/NHibernate.Test/NHSpecificTest/BasicClassFixture.cs b/src/NHibernate.Test/NHSpecificTest/BasicClassFixture.cs index 5bfd888248c..454357fd05e 100644 --- a/src/NHibernate.Test/NHSpecificTest/BasicClassFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/BasicClassFixture.cs @@ -152,7 +152,6 @@ public void TestCRUD() index++; - // update a property to make sure it picks up that it is dirty s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -383,7 +382,6 @@ public void TestArrayCRUD() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -437,7 +435,6 @@ public void TestPrimitiveArrayCRUD() index++; - // modify the array to a new array so it is recreated s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -453,7 +450,6 @@ public void TestPrimitiveArrayCRUD() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -523,7 +519,6 @@ public void TestMapCRUD() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -590,7 +585,6 @@ public void TestSetCRUD() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -675,7 +669,6 @@ public void TestBagCRUD() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -793,7 +786,6 @@ public void TestListCRUD() index++; - // VERIFY PREVIOUS UPDATE & PERFORM DELETE s[index] = OpenSession(); t[index] = s[index].BeginTransaction(); @@ -1060,4 +1052,4 @@ private void InitializeBasicClass(int id, ref BasicClass basicClass) basicClass.AddToStringSet("zero"); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/BasicObjectFixture.cs b/src/NHibernate.Test/NHSpecificTest/BasicObjectFixture.cs index 0938cfd4ee8..a1c6e270f08 100644 --- a/src/NHibernate.Test/NHSpecificTest/BasicObjectFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/BasicObjectFixture.cs @@ -49,7 +49,6 @@ public void TestCRUD() s = OpenSession(); bo = (BasicObject) s.Load(typeof(BasicObject), bo.Id); - Assert.IsNotNull(bo.AnyWithProxy, "AnyWithProxy should not be null"); Assert.IsTrue(bo.AnyWithProxy is IBasicObjectProxy, "AnyWithProxy should have been a IBasicObjectProxy instance"); Assert.AreEqual(anyProxy.Id, ((IBasicObjectProxy) bo.AnyWithProxy).Id); @@ -68,4 +67,4 @@ public void TestCRUD() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/CriteriaFromHql/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/CriteriaFromHql/Fixture.cs index 1d84c60080b..594264c5f01 100644 --- a/src/NHibernate.Test/NHSpecificTest/CriteriaFromHql/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/CriteriaFromHql/Fixture.cs @@ -9,7 +9,6 @@ namespace NHibernate.Test.NHSpecificTest.CriteriaFromHql [TestFixture] public class Fixture : TestCase { - protected override string[] Mappings { get { return new string[] { "NHSpecificTest.CriteriaFromHql.Mappings.hbm.xml" }; } diff --git a/src/NHibernate.Test/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs index 0592869e927..94940698027 100644 --- a/src/NHibernate.Test/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/CriteriaQueryOnComponentCollection/Fixture.cs @@ -94,7 +94,6 @@ public void CanQueryByCriteriaOnSetOfElement() } } - [TestCase(JoinType.LeftOuterJoin)] [TestCase(JoinType.InnerJoin)] public void CanQueryByCriteriaOnSetOfElementByCreateAlias(JoinType joinType) @@ -113,7 +112,6 @@ public void CanQueryByCriteriaOnSetOfElementByCreateAlias(JoinType joinType) } } - [Test] public void CanQueryByCriteriaOnSetOfCompositeElement_UsingDetachedCriteria() { @@ -133,7 +131,6 @@ public void CanQueryByCriteriaOnSetOfCompositeElement_UsingDetachedCriteria() } } - protected override string[] Mappings { get { return new[] {"NHSpecificTest.CriteriaQueryOnComponentCollection.Mappings.hbm.xml"}; } @@ -143,6 +140,5 @@ protected override string MappingsAssembly { get { return "NHibernate.Test"; } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/Dates/DateTime2Fixture.cs b/src/NHibernate.Test/NHSpecificTest/Dates/DateTime2Fixture.cs index a87a119772a..23359dd5b3f 100644 --- a/src/NHibernate.Test/NHSpecificTest/Dates/DateTime2Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/Dates/DateTime2Fixture.cs @@ -26,7 +26,6 @@ public void SavingAndRetrievingTest() SavingAndRetrievingAction(new AllDates {Sql_datetime2 = Now}, entity => DateTimeAssert.AreEqual(entity.Sql_datetime2, Now)); - SavingAndRetrievingAction(new AllDates { Sql_datetime2 = DateTime.MinValue }, entity => DateTimeAssert.AreEqual(entity.Sql_datetime2, DateTime.MinValue)); @@ -43,4 +42,4 @@ public void SaveMillisecond() entity => Assert.That(entity.Sql_datetime2, Is.EqualTo(datetime2))); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeAssert.cs b/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeAssert.cs index baa56cbcc1f..1024422de80 100644 --- a/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeAssert.cs +++ b/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeAssert.cs @@ -28,7 +28,6 @@ public static void AreEqual(DateTime dt1, DateTime dt2, bool OnlyDatePart) Assert.Fail(string.Format("Expected {0} but was {1}", dt1, dt2)); } - public static void AreEqual(DateTimeOffset dt1, DateTimeOffset dt2) { bool areEqual = new DateTimeOffsetType().IsEqual(dt1, dt2); @@ -59,4 +58,4 @@ private static bool DatePartAreEqual(DateTime x, DateTime y) date1.Day == date2.Day); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs b/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs index 2fd610656a1..096419a336e 100644 --- a/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs @@ -38,7 +38,6 @@ protected override void Configure(Cfg.Configuration configuration) configuration.SetProperty(Environment.ShowSql, "true"); } - protected override void OnSetUp() { base.OnSetUp(); @@ -55,7 +54,6 @@ protected override void OnSetUp() } } - protected override void OnTearDown() { using (ISession s = OpenSession()) @@ -66,7 +64,6 @@ protected override void OnTearDown() } } - [Test] public void CanQueryWithCastInHql() { @@ -78,7 +75,6 @@ public void CanQueryWithCastInHql() } } - [Test(Description = "NH-3357")] public void CanQueryWithAggregateInLinq() { @@ -93,7 +89,6 @@ public void CanQueryWithAggregateInLinq() Assert.That(datesRecovered, Is.EqualTo(new DateTimeOffset(2012, 11, 1, 2, 0, 0, TimeSpan.FromHours(3)))); } - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/EntityNameAndInheritance/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/EntityNameAndInheritance/Fixture.cs index c7459eede5a..24e6e9bde15 100644 --- a/src/NHibernate.Test/NHSpecificTest/EntityNameAndInheritance/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/EntityNameAndInheritance/Fixture.cs @@ -1,4 +1,3 @@ - using System.Collections; using NUnit.Framework; diff --git a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs index 63138e0a3af..a4f8d84acfb 100644 --- a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs +++ b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators +namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators { public class EntityWithUserTypeProperty { @@ -8,6 +7,4 @@ public class EntityWithUserTypeProperty public virtual IExample Example { get; set; } public virtual double DoubleStoredAsString { get; set; } } - - } diff --git a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs index 2dde82ff090..66e1a522eb5 100644 --- a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/Fixture.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators { - [TestFixture] public class Fixture : TestCase { diff --git a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/IExample.cs b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/IExample.cs index 0c7f8db7b6f..7e521794137 100644 --- a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/IExample.cs +++ b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/IExample.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators { public interface IExample diff --git a/src/NHibernate.Test/NHSpecificTest/Evicting/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/Evicting/Fixture.cs index cdb76a8a09e..a2551bf2eaf 100644 --- a/src/NHibernate.Test/NHSpecificTest/Evicting/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/Evicting/Fixture.cs @@ -35,7 +35,6 @@ protected override void OnTearDown() base.OnTearDown(); } - [Test] public void Can_evict_entity_from_session() { @@ -56,7 +55,6 @@ public void Can_evict_entity_from_session() [Test] public void Can_evict_non_persistent_object() { - using (var session = Sfi.OpenSession()) using (var tx = session.BeginTransaction()) { @@ -74,11 +72,9 @@ public void Can_evict_non_persistent_object() [Test] public void Can_evict_when_trying_to_evict_entity_from_another_session() { - using (var session1 = Sfi.OpenSession()) using (var tx1 = session1.BeginTransaction()) { - using (var session2 = Sfi.OpenSession()) using (var tx2 = session2.BeginTransaction()) { @@ -98,6 +94,5 @@ public void Can_evict_when_trying_to_evict_entity_from_another_session() tx1.Commit(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/GH1149/Classes.cs b/src/NHibernate.Test/NHSpecificTest/GH1149/Classes.cs index 2b131b23c61..c13763099a5 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH1149/Classes.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH1149/Classes.cs @@ -23,7 +23,6 @@ public Address(Company company) public virtual Company Company { get; set; } public virtual string AddressLine1 { get; set; } - } public class CompanyO2O @@ -46,6 +45,5 @@ public virtual void SetCompany(CompanyO2O company) Company = company; company.Address = this; } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/GH1149/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/GH1149/Fixture.cs index 152f182438c..a555a80a50c 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH1149/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH1149/Fixture.cs @@ -72,7 +72,6 @@ public void StatelessSessionLoadsOneToOneRelatedObject_WithoutPropertyRef() } } - using (var stateless = Sfi.OpenStatelessSession()) { var loadedCompany = stateless.Get(companyId); diff --git a/src/NHibernate.Test/NHSpecificTest/GH1486/Entities.cs b/src/NHibernate.Test/NHSpecificTest/GH1486/Entities.cs index efe49cfd6cd..4017d6abf61 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH1486/Entities.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH1486/Entities.cs @@ -1,6 +1,5 @@ using System; - namespace NHibernate.Test.NHSpecificTest.GH1486 { public class Person diff --git a/src/NHibernate.Test/NHSpecificTest/GH1496/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/GH1496/Fixture.cs index 61ce3e75ef0..73c3be88fe8 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH1496/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH1496/Fixture.cs @@ -40,7 +40,6 @@ private void SetupPerson() session.Save(person); testPerson = person; - address = new Address("Postal T", "State T", "Street T"); person = new Person(2, "Tom", address); session.Save(address); @@ -66,7 +65,6 @@ private void SetupEmployee() session.Save(employee); testEmployee = employee; - employee = new Employee(2, "Tom"); contact = new Contact { Phone = "666-666-6666", ContactIdentifier = new ContactIdentifier(WORK_TYPENAME, "2") }; session.Save(contact); @@ -93,7 +91,6 @@ protected override void OnTearDown() [Test] public void EventListener_Entity_NoChange() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -166,8 +163,6 @@ public void SelectBeforeUpdate_Entity_ChangeProperty() } } - - [Test] public void EventListener_EntityWithCompositeId_ChangeProperty() { @@ -207,11 +202,9 @@ public void SelectBeforeUpdate_EntityWithCompositeId_ChangeProperty() } } - [Test] public void EventListener_ManyToOne_ChangeProperty() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -251,7 +244,6 @@ public void SelectBeforeUpdate_ManyToOne_ChangeProperty() [Test] public void EventListener_Entity_SetNewManyToOne() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -295,7 +287,6 @@ public void SelectBeforeUpdate_Entity_SetNewManyToOne() [Test] public void EventListener_ManyToOneWithCompositeId_ChangeProperty() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -335,7 +326,6 @@ public void SelectBeforeUpdate_ManyToOneWithCompositeId_ChangeProperty() [Test] public void EventListener_Entity_SetNewManyToOneWithCompositeId() { - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -355,7 +345,6 @@ public void EventListener_Entity_SetNewManyToOneWithCompositeId() } } - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) @@ -396,7 +385,6 @@ public void SelectBeforeUpdate_Entity_SetNewManyToOneWithCompositeId() } } - using (var session = OpenSession()) { using (var transaction = session.BeginTransaction()) diff --git a/src/NHibernate.Test/NHSpecificTest/GH1515/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/GH1515/Fixture.cs index bf8753b71a0..1813850b7e9 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH1515/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH1515/Fixture.cs @@ -46,7 +46,5 @@ public void IntializeForwaredToPersistentCollection() collection.Received().ForceInitialization(); } - - } } diff --git a/src/NHibernate.Test/NHSpecificTest/GH1530/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/GH1530/Fixture.cs index 622440fdbbe..5dee006ca8b 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH1530/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH1530/Fixture.cs @@ -101,5 +101,4 @@ public class NonInverseFixture : FixtureBase { protected override string[] Mappings => new[] { "NonInverseMappings.hbm.xml" }; } - } diff --git a/src/NHibernate.Test/NHSpecificTest/GH2089/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/GH2089/Fixture.cs index 15e8a84cf0e..547591f7778 100644 --- a/src/NHibernate.Test/NHSpecificTest/GH2089/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/GH2089/Fixture.cs @@ -37,7 +37,6 @@ public virtual void CanAddChild() } } - protected override void OnTearDown() { using (var s = OpenSession()) diff --git a/src/NHibernate.Test/NHSpecificTest/HqlOnMapWithForumula/Domain.cs b/src/NHibernate.Test/NHSpecificTest/HqlOnMapWithForumula/Domain.cs index 19ac5286d86..5f792ac1b86 100644 --- a/src/NHibernate.Test/NHSpecificTest/HqlOnMapWithForumula/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/HqlOnMapWithForumula/Domain.cs @@ -22,7 +22,6 @@ public virtual int ID set { id = value; } } - public IDictionary MyMaps { get { return myMap; } @@ -30,7 +29,6 @@ public IDictionary MyMaps } } - public class Info { private int rowCount; diff --git a/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Employee.cs b/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Employee.cs index 5ecf823a1ce..2babfd1cdd7 100644 --- a/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Employee.cs +++ b/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Employee.cs @@ -20,8 +20,5 @@ public int Id get { return id; } set { id = value; } } - - - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Fixture.cs index 1f58ff9c20f..06c6c1c3c93 100644 --- a/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/ListsWithHoles/Fixture.cs @@ -45,7 +45,6 @@ public void CanHandleHolesInList() tx.Commit(); } - using (ISession sess = OpenSession()) using (ITransaction tx = sess.BeginTransaction()) { @@ -54,8 +53,6 @@ public void CanHandleHolesInList() tx.Commit(); } - - using (ISession sess = OpenSession()) using (ITransaction tx = sess.BeginTransaction()) { diff --git a/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Employee.cs b/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Employee.cs index fc3671e00b8..151faa2c94a 100644 --- a/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Employee.cs +++ b/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Employee.cs @@ -4,7 +4,6 @@ namespace NHibernate.Test.NHSpecificTest.LoadingNullEntityInSet { - public class Employee { private int id; diff --git a/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs index ac23623834b..e4d6b70bb92 100644 --- a/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/LoadingNullEntityInSet/Fixture.cs @@ -10,7 +10,6 @@ namespace NHibernate.Test.NHSpecificTest.LoadingNullEntityInSet [TestFixture] public class Fixture : TestCase { - protected override string[] Mappings { get { return new string[] { "NHSpecificTest.LoadingNullEntityInSet.Mappings.hbm.xml" }; } @@ -73,7 +72,6 @@ public void CanHandleNullEntityInList() criteria.List(); } - using (ISession sess = OpenSession()) { sess.Delete("from WantedProfession"); diff --git a/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs index 4cb4e976acc..ffdc1f10ae1 100644 --- a/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/ManyToOneFilters20Behaviour/Fixture.cs @@ -241,6 +241,5 @@ public void Verify20BehaviourForPropertyRefAndFilter() Assert.That(resHql[0].Address, Is.Not.Null); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/MapFixture.cs b/src/NHibernate.Test/NHSpecificTest/MapFixture.cs index 4e86bc799cc..eda191cffeb 100644 --- a/src/NHibernate.Test/NHSpecificTest/MapFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/MapFixture.cs @@ -47,7 +47,6 @@ protected override void OnTearDown() } } - [Test] public void TestSelect() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1027/ManyToManyAssoc.cs b/src/NHibernate.Test/NHSpecificTest/NH1027/ManyToManyAssoc.cs index 72eb0dec7dc..b5599ff6cf7 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1027/ManyToManyAssoc.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1027/ManyToManyAssoc.cs @@ -63,7 +63,6 @@ public virtual string Name7 set { name = value; } } - public virtual ISet Containers { get { return containers; } @@ -111,6 +110,5 @@ public virtual int Id get { return id; } set { id = value; } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1028/ManyToManyAssoc.cs b/src/NHibernate.Test/NHSpecificTest/NH1028/ManyToManyAssoc.cs index 46a6112ee51..3eb788952e0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1028/ManyToManyAssoc.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1028/ManyToManyAssoc.cs @@ -64,7 +64,6 @@ public virtual string Name7 set { name = value; } } - public virtual ISet Containers { get { return containers; } @@ -112,6 +111,5 @@ public virtual int Id get { return id; } set { id = value; } } - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1033/Animal.cs b/src/NHibernate.Test/NHSpecificTest/NH1033/Animal.cs index 9071de7261b..8879f329150 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1033/Animal.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1033/Animal.cs @@ -14,6 +14,5 @@ public virtual string SerialNumber get; set; } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1033/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1033/Fixture.cs index a06a108fc58..b2c98a6a25f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1033/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1033/Fixture.cs @@ -15,7 +15,6 @@ protected override void OnSetUp() { using (var tran = session.BeginTransaction()) { - var animal0 = new Animal(); var animal1 = new Reptile(); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1033/Reptile.cs b/src/NHibernate.Test/NHSpecificTest/NH1033/Reptile.cs index 5407fec0783..fd33f6c2b60 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1033/Reptile.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1033/Reptile.cs @@ -4,11 +4,10 @@ namespace NHibernate.Test.NHSpecificTest.NH1033 { public class Reptile : Animal { - public virtual float BodyTemperature { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs index b6b69f5296c..1f3bb1bc1c5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1039/Fixture.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.NHSpecificTest.NH1039 { [TestFixture] diff --git a/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Fixture.cs index dc756ed75e4..ca445766ede 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Fixture.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.NHSpecificTest.NH1039Generic { [TestFixture] diff --git a/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Model.cs index 44f1d986396..847d5f4266e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1039Generic/Model.cs @@ -31,5 +31,4 @@ public virtual IDictionary Properties set { _Properties = value; } } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1080/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH1080/Domain.cs index 26f407c4fe5..68c6d74e330 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1080/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1080/Domain.cs @@ -17,7 +17,6 @@ public virtual C C set { c = value; } } - public virtual B B1 { get { return b1; } @@ -30,15 +29,12 @@ public virtual B B2 set { b2 = value; } } - public virtual string Value { get { return this.value; } set { this.value = value; } } - - public virtual int ID { get { return id; } @@ -46,7 +42,6 @@ public virtual int ID } } - public class B { private int id; diff --git a/src/NHibernate.Test/NHSpecificTest/NH1080/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1080/Fixture.cs index 1c9b996fc8d..d8a377cad13 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1080/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1080/Fixture.cs @@ -34,9 +34,6 @@ public void TestBug() c.ID = 1; c.Value = "OneToOne"; - - - A a = new A(); a.ID = 1; a.Value = "Parent"; @@ -51,7 +48,6 @@ public void TestBug() try { - using (ISession s = Sfi.OpenSession()) { s.Save(c); @@ -74,7 +70,6 @@ public void TestBug() { using (ISession s = Sfi.OpenSession()) { - s.Delete(a); s.Delete(b1); s.Delete(c); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1082/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH1082/Domain.cs index 61be19161a7..918dae02539 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1082/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1082/Domain.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.NHSpecificTest.NH1082 { public class C diff --git a/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs index 1f136d907f6..2765656d5a0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1097/Fixture.cs @@ -36,7 +36,6 @@ public void ThrowsExceptionWhenColumnNameIsUsedInQuery() using (var session = this.OpenSession()) using (var tran = session.BeginTransaction()) { - Assert.Throws(delegate { var query = session.CreateQuery("from Person p where p.namecolumn=:nameOfPerson"); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs index a942080b51a..65d07225cfc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1097/Person.cs @@ -8,6 +8,5 @@ public class Person { public virtual int Id { get; set; } public virtual string Name { get; set; } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs index c6b123ac1ef..ae2d5b7f395 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1098/FilterParameterOrderFixture.cs @@ -13,7 +13,6 @@ protected override void OnSetUp() { using (ISession session = OpenSession()) { - var a1 = new A { Id = 1, ValueA = 5, Enabled = false }; session.Save(a1); @@ -231,4 +230,4 @@ public void QueryMapElements() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1159/Contact.cs b/src/NHibernate.Test/NHSpecificTest/NH1159/Contact.cs index 1db50c9744d..10d8457662f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1159/Contact.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1159/Contact.cs @@ -5,7 +5,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1159 [Serializable] public class Contact { - private bool isChanged; private Int64 id; private string forename; @@ -30,7 +29,6 @@ public Contact( this.preferredname = String.Empty; } - #region Public Properties public virtual Int64 Id @@ -41,7 +39,6 @@ public virtual Int64 Id isChanged |= (id != value); id = value; } - } public virtual string Forename @@ -117,7 +114,6 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hash = 57; hash = 27 * hash * id.GetHashCode(); return hash; diff --git a/src/NHibernate.Test/NHSpecificTest/NH1159/ContactTitle.cs b/src/NHibernate.Test/NHSpecificTest/NH1159/ContactTitle.cs index 167b828091e..715bb316c6c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1159/ContactTitle.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1159/ContactTitle.cs @@ -9,7 +9,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1159 [Serializable] public class ContactTitle { - #region Private Members private bool isChanged; @@ -55,7 +54,6 @@ public virtual Int64 Id isChanged |= (id != value); id = value; } - } public virtual IList ContactList @@ -117,7 +115,6 @@ public override bool Equals(object obj) /// public override int GetHashCode() { - int hash = 57; hash = 27 * hash * id.GetHashCode(); return hash; @@ -129,5 +126,4 @@ public override string ToString() return id.ToString() + " " + descr; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1159/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1159/Fixture.cs index 0e54f626526..ba4de3601e4 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1159/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1159/Fixture.cs @@ -9,7 +9,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1159 [TestFixture] public class Fixture:BugTestCase { - protected override void OnSetUp() { using (ISession session = OpenSession()) @@ -20,8 +19,7 @@ protected override void OnSetUp() tran.Commit(); } HibernateInterceptor.CallCount = 0; - - } + } protected override void OnTearDown() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1159/HibernateInterceptor.cs b/src/NHibernate.Test/NHSpecificTest/NH1159/HibernateInterceptor.cs index 54832a10f76..f7243cd29ad 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1159/HibernateInterceptor.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1159/HibernateInterceptor.cs @@ -12,5 +12,4 @@ public override bool OnFlushDirty(object entity, object id, object[] currentStat return false; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs index 98794761131..2f042c58be0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1179/Fixture.cs @@ -56,7 +56,6 @@ public void ApplyFilterExplicitJoin() s.Delete("from RelatedClass"); tx.Commit(); } - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs index e7c71b8f433..6dbbff0517b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1192/Domain.cs @@ -10,8 +10,8 @@ public enum Status Bold=1, Italic=2, Underlined=4 - } + public class ObjectA { public virtual int Id { get; set; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1217/DomainObjects.cs b/src/NHibernate.Test/NHSpecificTest/NH1217/DomainObjects.cs index 5c12d308262..dc5bc9c7da3 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1217/DomainObjects.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1217/DomainObjects.cs @@ -7,7 +7,6 @@ public class DomainBase : IDomainBase { private Int32 _id; - private Int32 _versionNumber; #region IDomainBase Members @@ -18,7 +17,6 @@ public virtual Int32 Id set { _id = value; } } - public virtual Int32 VersionNumber { get { return _versionNumber; } @@ -28,12 +26,10 @@ public virtual Int32 VersionNumber #endregion } - public class Root : DomainBase, IRoot { private String _name; - private IList _nodes; #region IRoot Members @@ -44,7 +40,6 @@ public virtual String Name set { _name = value; } } - public virtual IList Nodes { get @@ -55,7 +50,6 @@ public virtual IList Nodes set { _nodes = value; } } - public virtual INode AddNode(string label) { INode result = new Node(); @@ -97,14 +91,12 @@ public virtual IRoot Root set { _root = value; } } - public virtual String Label { get { return _label; } set { _label = value; } } - public virtual ISet FromEdges { get @@ -115,7 +107,6 @@ public virtual ISet FromEdges set { _fromEdges = value; } } - public virtual ISet ToEdges { get @@ -129,7 +120,6 @@ public virtual ISet ToEdges #endregion } - public class Edge : DomainBase, IEdge { private INode _fromNode; @@ -150,7 +140,6 @@ public virtual INode FromNode set { _fromNode = value; } } - public virtual INode ToNode { get { return _toNode; } @@ -159,4 +148,4 @@ public virtual INode ToNode #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1217/IEdge.cs b/src/NHibernate.Test/NHSpecificTest/NH1217/IEdge.cs index 38a73f8c054..070a9dabd86 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1217/IEdge.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1217/IEdge.cs @@ -1,6 +1,5 @@ using System; - namespace NHibernate.Test.NHSpecificTest.NH1217 { public interface IEdge @@ -11,4 +10,4 @@ public interface IEdge INode ToNode { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1217/IRoot.cs b/src/NHibernate.Test/NHSpecificTest/NH1217/IRoot.cs index 923777604b1..f900261eb57 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1217/IRoot.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1217/IRoot.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; - namespace NHibernate.Test.NHSpecificTest.NH1217 { public interface IRoot @@ -14,4 +13,4 @@ public interface IRoot IEdge AddLink(INode from, INode to, String label); } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1230/Foo.cs b/src/NHibernate.Test/NHSpecificTest/NH1230/Foo.cs index bc6fedd1a42..05fc487fac1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1230/Foo.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1230/Foo.cs @@ -7,7 +7,6 @@ public class Foo public Foo() { - } public Foo(string description) @@ -27,4 +26,4 @@ public int Id get { return id; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1235/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1235/Fixture.cs index 6bf3b5bff71..d41949823bc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1235/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1235/Fixture.cs @@ -59,7 +59,6 @@ public void Test() tx.Commit(); } - using (ISession s = OpenSession()) using (ITransaction tx = s.BeginTransaction()) { @@ -73,6 +72,5 @@ public void Test() tx.Commit(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1252/NH1252Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1252/NH1252Fixture.cs index 85a40cc6c93..17900bc61dc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1252/NH1252Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1252/NH1252Fixture.cs @@ -47,7 +47,6 @@ public void Test() Assert.IsNull(s.Get(savedId)); tx.Commit(); } - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs index 0ee16224bdc..55a6662fb9d 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Home.cs @@ -8,7 +8,6 @@ public class Home public Home() { - } public Home(string city, int zip) @@ -47,5 +46,4 @@ public class Home_Drop : Home { public Home_Drop() { } public Home_Drop(string c public class Home_None : Home {public Home_None() { } public Home_None(string city, int zip) : base(city, zip) { } } public class Home_All : Home {public Home_All() { } public Home_All(string city, int zip) : base(city, zip) { } } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs index 4433f923f47..3cc8b6df1dc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs @@ -103,7 +103,6 @@ private Configuration GetConfiguration() return cfg; } - protected static string MappingsAssembly { get { return "NHibernate.Test"; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Person.cs index d5b346f3712..d93c5c61c5d 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/Person.cs @@ -13,7 +13,6 @@ public class Person public Person() { - } public Person(string name, int iq, int shoeSize) @@ -70,6 +69,5 @@ virtual public Home_Update Home_Update get { return home_update; } set { home_update = value; } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1280/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1280/Person.cs index 70065a6fb88..9f1b58a978b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1280/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1280/Person.cs @@ -1,7 +1,6 @@ using System; using System.Collections; - namespace NHibernate.Test.NHSpecificTest.NH1280 { public class Person @@ -13,7 +12,6 @@ public class Person public Person() { - } public Person(string name, int iq, int shoeSize) @@ -47,4 +45,4 @@ virtual public int ShoeSize set { shoeSize = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_Product.cs b/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_Product.cs index 0c00e21ad90..3f05375242d 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_Product.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_Product.cs @@ -7,7 +7,6 @@ public class Cons_Product : Product { #region Fields - public virtual string ImageName { get; @@ -16,4 +15,4 @@ public virtual string ImageName #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseItem.cs b/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseItem.cs index aced321453a..943a6f04d93 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseItem.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseItem.cs @@ -4,6 +4,5 @@ namespace NHibernate.Test.NHSpecificTest.NH1289 { public class Cons_PurchaseItem : PurchaseItem { - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseOrder.cs b/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseOrder.cs index 35a0214547c..74beb863db5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseOrder.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1289/Cons_PurchaseOrder.cs @@ -2,10 +2,8 @@ namespace NHibernate.Test.NHSpecificTest.NH1289 { - [Serializable] public class Cons_PurchaseOrder : PurchaseOrder { - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs index 4af29e113a5..939729bb25c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1289/Fixture.cs @@ -26,7 +26,6 @@ protected override void OnSetUp() ImageName = "abc" }; - var purchaseItem = new Cons_PurchaseItem { Product = product, @@ -39,9 +38,8 @@ protected override void OnSetUp() tran.Commit(); } - - } + protected override void OnTearDown() { using (var ses = OpenSession()) diff --git a/src/NHibernate.Test/NHSpecificTest/NH1289/Product.cs b/src/NHibernate.Test/NHSpecificTest/NH1289/Product.cs index 90d0ffc3ef6..601a6536a9e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1289/Product.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1289/Product.cs @@ -30,7 +30,6 @@ public virtual String ProductName set; } - public virtual Int32? Units { get; @@ -39,4 +38,4 @@ public virtual Int32? Units #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1289/PurchaseItem.cs b/src/NHibernate.Test/NHSpecificTest/NH1289/PurchaseItem.cs index 595cbc1e9f0..fa2fd548e3c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1289/PurchaseItem.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1289/PurchaseItem.cs @@ -14,18 +14,16 @@ public virtual Int32 Id #endregion - public virtual PurchaseOrder PurchaseOrder { get; set; } - public virtual Product Product { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1290/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1290/Fixture.cs index 6a3b3bfca50..5c4b27cd496 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1290/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1290/Fixture.cs @@ -9,7 +9,6 @@ public class Fixture [Test] public void ExposeBug() { - string hbm = @" SivasKangalsGeneric { get; set; } public virtual IList CatsGeneric { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithAnimals.cs b/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithAnimals.cs index 375d7654bb9..830d54e15d5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithAnimals.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1391/PersonWithAnimals.cs @@ -9,8 +9,6 @@ public class PersonWithAnimals:Person { public PersonWithAnimals() { - } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1399/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1399/Fixture.cs index 7336e54ab9c..d84f267527c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1399/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1399/Fixture.cs @@ -31,7 +31,6 @@ public void UsingTwoInstancesWithSameValuesTheFkNameIsTheSame() string t1Fk = table1.UniqueColumnString(new object[] { table1ITestManyA }, "BluewireTechnologies.Core.Framework.DynamicTypes2.Albatross.ITestManyA"); string t2Fk = table1.UniqueColumnString(new object[] { table1ITestManyB }, "BluewireTechnologies.Core.Framework.DynamicTypes2.Albatross.ITestManyB"); - Table table1_ = new Table("ATABLE"); Column table1ITestManyA_ = new Column("itestmanyaid"); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs index 7613aa9cfdd..3422c1c39cd 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1443/Fixture.cs @@ -15,14 +15,12 @@ private static void Bug(Configuration cfg) su.Execute(x => sb.AppendLine(x), false, false); string script = sb.ToString(); - if (Dialect.Dialect.GetDialect(cfg.Properties).SupportsIfExistsBeforeTableName) Assert.That(script, Does.Match("drop table if exists nhibernate.dbo.Aclass")); else Assert.That(script, Does.Match("drop table nhibernate.dbo.Aclass")); Assert.That(script, Does.Match("create ((column|row) )?table nhibernate.dbo.Aclass")); - } [Test] diff --git a/src/NHibernate.Test/NHSpecificTest/NH1447/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1447/Person.cs index 3e48d5ff54b..d055ff194a2 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1447/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1447/Person.cs @@ -9,7 +9,6 @@ public class Person { public Person() { - } public Person(string name, bool wantsNewsLetter) @@ -33,7 +32,5 @@ public virtual bool WantsNewsletter get; set; } - } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs index 3979944f878..e975bd76fed 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1464/Fixture.cs @@ -14,14 +14,12 @@ public class CPPMimicBase { public virtual void Dispose() { - } } public class CPPMimic : CPPMimicBase { public sealed override void Dispose() { - } } @@ -29,7 +27,6 @@ public class Another: IDisposable { protected void Dispose(bool disposing) { - } public void Dispose() @@ -38,7 +35,6 @@ public void Dispose() ~Another() { - } } @@ -46,7 +42,6 @@ public class OneMore : IDisposable { public void Dispose(bool disposing) { - } public void Dispose() @@ -55,7 +50,6 @@ public void Dispose() ~OneMore() { - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1478/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1478/Fixture.cs index 6a49c034baa..2534e2b3416 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1478/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1478/Fixture.cs @@ -42,13 +42,10 @@ public void TestIfColonInStringIsNotInterpretedAsParameterInSQL() { using (ISession session=OpenSession()) { - - IList lst = session.CreateSQLQuery("select Biography from Person where Biography='Born in Istanbul :Turkey'") .AddScalar("Biography", NHibernateUtil.String).List(); Assert.AreEqual(1,lst.Count); } - } [Test] @@ -56,14 +53,10 @@ public void TestIfColonInStringIsNotInterpretedAsParameterInHQL() { using (ISession session = OpenSession()) { - - IList lst = session.CreateSQLQuery("select p.Biography from Person p where p.Biography='Born in Istanbul :Turkey'") .List(); Assert.AreEqual(1, lst.Count); } - } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1478/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1478/Person.cs index d3929838a73..c41a1fef390 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1478/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1478/Person.cs @@ -8,7 +8,6 @@ public class Person { public Person() { - } public Person(string name, string bio) @@ -33,6 +32,5 @@ public virtual string Biography get; set; } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs index a42b02aad54..4458ee19c90 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs @@ -22,7 +22,6 @@ public class Entity [TestFixture] public class Fixture { - public Configuration GetConf() { var cfg = new Configuration(); @@ -209,6 +208,5 @@ public void GenerateSchemaUniqueOnId() new SchemaExport(cfg).Drop(false, true); } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1495/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1495/Fixture.cs index ec68596a5f1..849f541fb39 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1495/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1495/Fixture.cs @@ -37,6 +37,5 @@ public void CreateTest() } } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1495/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1495/Person.cs index 752d083d13d..553d1f0e97a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1495/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1495/Person.cs @@ -2,7 +2,7 @@ { public interface IPerson { - object Id { get;} + object Id { get; } string Name { get; set; } } @@ -12,4 +12,4 @@ public class Person : IPerson public string Name { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs index e00c7314c26..326cc1dd6c2 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs @@ -58,7 +58,5 @@ public void CheckIfDetachedCriteriaCanBeUsedOnPropertyRestriction() Assert.Throws(() => criteria.List()); } } - - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs index d7e3fd87bb6..894e93157be 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.NHSpecificTest.NH1502 { public class Person @@ -42,6 +41,5 @@ public virtual int ShoeSize get { return shoeSize; } set { shoeSize = value; } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs index 302f6e57063..bfc3e0ede3f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1508/Fixture.cs @@ -104,7 +104,6 @@ public void DoesntThrowsExceptionWhenNamedSqlQueryIsGiven() using (var session = OpenSession()) using (session.BeginTransaction()) { - var multiquery = session.CreateMultiQuery(); Assert.That(() => multiquery.AddNamedQuery("SampleSqlQuery"), Throws.Nothing); } @@ -116,7 +115,6 @@ public void DoesntThrowsExceptionWhenNamedSqlQueryIsGivenToQueryBatch() using (var session = OpenSession()) using (session.BeginTransaction()) { - var multiquery = session.CreateQueryBatch(); var q = session.GetNamedQuery("SampleSqlQuery"); Assert.That(() => multiquery.Add(q), Throws.Nothing); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs index 5af03aca8ac..c2f39162d85 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.NHSpecificTest.NH1533 +namespace NHibernate.Test.NHSpecificTest.NH1533 { public class Person { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1549/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1549/Fixture.cs index 0393603e0bd..07a4f306ad0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1549/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1549/Fixture.cs @@ -78,7 +78,6 @@ public void CanLoadForEntitiesWithTheirOwnIds() protected override void OnTearDown() { using (ISession session = OpenSession()) { - using (ITransaction trans = session.BeginTransaction()) { session.Delete("from ProductWithId"); @@ -90,4 +89,4 @@ protected override void OnTearDown() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs index b00b233ea2d..a5eb55a5240 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1552/Fixture.cs @@ -83,7 +83,6 @@ public void Paging_with_sql_works_as_expected_with_MaxResult() } } - [Test] public void Paging_with_sql_works_as_expected_with_FirstResultMaxResult() { @@ -103,4 +102,4 @@ public void Paging_with_sql_works_as_expected_with_FirstResultMaxResult() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1574/Principal.cs b/src/NHibernate.Test/NHSpecificTest/NH1574/Principal.cs index 476e5a825b8..74f08e7f03c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1574/Principal.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1574/Principal.cs @@ -280,4 +280,4 @@ public virtual SpecializedTeamStorage Team set { team = value; } } } ; -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedPrincipal.cs b/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedPrincipal.cs index 5c27cd3f804..40ae8b8e306 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedPrincipal.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedPrincipal.cs @@ -1,4 +1,4 @@ namespace NHibernate.Test.NHSpecificTest.NH1574 { public class SpecializedPrincipal : Principal {} ; -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedTeaml.cs b/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedTeaml.cs index ffdf15b9f76..08381537f56 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedTeaml.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1574/SpecializedTeaml.cs @@ -1,4 +1,4 @@ namespace NHibernate.Test.NHSpecificTest.NH1574 { public class SpecializedTeamStorage : TeamStorage {} ; -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1574/Team.cs b/src/NHibernate.Test/NHSpecificTest/NH1574/Team.cs index 8fd51feb6d1..8f94362937f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1574/Team.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1574/Team.cs @@ -131,4 +131,4 @@ public virtual int Id set { id = value; } } } ; -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs b/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs index ef376f1b1ed..d0df080b3a0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1579/Fruit.cs @@ -18,6 +18,5 @@ protected Fruit() } public Entity Container { get; private set; } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture1.cs b/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture1.cs index c7077c576d7..31413b3c873 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture1.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture1.cs @@ -94,7 +94,6 @@ public ProjectWithOneList SaveProject( ) return project; } - public ProjectWithOneList LoadProject() { ProjectWithOneList project; @@ -113,7 +112,6 @@ public ProjectWithOneList LoadProject() public void RefreshProject(ProjectWithOneList project) { - using (ISession session = OpenSession()) using (ITransaction tx = session.BeginTransaction()) { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture2.cs b/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture2.cs index dd860d3d778..329bc4eb52f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture2.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1601/Fixture2.cs @@ -51,7 +51,6 @@ public void TestRefreshWithThreeCounts() SaveLoadAndRefreshProject(); } - /// /// Create and save a Project /// @@ -71,7 +70,6 @@ public void SaveLoadAndRefreshProject() RefreshProject(project); } - public Project SaveProject( ) { Project project; @@ -85,13 +83,11 @@ public Project SaveProject( ) Scenario scenario2 = new Scenario(); Scenario scenario3 = new Scenario(); - //Add the scenario to all lists project.ScenarioList1.Add(scenario1); project.ScenarioList2.Add(scenario2); project.ScenarioList3.Add(scenario3); - //Set the primary key on the project project.Name = "Test"; @@ -103,7 +99,6 @@ public Project SaveProject( ) return project; } - public Project LoadProject() { Project project; @@ -122,7 +117,6 @@ public Project LoadProject() public void RefreshProject(Project project) { - using (ISession session = OpenSession()) using (ITransaction tx = session.BeginTransaction()) { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs b/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs index 3db39a0ca04..573cb994607 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs @@ -21,19 +21,21 @@ public IList ScenarioList1 set { scenarioList1 = value; if (TestAccessToList) - { int i = scenarioList1.Count;} - } - } - - public IList ScenarioList2 - { - get { return scenarioList2; } - set { scenarioList2 = value; - int i = scenarioList2.Count; + { int i = scenarioList1.Count; } } } - public IList ScenarioList3 + public IList ScenarioList2 + { + get { return scenarioList2; } + set + { + scenarioList2 = value; + int i = scenarioList2.Count; + } + } + + public IList ScenarioList3 { get { return scenarioList3; } set @@ -49,19 +51,18 @@ public Project( ) private string name; - public string Name - { - get { return name; } - set { name = value;} - } + public string Name + { + get { return name; } + set { name = value; } + } - private IList scenarioList1 = new List(); + private IList scenarioList1 = new List(); private IList scenarioList2 = new List(); private IList scenarioList3 = new List(); + } - - } - public class ProjectWithOneList + public class ProjectWithOneList { public static bool TestAccessToList = false; @@ -94,6 +95,5 @@ public string Name } private IList scenarioList1 = new List(); - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1601/Scenario.cs b/src/NHibernate.Test/NHSpecificTest/NH1601/Scenario.cs index 3888ebdc903..3d949edf824 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1601/Scenario.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1601/Scenario.cs @@ -4,24 +4,18 @@ namespace NHibernate.Test.NHSpecificTest.NH1601 { - public class Scenario { - protected int _id; - public virtual int id { get { return _id; } set { _id = value; } } - public Scenario( ) { } - - } - + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Adjunct.cs b/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Adjunct.cs index 38aefcaec63..3b170bf382c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Adjunct.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Adjunct.cs @@ -7,7 +7,6 @@ public class Adjunct public Adjunct() { - } virtual public int ID @@ -45,4 +44,4 @@ public override int GetHashCode() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs index c04a1341da0..fef57ed31b3 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/NH1611OneToOneIdentityFixture.cs @@ -40,7 +40,6 @@ protected override void OnSetUp() } } - [Test] public void CanQueryOneToOneWithCompositeId() { @@ -52,10 +51,8 @@ public void CanQueryOneToOneWithCompositeId() IList list = criteria.List(); Assert.AreEqual("blarg", list[0].Description); Assert.AreEqual("nuts", list[0].Adjunct.AdjunctDescription); - } } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Primary.cs b/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Primary.cs index fb0c5f50621..ccc46bfeede 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Primary.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1611OneToOneIdentity/Primary.cs @@ -8,7 +8,6 @@ public class Primary public Primary() { - } virtual public int ID @@ -17,7 +16,6 @@ virtual public int ID set { id = value; } } - virtual public string Description { get { return description; } @@ -53,4 +51,4 @@ public override int GetHashCode() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs index 61d5b603a63..e4dbf790c3f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1632/Fixture.cs @@ -71,7 +71,6 @@ public void Dispose_session_inside_transaction_scope() { using (s = Sfi.OpenSession()) { - } tx.Complete(); } @@ -79,7 +78,6 @@ public void Dispose_session_inside_transaction_scope() Assert.IsFalse(s.IsOpen); } - [Test] public void When_commiting_items_in_DTC_transaction_will_add_items_to_2nd_level_cache() { @@ -93,7 +91,6 @@ public void When_commiting_items_in_DTC_transaction_will_add_items_to_2nd_level_ } try { - using (var tx = new TransactionScope()) { using (var s = OpenSession()) @@ -194,7 +191,6 @@ public void When_using_two_sessions_with_explicit_flush() using (ISession s1 = Sfi.OpenSession()) using (ISession s2 = Sfi.OpenSession()) { - id1 = s1.Save(new Nums { NumA = 1, NumB = 2, ID = 5 }); s1.Flush(); @@ -234,7 +230,6 @@ public void When_using_two_sessions() using (ISession s1 = Sfi.OpenSession()) using (ISession s2 = Sfi.OpenSession()) { - id1 = s1.Save(new Nums { NumA = 1, NumB = 2, ID = 5 }); id2 = s2.Save(new Nums { NumA = 1, NumB = 2, ID = 6 }); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1643/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1643/Fixture.cs index 19f6a0e3a27..d0b0a431458 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1643/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1643/Fixture.cs @@ -42,8 +42,6 @@ public void Test() tx.Commit(); } - - using (ISession sess = OpenSession()) using (ITransaction tx = sess.BeginTransaction()) { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs index ab00447a705..d6c1ab1d409 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs @@ -1,6 +1,4 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH1689 +namespace NHibernate.Test.NHSpecificTest.NH1689 { using System.Collections.Generic; diff --git a/src/NHibernate.Test/NHSpecificTest/NH1689/SampleTest.cs b/src/NHibernate.Test/NHSpecificTest/NH1689/SampleTest.cs index 721bd80aeff..04c35216853 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1689/SampleTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1689/SampleTest.cs @@ -43,5 +43,4 @@ public void ShouldBeAbleToCallGenericMethod() } } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs index 52b49f3048c..aec13abcc00 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1693/Fixture.cs @@ -70,6 +70,5 @@ public void with_filter() tx.Commit(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs index fbf713c63b1..4378ee170b6 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs @@ -1,22 +1,20 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH1714 +namespace NHibernate.Test.NHSpecificTest.NH1714 { - public class DomainClass - { - private byte[] byteData; - private int id; + public class DomainClass + { + private byte[] byteData; + private int id; - public int Id - { - get { return id; } - set { id = value; } - } + public int Id + { + get { return id; } + set { id = value; } + } - public byte[] ByteData - { - get { return byteData; } - set { byteData = value; } - } - } -} \ No newline at end of file + public byte[] ByteData + { + get { return byteData; } + set { byteData = value; } + } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1727/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1727/Fixture.cs index 4cd4be029a4..9f0a02475c7 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1727/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1727/Fixture.cs @@ -13,7 +13,6 @@ public class Fixture : BugTestCase * The second test passes where I've just switched the order in the where clause */ - [Test] public void VerifyFilterAndInAndProperty_DoesNotWorkToday() { @@ -37,7 +36,6 @@ where a.Value in (:aValues) } } - [Test] public void VerifyFilterAndInAndProperty_WorksToday() { @@ -71,6 +69,5 @@ protected override void OnTearDown() t.Commit(); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1727/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1727/Model.cs index b657c8a77d4..9d1d96efef1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1727/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1727/Model.cs @@ -9,11 +9,11 @@ public class ClassA public virtual IList BCollection { get; set; } public virtual string Name { get; set; } public virtual int Value { get; set; } - public virtual ClassB B {get;set;} + public virtual ClassB B { get; set; } } public class ClassB { public virtual Guid Id { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1747/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1747/Fixture.cs index 9e0ef628412..7f6d0206a31 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1747/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1747/Fixture.cs @@ -53,5 +53,4 @@ public void TraversingBagToJoinChildElementShouldWork() } } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1756/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH1756/Domain.cs index 0c3ac8abbaa..eb23300ee3e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1756/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1756/Domain.cs @@ -1,10 +1,8 @@ - using System; using System.Collections.Generic; namespace NHibernate.Test.NHSpecificTest.NH1756 { - public class Book { private DateTime _version; @@ -39,5 +37,4 @@ public virtual DateTime Version public virtual string Name { get; set; } public virtual IList Pages { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1761/FixtureByCode.cs b/src/NHibernate.Test/NHSpecificTest/NH1761/FixtureByCode.cs index f153236e941..b521244cb61 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1761/FixtureByCode.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1761/FixtureByCode.cs @@ -19,7 +19,6 @@ protected override HbmMapping GetMappings() rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb)); rc.Property(x => x.Name); rc.Bag(x => x.FundingPrograms, m => {}, r => r.OneToMany()); - }); mapper.Class(rc => { @@ -74,7 +73,6 @@ public class FundingCategory public virtual Guid Id { get; set; } public virtual string Name { get; set; } public virtual IList FundingPrograms { get; set; } = new List(); - } public class FundingProgram diff --git a/src/NHibernate.Test/NHSpecificTest/NH1775/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH1775/Domain.cs index 3b69f4234e7..42372ef0d5b 100755 --- a/src/NHibernate.Test/NHSpecificTest/NH1775/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1775/Domain.cs @@ -6,7 +6,7 @@ namespace NHibernate.Test.NHSpecificTest.NH1775 { public class Member { - public virtual int Id { get; set;} + public virtual int Id { get; set; } public virtual string FirstName { get; set; } public virtual string LastName { get; set; } public virtual int Roles { get; set; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1788/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1788/Fixture.cs index 28443f0d991..deb2aa1637c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1788/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1788/Fixture.cs @@ -26,7 +26,6 @@ public void CanUseSqlTimestampWithDynamicInsert() tx.Commit(); } - using (var session = OpenSession()) using (var tx = session.BeginTransaction()) { @@ -35,14 +34,12 @@ public void CanUseSqlTimestampWithDynamicInsert() tx.Commit(); } - using (ISession session = OpenSession()) using (var tx = session.BeginTransaction()) { session.Delete(session.Get(1)); tx.Commit(); } - } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1810/Children.cs b/src/NHibernate.Test/NHSpecificTest/NH1810/Children.cs index 89fed8e2faf..797eda30dd5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1810/Children.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1810/Children.cs @@ -52,7 +52,6 @@ public Children(ICollection initialValues) : base(initialValues) behaviour = new ChildrenBehaviour(this); } - public Children(ICollection initialValues, IComparer comparer) : base(initialValues, comparer) { behaviour = new ChildrenBehaviour(this); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1812/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1812/Model.cs index d97cf88dd17..ed798fc6e7b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1812/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1812/Model.cs @@ -5,10 +5,10 @@ namespace NHibernate.Test.NHSpecificTest.NH1812 { public class Person { - public virtual int Id {get; set;} + public virtual int Id {get; set; } public virtual IList PeriodCollection { get; set; } - public Person(){PeriodCollection=new List();} + public Person(){PeriodCollection=new List(); } } public class Period @@ -16,4 +16,4 @@ public class Period public virtual int Id { get; set; } public virtual DateTime? Start { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs index 34ca1c11a9f..1770a4ff7a1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs @@ -1,6 +1,4 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH1818 +namespace NHibernate.Test.NHSpecificTest.NH1818 { public class DomainClass { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1818/Fixture1818.cs b/src/NHibernate.Test/NHSpecificTest/NH1818/Fixture1818.cs index c39f2cc90d4..7e907958fe6 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1818/Fixture1818.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1818/Fixture1818.cs @@ -32,7 +32,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect) return dialect as PostgreSQL82Dialect != null; } - [Test] [Description("Test HQL query on a property mapped with a formula.")] public void ComputedPropertyShouldRetrieveDataCorrectly() @@ -44,4 +43,4 @@ public void ComputedPropertyShouldRetrieveDataCorrectly() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1837/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1837/Fixture.cs index cbc62aa67ff..c2cd487ba5f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1837/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1837/Fixture.cs @@ -37,7 +37,6 @@ protected override void OnTearDown() [Test] public void ExecutesOneQueryWithUniqueResultWithChildCriteriaNonGeneric() { - Sfi.Statistics.Clear(); using (ISession session = this.OpenSession()) { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1845/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1845/Fixture.cs index a838b17644b..86bb764f03d 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1845/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1845/Fixture.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1845 [TestFixture] public class Fixture : TestCaseMappingByCode { - protected override HbmMapping GetMappings() { var mapper = new ModelMapper(); diff --git a/src/NHibernate.Test/NHSpecificTest/NH1863/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH1863/Domain.cs index 527d28068d8..75e8afc1870 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1863/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1863/Domain.cs @@ -23,5 +23,4 @@ public class Category public virtual bool IsActive { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1863/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1863/Fixture.cs index 024258ad46b..2c5d4651d9b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1863/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1863/Fixture.cs @@ -55,7 +55,6 @@ public void CanGetCustomerWithCategoryWhenFilterIsEnabled() Assert.That(hasCategoryResult.Count, Is.EqualTo(1)); } - } [Test] @@ -87,7 +86,6 @@ public void CanGetCustomerWithNoCategoryWhenFilterIsEnabled() Assert.That(hasNoCategoryResult.Count, Is.EqualTo(1)); } - } [Test] @@ -103,7 +101,6 @@ public void CanGetCustomerWithNoCategoryWhenFilterIsDisabled() Assert.That(hasNoCategoryResult.Count, Is.EqualTo(1)); } - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs index d945015788e..315e10da519 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs @@ -1,33 +1,35 @@ - - -using System.Collections; +using System.Collections; using System.Collections.Generic; + namespace NHibernate.Test.NHSpecificTest.NH1899 { - public class Parent - { - private int id; - private IDictionary _relations; + public class Parent + { + private int id; + private IDictionary _relations; - public int Id - { - get { return id; } - set { id = value; } - } + public int Id + { + get { return id; } + set { id = value; } + } - public IDictionary Relations { - get { return _relations; } - set { _relations = value; } - } - } + public IDictionary Relations + { + get { return _relations; } + set { _relations = value; } + } + } - public enum Key { - One, - Two - } + public enum Key + { + One, + Two + } - public enum Value { - ValOne, - ValTwo - } -} \ No newline at end of file + public enum Value + { + ValOne, + ValTwo + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1905/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1905/Model.cs index f8451af6d82..266df0d0f40 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1905/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1905/Model.cs @@ -21,7 +21,6 @@ public virtual ISet Els } } - public class Det { private int _Id; @@ -57,4 +56,4 @@ public virtual string Descr set { _Descr = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1907/MyType.cs b/src/NHibernate.Test/NHSpecificTest/NH1907/MyType.cs index c99c8f52a57..6da80a0ad27 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1907/MyType.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1907/MyType.cs @@ -30,7 +30,6 @@ public class SimpleCustomType : IUserType { private static readonly SqlType[] ReturnSqlTypes = { SqlTypeFactory.Int32 }; - #region IUserType Members public new bool Equals(object x, object y) @@ -112,5 +111,4 @@ public object Disassemble(object value) #endregion } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1908/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1908/Fixture.cs index 3cd9194d95a..1d9e7bd3792 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1908/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1908/Fixture.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1908 [TestFixture] public class Fixture : BugTestCase { - [Test] public void QueryPropertyInBothFilterAndQuery() { @@ -58,4 +57,4 @@ Invoice inv } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH1908ThreadSafety/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1908ThreadSafety/Model.cs index 5961247fedf..3fd8e2693da 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1908ThreadSafety/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1908ThreadSafety/Model.cs @@ -6,7 +6,7 @@ namespace NHibernate.Test.NHSpecificTest.NH1908ThreadSafety public class Order { public virtual long Id { get; set; } - public virtual IList ActiveOrderLines { get; set;} + public virtual IList ActiveOrderLines { get; set; } public virtual string Email { get; set; } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1911/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1911/Fixture.cs index 559fad9bca9..136330c4b31 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1911/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1911/Fixture.cs @@ -5,11 +5,9 @@ namespace NHibernate.Test.NHSpecificTest.NH1911 { - [TestFixture] public class Fixture : BugTestCase { - protected override void OnSetUp() { base.OnSetUp(); @@ -59,7 +57,5 @@ public void ConditionalAggregateProjection() Assert.That(actual[0][1], Is.EqualTo(2)); } } - } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1911/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1911/Model.cs index 4f9ba89e963..8014b1af2d8 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1911/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1911/Model.cs @@ -9,12 +9,10 @@ namespace NHibernate.Test.NHSpecificTest.NH1911 { - public class LogEvent { public virtual int Id { get; set; } public virtual string Name { get; set; } public virtual string Level { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1920/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1920/Fixture.cs index ccdd3cbf9cd..5e82dbb2d5a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1920/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1920/Fixture.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1920 [TestFixture] public class Fixture : BugTestCase { - [Test] public void Can_Query_Without_Collection_Size_Condition() { @@ -66,6 +65,5 @@ public void Can_Query_With_Collection_Size_Condition() tx.Commit(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1920/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1920/Model.cs index 3ba4d1b8ce5..1c35870df39 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1920/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1920/Model.cs @@ -9,7 +9,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1920 { - public class Customer { public virtual int Id { get; set; } @@ -24,5 +23,4 @@ public class Order public virtual string Memo { get; set; } public virtual Customer Customer { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1922/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1922/Fixture.cs index 7c8cf920aa6..6ede2701c51 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1922/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1922/Fixture.cs @@ -35,7 +35,6 @@ protected override void OnTearDown() base.OnTearDown(); } - [Test] public void CanExecuteQueryOnStatelessSessionUsingDetachedCriteria() { @@ -50,7 +49,5 @@ public void CanExecuteQueryOnStatelessSessionUsingDetachedCriteria() Assert.IsNotNull(cust); } } - - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1927/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1927/Fixture.cs index 0dcfdfac490..9c333fcb129 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1927/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1927/Fixture.cs @@ -60,8 +60,7 @@ private void TestQuery(QueryFactoryFunc queryFactoryFunc) Assert.That(queryFactoryFunc(session), Is.Not.Null, "failed with filter on"); tx.Commit(); } - - } + } [Test] public void CriteriaWithEagerFetch() diff --git a/src/NHibernate.Test/NHSpecificTest/NH1938/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1938/Fixture.cs index 1214cc71bf5..998e3570da7 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1938/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1938/Fixture.cs @@ -8,7 +8,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1938 [TestFixture] public class Fixture : BugTestCase { - protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) { // Database needs to be case-sensitive @@ -48,6 +47,5 @@ public void Can_Query_By_Example_Case_Insensitive() t.Rollback(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1938/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH1938/Model.cs index a4d3cfcdcb0..7e1169d129d 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1938/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1938/Model.cs @@ -9,11 +9,9 @@ namespace NHibernate.Test.NHSpecificTest.NH1938 { - public class Person { public virtual int Id { get; set; } public virtual string Name { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1939/AuxType.cs b/src/NHibernate.Test/NHSpecificTest/NH1939/AuxType.cs index 382568bdb2b..9da9e914c8f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1939/AuxType.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1939/AuxType.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1939 { public class AuxType : AbstractAuxiliaryDatabaseObject { - override public string SqlCreateString(Dialect.Dialect dialect, IMapping p, string defaultCatalog, string defaultSchema) { return "select '" + Parameters["scriptParameter"] + "'"; @@ -17,6 +16,5 @@ override public string SqlDropString(Dialect.Dialect dialect, string defaultCata { return "select 'drop script'"; } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1939/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1939/Fixture.cs index ab34367fc3a..ca334649cea 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1939/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1939/Fixture.cs @@ -10,7 +10,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1939 [TestFixture] public class Fixture : BugTestCase { - private StringBuilder schemaBuilder; private void AddString(string sqlString) @@ -23,7 +22,6 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) return (dialect is Dialect.MsSql2000Dialect); } - [Test] public void Can_Parameterise_Auxiliary_Database_Objects() { @@ -40,6 +38,5 @@ public void Can_Parameterise_Auxiliary_Database_Objects() Assert.That(schema.Contains("select 'create script'"), Is.True, "parameterised schema create script not exported"); } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH1948/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1948/Fixture.cs index d6abd924f4d..ceb9110be14 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1948/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1948/Fixture.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1948 [TestFixture] public class Fixture : BugTestCase { - [Test] public void CanUseDecimalScaleZero() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH1959/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1959/Fixture.cs index df45ad7a4a4..dc367d80780 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1959/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1959/Fixture.cs @@ -5,7 +5,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1959 [TestFixture] public class Fixture : BugTestCase { - protected override void OnTearDown() { using (ISession s = OpenSession()) diff --git a/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs index 37a7f403108..ff6f279aa96 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs @@ -1,22 +1,20 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH1963 +namespace NHibernate.Test.NHSpecificTest.NH1963 { - public class DomainClass - { - private byte[] byteData; - private int id; + public class DomainClass + { + private byte[] byteData; + private int id; - public int Id - { - get { return id; } - set { id = value; } - } + public int Id + { + get { return id; } + set { id = value; } + } - public byte[] ByteData - { - get { return byteData; } - set { byteData = value; } - } - } -} \ No newline at end of file + public byte[] ByteData + { + get { return byteData; } + set { byteData = value; } + } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2030/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2030/Fixture.cs index 33cffb0db30..dba4873091e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2030/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2030/Fixture.cs @@ -12,7 +12,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2030 [TestFixture] public class Fixture { - [Test] public void GetTypeWithLenShouldBeThreadSafe() { @@ -60,7 +59,6 @@ public void GetTypeWithLenShouldBeThreadSafe() throw exceptions[0]; } - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2031/HqlModFuctionForMsSqlTest.cs b/src/NHibernate.Test/NHSpecificTest/NH2031/HqlModFuctionForMsSqlTest.cs index 6fb2ab5f0cb..93f45581b30 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2031/HqlModFuctionForMsSqlTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2031/HqlModFuctionForMsSqlTest.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2031 { public class MyClass { - } [TestFixture] diff --git a/src/NHibernate.Test/NHSpecificTest/NH2037/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2037/Fixture.cs index 80065a2d8c7..254f42ae04e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2037/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2037/Fixture.cs @@ -1,13 +1,14 @@ - using NUnit.Framework; +using NUnit.Framework; + namespace NHibernate.Test.NHSpecificTest.NH2037 { - [TestFixture] - public class Fixture : BugTestCase + [TestFixture] + public class Fixture : BugTestCase { - [Test] - public void Test() - { - var country = new Country {Name = "Argentina"}; + [Test] + public void Test() + { + var country = new Country { Name = "Argentina" }; var city = new City { @@ -16,41 +17,40 @@ public void Test() Name = "Cordoba" }; - + using (ISession session = OpenSession()) - using(var tx = session.BeginTransaction()) + using (var tx = session.BeginTransaction()) { session.Save(city.Country); session.Save(city); tx.Commit(); - } - - using(ISession session = OpenSession()) + } + + using (ISession session = OpenSession()) using (var tx = session.BeginTransaction()) - { + { //THROW session.SaveOrUpdate(city); tx.Commit(); - } - + } + using (var session = OpenSession()) using (var tx = session.BeginTransaction()) - { + { Assert.IsNotNull(session.Get(city.Id)); tx.Commit(); - } + } } - + protected override void OnTearDown() { - using(var session = OpenSession()) - using(var tx = session.BeginTransaction()) - { + using (var session = OpenSession()) + using (var tx = session.BeginTransaction()) + { session.Delete("from City"); session.Delete("from Country"); tx.Commit(); } } - - } - } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs index c49b336adfe..8b39bece628 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs @@ -1,22 +1,20 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH2044 +namespace NHibernate.Test.NHSpecificTest.NH2044 { - public class DomainClass - { - private char symbol; - private int id; + public class DomainClass + { + private char symbol; + private int id; - public int Id - { - get { return id; } - set { id = value; } - } + public int Id + { + get { return id; } + set { id = value; } + } - public char Symbol - { - get { return symbol; } - set { symbol = value; } - } - } -} \ No newline at end of file + public char Symbol + { + get { return symbol; } + set { symbol = value; } + } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2044/SampleTest.cs b/src/NHibernate.Test/NHSpecificTest/NH2044/SampleTest.cs index 56c226c6dbc..5f572304727 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2044/SampleTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2044/SampleTest.cs @@ -34,7 +34,6 @@ protected override void OnTearDown() } } - [Test] public void IgnoreCaseShouldWorkWithCharCorrectly() { @@ -45,8 +44,7 @@ public void IgnoreCaseShouldWorkWithCharCorrectly() IList list = criteria.List(); Assert.AreEqual(1, list.Count); - - } + } } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2049/Fixture2049.cs b/src/NHibernate.Test/NHSpecificTest/NH2049/Fixture2049.cs index b82cd03450f..9d0e4ed7a20 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2049/Fixture2049.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2049/Fixture2049.cs @@ -26,7 +26,6 @@ protected override void OnSetUp() } } - protected override void OnTearDown() { base.OnTearDown(); @@ -37,7 +36,6 @@ protected override void OnTearDown() } } - [Test] [KnownBug("Known bug NH-2049.")] public void CanCriteriaQueryWithFilterOnJoinClassBaseClassProperty() @@ -55,7 +53,6 @@ public void CanCriteriaQueryWithFilterOnJoinClassBaseClassProperty() } } - [Test] [KnownBug("Known bug NH-2049.", "NHibernate.Exceptions.GenericADOException")] public void CanHqlQueryWithFilterOnJoinClassBaseClassProperty() diff --git a/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs index a85eeb97883..234b581d2da 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs @@ -1,6 +1,4 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH2049 +namespace NHibernate.Test.NHSpecificTest.NH2049 { public abstract class Customer { @@ -20,4 +18,4 @@ public class Person public IndividualCustomer IndividualCustomer { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2053/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2053/Fixture.cs index 76beb7b6f87..8e6b199f602 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2053/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2053/Fixture.cs @@ -76,6 +76,5 @@ public void JoinedSubClass_Filter() } } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs b/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs index 876526d4284..ee1884a7321 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2055/AuxType.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2055 { public class AuxType : AbstractAuxiliaryDatabaseObject { - override public string SqlCreateString(Dialect.Dialect dialect, IMapping p, string defaultCatalog, string defaultSchema) { return "select '" + Parameters["scriptParameter"] + "'"; @@ -17,6 +16,5 @@ override public string SqlDropString(Dialect.Dialect dialect, string defaultCata { return "select 'drop script'"; } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs index 5b9e70153ba..54ed1c463ea 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2055/Fixture.cs @@ -41,6 +41,5 @@ public void CanCreateAndDropSchema() } } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2057/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2057/Model.cs index db053f5cda5..1ad448190f1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2057/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2057/Model.cs @@ -9,11 +9,9 @@ namespace NHibernate.Test.NHSpecificTest.NH2057 { - public class Person { public virtual int Id { get; set; } public virtual string Name { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2065/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2065/Fixture.cs index 0cbadaddc52..901972f4da7 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2065/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2065/Fixture.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using NUnit.Framework; - namespace NHibernate.Test.NHSpecificTest.NH2065 { [TestFixture] @@ -62,6 +61,5 @@ public void GetGoodErrorForDirtyReassociatedCollection() "reassociated object has dirty collection: NHibernate.Test.NHSpecificTest.NH2065.Person.Children")); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2065/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2065/Model.cs index f2eda8b05cf..30f0d1b6533 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2065/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2065/Model.cs @@ -8,5 +8,4 @@ public class Person public virtual string Name { get; set; } public virtual ICollection Children { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2069/ITest.cs b/src/NHibernate.Test/NHSpecificTest/NH2069/ITest.cs index ab208703125..9c6852ac204 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2069/ITest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2069/ITest.cs @@ -4,7 +4,7 @@ namespace NHibernate.Test.NHSpecificTest.NH2069 { public interface ITest : ITestBase { - string Description { get; set;} + string Description { get; set; } ITest2 Category { get; set; } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2074/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2074/Fixture.cs index 680cf9e69c6..6caf31cd829 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2074/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2074/Fixture.cs @@ -6,7 +6,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2074 [TestFixture] public class Fixture : BugTestCase { - protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) { return dialect is MsSql2000Dialect; @@ -20,6 +19,5 @@ public void CanQueryOnPropertyUsingUnicodeToken() s.CreateQuery("from Person").List(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2074/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2074/Model.cs index dd770dd2a9b..70e3e109521 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2074/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2074/Model.cs @@ -8,5 +8,4 @@ public class Person public virtual string Name { get; set; } public virtual int CalculatedProperty { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs index 386d16c650e..8dc46f49761 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs @@ -11,7 +11,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2077 [TestFixture] public class Fixture : BugTestCase { - protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect) { return dialect is MsSql2000Dialect; @@ -33,6 +32,5 @@ public void CanExecuteMultipleQueriesUsingNativeSQL() .ExecuteUpdate(); } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs index fd6f14adf0b..3e54a2e2741 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs @@ -8,5 +8,4 @@ public class Person public virtual string Name { get; set; } public virtual ICollection Children { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2112/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2112/Fixture.cs index a33f4759c86..3c6dc344e15 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2112/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2112/Fixture.cs @@ -73,6 +73,5 @@ protected void AssertDeleteCount(int expected) { Assert.That(Sfi.Statistics.EntityDeleteCount, Is.EqualTo(expected), "unexpected delete count"); } - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2112/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2112/Model.cs index 36b9e44f0e7..11e8e9ce4f1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2112/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2112/Model.cs @@ -23,7 +23,6 @@ public virtual bool Equals(TEntity other) } public override bool Equals(object obj) { - return this.Equals(obj as TEntity); } private int? mHashCode; @@ -62,8 +61,7 @@ public virtual int Version public virtual string Name { get; set; } public virtual IDictionary Map { get; set; } - - } + } public class B : BaseEntity { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2113/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2113/Fixture.cs index 63038658bfc..73295817f9b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2113/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2113/Fixture.cs @@ -11,7 +11,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2113 [TestFixture] public class Fixture : BugTestCase { - [Test] public void ShouldNotEagerLoadKeyManyToOneWhenOverridingGetHashCode() { @@ -42,7 +41,6 @@ public void ShouldNotEagerLoadKeyManyToOneWhenOverridingGetHashCode() tx.Commit(); } - using (var s = OpenSession()) using (var tx = s.BeginTransaction()) { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2113/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2113/Model.cs index c44727aecaa..9e99dcde8c3 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2113/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2113/Model.cs @@ -2,7 +2,7 @@ namespace NHibernate.Test.NHSpecificTest.NH2113 { public class Loan { - public virtual Broker Broker{ get; set;} + public virtual Broker Broker{ get; set; } public virtual Group Group { get; set; } public virtual string Name { get; set; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2148/BugFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2148/BugFixture.cs index 7e1f234c40d..7a6352ad995 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2148/BugFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2148/BugFixture.cs @@ -17,7 +17,6 @@ protected override void OnSetUp() }); tx.Commit(); } - } protected override void OnTearDown() diff --git a/src/NHibernate.Test/NHSpecificTest/NH2208/E1.generated.cs b/src/NHibernate.Test/NHSpecificTest/NH2208/E1.generated.cs index 63413654708..bfc63b14c0b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2208/E1.generated.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2208/E1.generated.cs @@ -16,7 +16,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2208 /// public partial class E1 { - #region private fields Int32 _id; String _p1; @@ -50,4 +49,4 @@ public virtual SubOfReferred BO } #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2208/Referred.generated.cs b/src/NHibernate.Test/NHSpecificTest/NH2208/Referred.generated.cs index c22d369556f..eed86a8c857 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2208/Referred.generated.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2208/Referred.generated.cs @@ -16,7 +16,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2208 /// public partial class Referred { - #region private fields Int32 _id; String _p1; @@ -41,4 +40,4 @@ public virtual String P1 } #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2208/SubOfReferred.generated.cs b/src/NHibernate.Test/NHSpecificTest/NH2208/SubOfReferred.generated.cs index 218511a0f15..bea69493550 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2208/SubOfReferred.generated.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2208/SubOfReferred.generated.cs @@ -16,7 +16,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2208 /// public partial class SubOfReferred : Referred { - #region private fields String _xX; #endregion @@ -32,4 +31,4 @@ public virtual String XX } #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2224/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH2224/Domain.cs index 51d1186d829..13248a6d23a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2224/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2224/Domain.cs @@ -18,7 +18,6 @@ public virtual long Number } } - public virtual DateTime DateOfChange { get @@ -32,4 +31,4 @@ public virtual DateTime DateOfChange } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2234/MyType.cs b/src/NHibernate.Test/NHSpecificTest/NH2234/MyType.cs index 76eb017646e..7bcdeb67450 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2234/MyType.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2234/MyType.cs @@ -44,7 +44,6 @@ public static class MyUserTypes public static readonly List _values = new List { new MyUsertype(1, "Value 1"), new MyUsertype(2, "Value 2") }; - public static MyUsertype Value1 { get { return _values[0]; } @@ -65,7 +64,6 @@ public class SimpleCustomType : IUserType { private static readonly SqlType[] ReturnSqlTypes = { SqlTypeFactory.Int32 }; - #region IUserType Members public new bool Equals(object x, object y) @@ -129,5 +127,4 @@ public object Disassemble(object value) #endregion } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2244/PhoneNumber.cs b/src/NHibernate.Test/NHSpecificTest/NH2244/PhoneNumber.cs index 9c55473183c..d3e29ac4a52 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2244/PhoneNumber.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2244/PhoneNumber.cs @@ -9,7 +9,6 @@ public class PhoneNumber { public PhoneNumber() { - } public PhoneNumber(int countryCode, string number) diff --git a/src/NHibernate.Test/NHSpecificTest/NH2245/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2245/Model.cs index e11455db650..c3769954c9e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2245/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2245/Model.cs @@ -3,13 +3,12 @@ namespace NHibernate.Test.NHSpecificTest.NH2245 { -public class Foo -{ - public Foo() {} - public virtual Guid Id { get; protected set; } - public virtual string Name {get; set;} - public virtual string Description {get; set;} - public virtual int Version{get; set;} -} - -} \ No newline at end of file + public class Foo + { + public Foo() {} + public virtual Guid Id { get; protected set; } + public virtual string Name { get; set; } + public virtual string Description { get; set; } + public virtual int Version { get; set; } + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2280/OrganisationCode.cs b/src/NHibernate.Test/NHSpecificTest/NH2280/OrganisationCode.cs index 5e3ac6520a2..73317311509 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2280/OrganisationCode.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2280/OrganisationCode.cs @@ -36,7 +36,6 @@ public virtual Organisation Organisation set { key.Organisation = value; } } - public virtual DateTime? EndDate { get; set; } public override bool Equals(object obj) diff --git a/src/NHibernate.Test/NHSpecificTest/NH2297/InvalidCustomCompositeUserTypeBase.cs b/src/NHibernate.Test/NHSpecificTest/NH2297/InvalidCustomCompositeUserTypeBase.cs index b0906c684d8..7dadf3f3d24 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2297/InvalidCustomCompositeUserTypeBase.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2297/InvalidCustomCompositeUserTypeBase.cs @@ -15,7 +15,6 @@ public override string[] PropertyNames } } - public class InvalidTypesCustomCompositeUserType : InvalidCustomCompositeUserTypeBase { public override Type.IType[] PropertyTypes @@ -25,7 +24,6 @@ public override Type.IType[] PropertyTypes } } - /// /// An invalid custom user type mapper. /// @@ -91,7 +89,6 @@ public Object GetPropertyValue(Object component, int property) public void SetPropertyValue(Object object1, int i, Object object2) { - } public int GetHashCode(object x) @@ -104,4 +101,4 @@ public object Replace(object original, object target, ISessionImplementor sessio return DeepCopy(original); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2302/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2302/Fixture.cs index 4d3b8f56879..d214b5655f6 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2302/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2302/Fixture.cs @@ -203,6 +203,5 @@ private static string GetFixedLengthString12000() { return new string('a', 12000); } - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs index 429e89b95b0..13ebc470d4e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs @@ -7,6 +7,5 @@ public class MyClass public class TheOtherPart { - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2331/Nh2331Test.cs b/src/NHibernate.Test/NHSpecificTest/NH2331/Nh2331Test.cs index fad277386d5..7ad910399f2 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2331/Nh2331Test.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2331/Nh2331Test.cs @@ -148,4 +148,4 @@ DetachedCriteria personCriteria } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2362/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2362/Fixture.cs index 05ac017b3a1..6517d5a8d99 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2362/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2362/Fixture.cs @@ -18,7 +18,6 @@ in session.Query() into g let totalPrice = g.Sum(p => p.Price) select new { g.Key.CategoryId, g.Key.SupplierId, TotalPrice = totalPrice }).ToList(); - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2378/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2378/Fixture.cs index 62898934c04..c12abd924be 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2378/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2378/Fixture.cs @@ -59,9 +59,8 @@ public void ShortEntityCanBeQueryCorrectlyUsingLinqProvider() .Where(o => o.PersonId == 2) .ToList(); - Assert.That(m.Count, Is.EqualTo(1)); } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs b/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs index 4ff5d2fdf88..cfb78a2c688 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs @@ -4,47 +4,45 @@ namespace NHibernate.Test.NHSpecificTest.NH2386 { - public class Organisation - { - //internal to TGA - //private int organisationId; - public virtual Guid OrganisationId { get; set; } - private ISet tradingNames; - private ISet responsibleLegalPersons; + public class Organisation + { + //internal to TGA + //private int organisationId; + public virtual Guid OrganisationId { get; set; } + private ISet tradingNames; + private ISet responsibleLegalPersons; - /// - /// - /// - + /// + /// + /// + public virtual ISet ResponsibleLegalPersons + { + get + { + if (responsibleLegalPersons == null) + { + responsibleLegalPersons = new HashSet(); + } - public virtual ISet ResponsibleLegalPersons { - get { - if (responsibleLegalPersons == null) { - responsibleLegalPersons = new HashSet(); - } - return responsibleLegalPersons; - } - protected set { - responsibleLegalPersons = value; - - } - } + return responsibleLegalPersons; + } + protected set { responsibleLegalPersons = value; } + } - public virtual ISet TradingNames { - get { - if (tradingNames == null) { - tradingNames = new HashSet(); - } - return tradingNames; - } - protected set { - tradingNames = value; - - } - } + public virtual ISet TradingNames + { + get + { + if (tradingNames == null) + { + tradingNames = new HashSet(); + } - protected internal virtual byte[] RowVersion { get; protected set; } - - } + return tradingNames; + } + protected set { tradingNames = value; } + } + protected internal virtual byte[] RowVersion { get; protected set; } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2386/ResponsibleLegalPerson.cs b/src/NHibernate.Test/NHSpecificTest/NH2386/ResponsibleLegalPerson.cs index 5a4e3f243f0..e3a6bd275d1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2386/ResponsibleLegalPerson.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2386/ResponsibleLegalPerson.cs @@ -26,7 +26,6 @@ public virtual Guid ResponsibleLegalPersonId { protected set { responsibleLegalPersonId = value; } } - public virtual Organisation Organisation { get { return organisation; } protected set { organisation = value; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2386/TradingName.cs b/src/NHibernate.Test/NHSpecificTest/NH2386/TradingName.cs index 6bff1c52340..c6e2b183e54 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2386/TradingName.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2386/TradingName.cs @@ -11,8 +11,7 @@ namespace NHibernate.Test.NHSpecificTest.NH2386 public class TradingName { private Organisation organisation; - public virtual Guid TradingNameId { get; protected set;} - + public virtual Guid TradingNameId { get; protected set; } public TradingName(Organisation organisation) { if (organisation == null) { @@ -41,8 +40,5 @@ private bool ShouldSerializeEndDate() { public override string ToString() { return Name; } - - } - - + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2459/TrainingComponent.cs b/src/NHibernate.Test/NHSpecificTest/NH2459/TrainingComponent.cs index c121793b33d..99b2704423f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2459/TrainingComponent.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2459/TrainingComponent.cs @@ -14,10 +14,8 @@ protected TrainingComponent() {} } public class SkillSet : TrainingComponent { - } public class Qualification : TrainingComponent { - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2467/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH2467/DomainClass.cs index b706fb32703..48d81fa9f86 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2467/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2467/DomainClass.cs @@ -1,10 +1,7 @@ - - namespace NHibernate.Test.NHSpecificTest.NH2467 { public class DomainClass { - public int Id { get; diff --git a/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs b/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs index a82f3d8c883..af0ecb5c05e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs @@ -38,7 +38,6 @@ public void ShouldNotThrowOnFuturePaging() { using (var session = OpenSession()) { - var contentQuery = session .CreateCriteria() .Add(Restrictions.Eq("Data", "Test")); @@ -62,7 +61,6 @@ public void ShouldNotThrowOnReversedFuturePaging() { using (var session = OpenSession()) { - var countQuery = session .CreateCriteria() .Add(Restrictions.Eq("Data", "Test")); @@ -86,7 +84,6 @@ public void ShouldNotThrowOnFuturePagingUsingHql() { using (var session = OpenSession()) { - var contentQuery = session.CreateQuery("from DomainClass as d where d.Data = ?"); contentQuery.SetString(0, "Test"); contentQuery.SetMaxResults(2); @@ -107,7 +104,6 @@ public void ShouldNotThrowOnReversedFuturePagingUsingHql() { using (var session = OpenSession()) { - var contentQuery = session.CreateQuery("from DomainClass as d where d.Data = ?"); contentQuery.SetString(0, "Test"); contentQuery.SetMaxResults(2); diff --git a/src/NHibernate.Test/NHSpecificTest/NH2490/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2490/Fixture.cs index 3db326425f7..8a338e0a66e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2490/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2490/Fixture.cs @@ -44,6 +44,5 @@ public void BadSqlFromJoinLogicError() } } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2490/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2490/Model.cs index 70cc82417e6..8602f85197a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2490/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2490/Model.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.NHSpecificTest.NH2490 { public class Base diff --git a/src/NHibernate.Test/NHSpecificTest/NH2500/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2500/Fixture.cs index 59fed1471ad..8e4c8b50e28 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2500/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2500/Fixture.cs @@ -18,7 +18,6 @@ public class Foo public virtual string Name { get; set; } } - [TestFixture] public class Fixture : TestCaseMappingByCode { diff --git a/src/NHibernate.Test/NHSpecificTest/NH251/CustomAccessDO.cs b/src/NHibernate.Test/NHSpecificTest/NH251/CustomAccessDO.cs index a9b921b9039..4273001600c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH251/CustomAccessDO.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH251/CustomAccessDO.cs @@ -37,7 +37,6 @@ public IDictionary Fields } } - /// /// Custom access strategy that uses IDynamicFieldContainer to get/set property values /// @@ -124,4 +123,4 @@ public MethodInfo Method } // Optional operation } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2580/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2580/Fixture.cs index 41a042040f2..51077e6d0c1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2580/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2580/Fixture.cs @@ -7,7 +7,6 @@ public class Fixture: BugTestCase { private class MyClass { - } [Test] diff --git a/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs index d8778daec8a..55067d12d82 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2583/AbstractMassTestingFixture.cs @@ -22,9 +22,8 @@ protected override void Configure(Configuration configuration) configuration.Properties.Remove(cacheSetting); } configuration.SetProperty(Environment.UseSecondLevelCache, "false"); - } - private class ValueTuple + private class ValueTuple { public T1 Item1; public T2 Item2; @@ -131,7 +130,6 @@ protected int RunTest(Expression> c return TestAndAssert(condition, session, expectedIds); } } - } finally { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs index 8f1061261d8..81c5193c693 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2583/ManualTestFixture.cs @@ -153,8 +153,7 @@ public void OrShouldBeCompatibleWithAdditionForNullReferences() //Assert.AreEqual(0, leftResult.Count); //Assert.AreEqual(0, rightResult.Count); //Assert.AreEqual(0, orResult.Count); - - } + } } private static void TestCoreOrShouldBeCompatibleWithSum(ISession session, @@ -294,7 +293,6 @@ public void NHibernateLinqExploratoryTestWhichProvesNothing() // ); //result.ToList(); - var result = from r in session.Query() orderby (r.Id == 1101 || r.Id == 1102 ? r.Id - 1000 : r.Id) select (r.Id == 1101 || r.Id == 1102 ? r.Id + 1000 : r.Id); diff --git a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingMoreOperatorsFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingMoreOperatorsFixture.cs index 30e0a5c8d7b..ffebb4e609b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingMoreOperatorsFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingMoreOperatorsFixture.cs @@ -80,7 +80,6 @@ public void TestNestedPlusBehindNotOrNav() Setters(MyBO.SetBO1_I1, MyBO.SetBO1_I2)); } - [Test] public void TestNestedPlusBehindOrNav2() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs index 4d949b0631d..34615c8ff65 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingOneOrTreeFixture.cs @@ -87,7 +87,6 @@ public void Test_xyP_in_C__rsQ_in_D____xy_OJ_rs_OJ() Setters(MyBO.SetK1, MyBO.SetK2, MyBO.SetBO1_I1, MyBO.SetBO2_J1)); } - #endregion 1b. Two paths #region 1c. Path and subpath diff --git a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs index 1a526dcb212..32cc09d5994 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingThreeOrTreesSideBySideFixture.cs @@ -103,7 +103,6 @@ public void Test_xyP_in_C__rsQ_in_D____xy_OJ_rs_OJ() Setters(MyBO.SetK1, MyBO.SetK2, MyBO.SetBO1_I1, MyBO.SetBO2_J1)); } - [Test] public void Test_xyP_in_A_C_D__rsQ_in_A_B_D____xy_IJ_rs_IJ() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs index cb30eda8aaa..e76f413e495 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2583/MassTestingTwoOrTreesSideBySideFixture.cs @@ -86,7 +86,6 @@ public void Test_xyP_in_C__rsQ_in_D____xy_OJ_rs_OJ() Setters(MyBO.SetK1, MyBO.SetK2, MyBO.SetBO1_I1, MyBO.SetBO2_J1)); } - [Test] public void Test_xyP_in_A_C_D__rsQ_in_A_B_D____xy_IJ_rs_IJ() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH266/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH266/Fixture.cs index f25e63ccb65..5294298b008 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH266/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH266/Fixture.cs @@ -54,7 +54,6 @@ protected override void OnTearDown() s.Close(); } - [Test] public void BaseClassLoad() { @@ -64,7 +63,6 @@ public void BaseClassLoad() Assert.AreEqual("the a", a.Name); s.Close(); - // load instance through hql s = OpenSession(); IQuery q = s.CreateQuery("from A as a where a.id = :id "); @@ -114,4 +112,4 @@ public void SpecificSubclass() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH266/UserFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH266/UserFixture.cs index 4542ef635ea..a3adbb67c85 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH266/UserFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH266/UserFixture.cs @@ -48,7 +48,6 @@ protected override void OnTearDown() s.Close(); } - /// /// This is testing problems that existed in 0.8.0-2 with extra "AND" /// being added to the sql when there was an attribute where="some sql". @@ -82,7 +81,6 @@ public void WhereAttribute() Assert.AreEqual(0, list.Count, "no 'inactive user' according to where clause"); s.Close(); - // // load a instance of B through hql // s = OpenSession(); // IQuery q = s.CreateQuery( "from B as b where b.id = :id" ); @@ -101,4 +99,4 @@ public void WhereAttribute() // s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2662/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2662/Fixture.cs index c94cc821745..aa48a553aea 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2662/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2662/Fixture.cs @@ -36,7 +36,7 @@ public void WhenCastAliasInQueryOverThenDoNotThrow() c => new {c.Id, c.Order.OrderDate, ((PizzaOrder)c.Order).PizzaName }) .ToArray(); - foreach (var item in temp) { Trace.WriteLine(item.PizzaName);} + foreach (var item in temp) { Trace.WriteLine(item.PizzaName); } }, Throws.Nothing); Assert.That(() => @@ -56,7 +56,6 @@ public void WhenCastAliasInQueryOverThenDoNotThrow() Assert.That(results.Count, Is.EqualTo(2)); Assert.That(results[0][2], Is.EqualTo("Margarita")); - }, Throws.Nothing); } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2664/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2664/Fixture.cs index 1a19c8956a1..6dcf8071366 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2664/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2664/Fixture.cs @@ -76,7 +76,6 @@ protected override void OnTearDown() tran.Commit(); } } - } [Test] @@ -136,4 +135,4 @@ public void Different_Key_In_DynamicComponentDictionary_Returns_Different_Keys() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2673/Blog.cs b/src/NHibernate.Test/NHSpecificTest/NH2673/Blog.cs index b1bd26ad065..d666eab6d9a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2673/Blog.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2673/Blog.cs @@ -24,11 +24,10 @@ public class Post public virtual string Body { get; set; } } - public class Comment { public virtual int Id { get; protected set; } public virtual string Title { get; set; } public virtual string Body { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2673/CachingWithTransformerTests.cs b/src/NHibernate.Test/NHSpecificTest/NH2673/CachingWithTransformerTests.cs index 08f8a3bc2be..afa5fb36df0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2673/CachingWithTransformerTests.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2673/CachingWithTransformerTests.cs @@ -52,7 +52,6 @@ public Scenario(ISessionFactory factory) blog.Posts.Add(new Post { Title = "Second post", Body = "Some other text" }); blog.Posts.Add(new Post { Title = "Third post", Body = "Third post text" }); - blog.Comments.Add(new Comment { Title = "First comment", Body = "Some text" }); blog.Comments.Add(new Comment { Title = "Second comment", Body = "Some other text" }); session.Save(blog); @@ -210,7 +209,6 @@ public void WhenEagerLoadingWithHqlThenNotThrows() } } - [Test(Description = "NH2961/3311")] public void CanCacheCriteriaWithLeftJoinAndResultTransformer() { @@ -228,7 +226,6 @@ public void CanCacheCriteriaWithLeftJoinAndResultTransformer() } } - [Test(Description = "NH2961/3311")] public void CanCacheCriteriaWithEagerLoadAndResultTransformer() { @@ -244,7 +241,6 @@ public void CanCacheCriteriaWithEagerLoadAndResultTransformer() } } - [Test(Description = "NH2961/3311")] public void CanCacheCriteriaWithLeftJoin() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2693/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2693/Fixture.cs index 29288782af7..7c2cd77ea05 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2693/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2693/Fixture.cs @@ -32,7 +32,6 @@ protected override void OnSetUp() var fourthLevel2 = new FourthLevel { SomeString = "second", SpecificThirdLevel = thirdLevel1 }; thirdLevel1.FourthLevels.Add(fourthLevel2); - var firstLevel2 = new FirstLevel(); var secondLevel2 = new SecondLevelComponent { FirstLevel = firstLevel2 }; @@ -47,7 +46,6 @@ protected override void OnSetUp() var fourthLevel4 = new FourthLevel { SomeString = "fourth", SpecificThirdLevel = thirdLevel2 }; thirdLevel2.FourthLevels.Add(fourthLevel4); - var firstLevel3 = new FirstLevel(); var secondLevel3 = new SecondLevelComponent { FirstLevel = firstLevel3 }; @@ -57,7 +55,6 @@ protected override void OnSetUp() secondLevel3.ThirdLevel = thirdLevel3; secondLevel3.SpecificThirdLevel = thirdLevel3; - session.Save(thirdLevel1); session.Save(thirdLevel2); session.Save(thirdLevel3); diff --git a/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs index 25056895d0a..c474369c1b1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs @@ -1,39 +1,46 @@ - -namespace NHibernate.Test.NHSpecificTest.NH2693 { - using System; - using System.Collections.Generic; +using System; +using System.Collections.Generic; - public class FirstLevel { - public FirstLevel() { - SecondLevels = new HashSet(); - } +namespace NHibernate.Test.NHSpecificTest.NH2693 +{ + public class FirstLevel + { + public FirstLevel() + { + SecondLevels = new HashSet(); + } - public virtual Guid Id { get; set; } - public virtual ICollection SecondLevels { get; set; } - } + public virtual Guid Id { get; set; } + public virtual ICollection SecondLevels { get; set; } + } - public class SecondLevelComponent { - public virtual FirstLevel FirstLevel { get; set; } - public virtual ThirdLevel ThirdLevel { get; set; } - public virtual SpecificThirdLevel SpecificThirdLevel { get; set; } - public virtual bool SomeBool { get; set; } - } + public class SecondLevelComponent + { + public virtual FirstLevel FirstLevel { get; set; } + public virtual ThirdLevel ThirdLevel { get; set; } + public virtual SpecificThirdLevel SpecificThirdLevel { get; set; } + public virtual bool SomeBool { get; set; } + } - public abstract class ThirdLevel { - public virtual Guid Id { get; set; } - } + public abstract class ThirdLevel + { + public virtual Guid Id { get; set; } + } - public class SpecificThirdLevel : ThirdLevel { - public SpecificThirdLevel() { - FourthLevels = new HashSet(); - } + public class SpecificThirdLevel : ThirdLevel + { + public SpecificThirdLevel() + { + FourthLevels = new HashSet(); + } - public virtual ICollection FourthLevels { get; set; } - } + public virtual ICollection FourthLevels { get; set; } + } - public class FourthLevel { - public virtual Guid Id { get; set; } - public virtual SpecificThirdLevel SpecificThirdLevel { get; set; } - public virtual string SomeString { get; set; } - } + public class FourthLevel + { + public virtual Guid Id { get; set; } + public virtual SpecificThirdLevel SpecificThirdLevel { get; set; } + public virtual string SomeString { get; set; } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs b/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs index cadff6f74b8..09f9a877ba6 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs @@ -1,15 +1,12 @@ - +using System; -using System; namespace NHibernate.Test.NHSpecificTest.NH2697 - { - public class ArticleItem - { + public class ArticleItem + { public virtual int Articleid { get; set; } public virtual Int16 IsFavorite { get; set; } public virtual string Name { get; set; } public virtual ArticleGroupItem Articlegroup { get; set; } - - } -} \ No newline at end of file + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2697/SampleTest.cs b/src/NHibernate.Test/NHSpecificTest/NH2697/SampleTest.cs index 9ca2f16e424..4670af02719 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2697/SampleTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2697/SampleTest.cs @@ -48,7 +48,6 @@ protected override void OnTearDown() { base.OnTearDown(); - using (ISession session = this.OpenSession()) { IList list = session.CreateCriteria("Article").List(); foreach (ArticleItem item in list) @@ -68,7 +67,6 @@ protected override void OnTearDown() session.Delete(hql); session.Flush(); } - } [Test] @@ -115,8 +113,6 @@ public void Can_GetListOfArticles() Assert.That(result.Count, Is.GreaterThan(0)); } - - [Test] public void Can_SetArticleFavoriteWithHQL_NamedParam() { @@ -142,7 +138,6 @@ public void Can_SetArticleFavoriteWithHQL_NamedParam() result = session.CreateQuery(HQL).List(); } Assert.That(result.Count, Is.GreaterThan(0)); - - } +} } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2700/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2700/Fixture.cs index ca6bc21cab2..56d685c8047 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2700/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2700/Fixture.cs @@ -54,7 +54,6 @@ public static string GetSql(ICriteria criteria) [Test] public void TestProjection() { - using (var s = OpenSession()) { var proj = new SqlFunctionProjection("AddDays", NHibernateUtil.DateTime, diff --git a/src/NHibernate.Test/NHSpecificTest/NH2700/ModelClass.cs b/src/NHibernate.Test/NHSpecificTest/NH2700/ModelClass.cs index c027ebebabf..6ea4b852674 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2700/ModelClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2700/ModelClass.cs @@ -8,5 +8,4 @@ public class ModelClass public virtual DateTime Date1 { get; set; } public virtual DateTime Value1 { get; set; } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2705/Test.cs b/src/NHibernate.Test/NHSpecificTest/NH2705/Test.cs index bec7503160f..18e0af79875 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2705/Test.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2705/Test.cs @@ -62,7 +62,6 @@ public void LinqQueryWithFetch_WhenDerivedClassesUseComponentAndManyToOne_DoesNo Assert.That(() => s.Query() .Fetch(p => p.SubItem).ToList(), Throws.Nothing); - // fetching second level properties should work too Assert.That(() => s.Query() .Fetch(p => p.SubItem).ThenFetch(p => p.Details).ToList(), Throws.Nothing); diff --git a/src/NHibernate.Test/NHSpecificTest/NH2773/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2773/Fixture.cs index a483269438f..85d07f5307a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2773/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2773/Fixture.cs @@ -50,7 +50,6 @@ public void DeserializedSession_ProxyType_ShouldBeEqualToOriginalProxyType() { tx.Commit(); } - using (MemoryStream sessionMemoryStream = new MemoryStream()) { var formatter = new BinaryFormatter diff --git a/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs b/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs index bb4affb0582..b5964e94e16 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.NHSpecificTest.NH2779 +namespace NHibernate.Test.NHSpecificTest.NH2779 { public class LineItem { diff --git a/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs index 5d269ba2f2b..9f60dd9a2cc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH280/Fixture.cs @@ -49,7 +49,6 @@ public void ConstInSelect() Assert.AreEqual(123, result[0]); Assert.AreEqual("Fiammy", (result[1] as Foo).Description); - l = s.CreateQuery("select 123, f.Description from Foo f").List(); result = l[0] as IList; Assert.AreEqual(123, result[0]); diff --git a/src/NHibernate.Test/NHSpecificTest/NH280/Foo.cs b/src/NHibernate.Test/NHSpecificTest/NH280/Foo.cs index c2c098809dc..bc5fdf5b480 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH280/Foo.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH280/Foo.cs @@ -28,6 +28,5 @@ public virtual string Description get { return _description; } set { _description = value; } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2828/Entities.cs b/src/NHibernate.Test/NHSpecificTest/NH2828/Entities.cs index 260828eebf7..387f50ba402 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2828/Entities.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2828/Entities.cs @@ -91,7 +91,6 @@ public virtual bool RemoveAddress(Address address) } return false; } - } public class Address @@ -118,7 +117,6 @@ public virtual void RemoveCompany() { this.Company = null; } - } public class BankAccount @@ -128,7 +126,5 @@ public class BankAccount public virtual string Name { get; set; } public virtual Company Company { get; set; } - } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH283/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH283/Fixture.cs index 89154acca71..1b4c8ccb0f5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH283/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH283/Fixture.cs @@ -18,7 +18,6 @@ public void ForeignKeyNames() Assembly.GetAssembly(typeof(Master)) ); - string script = string.Join("\n", cfg.GenerateSchemaCreationScript(new MsSql2008Dialect())); diff --git a/src/NHibernate.Test/NHSpecificTest/NH2846/Entities.cs b/src/NHibernate.Test/NHSpecificTest/NH2846/Entities.cs index ec7b0ef201e..7db47f61a9a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2846/Entities.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2846/Entities.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - namespace NHibernate.Test.NHSpecificTest.NH2846 { public class Post @@ -34,4 +33,4 @@ public class Comment public virtual Post Post { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2846/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2846/Fixture.cs index f20da6a7aa3..0bdb7e7b0dd 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2846/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2846/Fixture.cs @@ -60,22 +60,18 @@ protected override void OnTearDown() } } - [Test] public void FetchOnCountWorks() { using (var session = OpenSession()) { - var count = session.Query() .Fetch(p => p.Category) .FetchMany(p => p.Comments) .Count(); Assert.AreEqual(1, count); - } } - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH2869/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH2869/DomainClass.cs index f3eb9ff3d61..3f630cb5cd0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2869/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2869/DomainClass.cs @@ -2,9 +2,8 @@ { public class DomainClass { - public virtual int Id { get; set; } public virtual string Name { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH2951/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2951/Fixture.cs index 49f0dec3e4e..5836b763332 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2951/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2951/Fixture.cs @@ -30,7 +30,6 @@ public void UpdateWithSubqueryToJoinedSubclass() using (ISession session = OpenSession()) using (ITransaction transaction = session.BeginTransaction()) { - var c = new Customer { Name = "Bob" }; session.Save(c); diff --git a/src/NHibernate.Test/NHSpecificTest/NH2969/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2969/Fixture.cs index b83b6c48fe1..dd2044f1cb9 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2969/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2969/Fixture.cs @@ -103,7 +103,6 @@ public void CanGetGoldfishAsFish() } } - [Test] public void CanGetParrot() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH298/Category.cs b/src/NHibernate.Test/NHSpecificTest/NH298/Category.cs index 067db6e3d67..2eddf0b9ab3 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH298/Category.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH298/Category.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; namespace NHibernate.Test.NHSpecificTest.NH298 { - public class Category { private int id; private string name; diff --git a/src/NHibernate.Test/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs b/src/NHibernate.Test/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs index f444ff0ee82..310ecebb71f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH298/IndexedBidirectionalOneToManyTest.cs @@ -6,10 +6,8 @@ using NUnit.Framework; namespace NHibernate.Test.NHSpecificTest.NH298 { - [TestFixture] public class IndexedBidirectionalOneToManyTest : BugTestCase { - protected override void OnSetUp() { base.OnSetUp(); using ( ISession session = this.OpenSession() ) { diff --git a/src/NHibernate.Test/NHSpecificTest/NH2985/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2985/Model.cs index 7c322e208f7..e852e0efaf7 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH2985/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH2985/Model.cs @@ -12,8 +12,6 @@ public class ClassA public virtual String Name { get; set; } public virtual IList Childs { get; set; } - - } /// @@ -23,7 +21,6 @@ public class WebImage { public WebImage() { - OldPosition = -1; //di base un immagine è nuova. } /// @@ -67,13 +64,11 @@ public virtual Guid Id /// public virtual Int32 Height { get; set; } - /// /// /// public virtual Int32? ImgEval { get; set; } - /// /// /// @@ -143,9 +138,7 @@ private Bitmap CreateBitmap() { return null; } - } #endif } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlClientDriver.cs b/src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlClientDriver.cs index 24297856ff0..70f0f134ab6 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlClientDriver.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3004/TestSqlClientDriver.cs @@ -18,7 +18,6 @@ public class TestSqlClientDriver : SqlClientDriver public TestSqlClientDriver() { - } public TestSqlClientDriver(bool UseNamedPrefixInSql, bool UseNamedPrefixInParameter) @@ -30,7 +29,6 @@ public TestSqlClientDriver(bool UseNamedPrefixInSql, bool UseNamedPrefixInParame public override bool UseNamedPrefixInSql { get { return _UseNamedPrefixInSql; } - } public override bool UseNamedPrefixInParameter @@ -38,4 +36,4 @@ public override bool UseNamedPrefixInParameter get { return _UseNamedPrefixInParameter; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs b/src/NHibernate.Test/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs index f460546d6ad..0c6e98895a4 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3023/DeadlockConnectionPoolIssueTest.cs @@ -248,7 +248,6 @@ public void ConnectionPoolCorruptionAfterDeadlock(bool distributed, bool dispose ? "Deadlock not reported on initial request, and initial request failed" : "Initial request failed", subsequentFailedRequests); - } while (tryCount < 3); // // I'll change this to while(true) sometimes so I don't have to keep running the test @@ -284,7 +283,6 @@ private void RunScript(string script) foreach (var batch in Regex.Split(sql, @"^go\s*$", RegexOptions.IgnoreCase | RegexOptions.Multiline) .Where(b => !string.IsNullOrEmpty(b))) { - using (var cmd = new System.Data.SqlClient.SqlCommand(batch, cxn)) { cmd.ExecuteNonQuery(); diff --git a/src/NHibernate.Test/NHSpecificTest/NH3046/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3046/Fixture.cs index 86a56f36ab4..f2bb9a1c4f1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3046/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3046/Fixture.cs @@ -1,4 +1,3 @@ - using System; using NUnit.Framework; using NHibernate.Mapping.ByCode; @@ -12,7 +11,6 @@ public class Fixture : BugTestCase [Test, Explicit] public void MemoryLeak() { - long initialMemory = GC.GetTotalMemory(true); long nextId = 1; long nextIdChild = 1; diff --git a/src/NHibernate.Test/NHSpecificTest/NH309/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH309/Fixture.cs index a4d8e6540c3..d88dff5c1ec 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH309/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH309/Fixture.cs @@ -70,11 +70,10 @@ public void RemoveNodeFromNodesCollection() Assert.AreEqual(2, menu2.Nodes.Count, "Test count after removal"); Assert.AreEqual(rootNode, menu2.Nodes[0], "Test identity first node in menu"); - s.Delete("from Node"); s.Delete("from Menu"); s.Flush(); s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs index 3ad3a6b365f..71a25114bc3 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs @@ -46,7 +46,6 @@ public void ShouldThrowWhenByteArrayTooLong() Is.EqualTo("The length of the byte[] value exceeds the length configured in the mapping/parameter.")); } - [Test] public void ShouldThrowWhenImageTooLarge() { @@ -63,7 +62,6 @@ public void ShouldThrowWhenImageTooLarge() Is.EqualTo("The length of the byte[] value exceeds the length configured in the mapping/parameter.")); } - [Test] public void ShouldThrowWhenImageAsISerializableTooLarge() { @@ -80,7 +78,6 @@ public void ShouldThrowWhenImageAsISerializableTooLarge() Is.EqualTo("The length of the byte[] value exceeds the length configured in the mapping/parameter.")); } - private void PersistReport(Report report) { using (var session = OpenSession()) diff --git a/src/NHibernate.Test/NHSpecificTest/NH3139/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3139/Fixture.cs index e5c3a3bb015..4f73dc902fd 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3139/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3139/Fixture.cs @@ -64,7 +64,6 @@ protected override void OnTearDown() tran.Commit(); } } - } [Test] diff --git a/src/NHibernate.Test/NHSpecificTest/NH3142/ChildrenTest.cs b/src/NHibernate.Test/NHSpecificTest/NH3142/ChildrenTest.cs index cc1b1d1d6d7..b6b77b7f8a5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3142/ChildrenTest.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3142/ChildrenTest.cs @@ -57,7 +57,6 @@ protected override void OnTearDown() } } - [Test] public void ChildrenCollectionOfAllParentsShouldContainsThreeElements() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH3142/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH3142/DomainClass.cs index c71afa559e7..f2ccdfbad1f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3142/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3142/DomainClass.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System; - namespace NHibernate.Test.NHSpecificTest.NH3142 { public class DomainParent @@ -72,4 +71,4 @@ public class DomainChildWCId public virtual int ParentId1 { get; set; } public virtual int ParentId2 { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3145/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH3145/Model.cs index 3b8d580bac0..08c03c1b69c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3145/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3145/Model.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.NHSpecificTest.NH3145 { public class Root diff --git a/src/NHibernate.Test/NHSpecificTest/NH3153/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3153/Fixture.cs index fc1d0e1268d..0c1b66564cf 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3153/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3153/Fixture.cs @@ -23,7 +23,6 @@ public void ShouldGetIdentifierSchemaFromClassElement() Assert.That(((SimpleValue)pc.Identifier).IdentifierGeneratorProperties["schema"], Is.EqualTo("Test")); } - [Test] public void ShouldGetIdentifierSchemaFromMappingElement() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs index 8734c483c18..219ef8ad1bd 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs @@ -62,7 +62,6 @@ protected override void OnTearDown() base.OnTearDown(); } - [Test] public void OffsetNotStartingAtOneSetsParameterToSkipValue() { @@ -104,7 +103,6 @@ public class OffsetStartsAtOneTestDialect : MsSql2008Dialect public override bool OffsetStartsAtOne { get { return ForceOffsetStartsAtOne; } } } - public class OffsetTestDriver : SqlClientDriver { public OffsetStartsAtOneTestDialect OffsetStartsAtOneTestDialect; diff --git a/src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs index 2638158af72..7fa2893833f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3252/Fixture.cs @@ -21,7 +21,6 @@ public void VerifyThatWeCanSaveAndLoad() using (var session = OpenSession()) using (var transaction = session.BeginTransaction()) { - session.Save(new Note { Text = new String('0', 9000) }); transaction.Commit(); } @@ -29,7 +28,6 @@ public void VerifyThatWeCanSaveAndLoad() using (var session = OpenSession()) using (session.BeginTransaction()) { - var note = session.Query().First(); Assert.AreEqual(9000, note.Text.Length); } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3332/State.cs b/src/NHibernate.Test/NHSpecificTest/NH3332/State.cs index 63e89f2e1e1..e8d905a7df5 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3332/State.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3332/State.cs @@ -32,7 +32,6 @@ public override bool Equals(object obj) return toCompareWith != null && Id == toCompareWith.Id; } - public virtual Int32 Id { get { return _id; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs b/src/NHibernate.Test/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs index dd7697024bf..8058e7f5b04 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3332/TestJoinsWithSameTable.cs @@ -71,13 +71,11 @@ from std in me.State.StateDescriptions } } - private void CreateObjects(ISession session) { // Create the English culture Culture englishCulture = new Culture(); - englishCulture.CountryCode = "CA"; englishCulture.LanguageCode = "en"; @@ -104,8 +102,6 @@ private void CreateObjects(ISession session) dataType1.DataTypeDescriptions.Add(dataTypeDescription1); - - // Create a State and attach it an English description and a Spanish description State state1 = new State(); @@ -125,7 +121,6 @@ private void CreateObjects(ISession session) state1.StateDescriptions.Add(spanishStateDescription); - MasterEntity masterEntity = new MasterEntity(); masterEntity.Name = "MasterEntity 1"; @@ -136,4 +131,4 @@ private void CreateObjects(ISession session) session.Flush(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3372/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3372/Fixture.cs index 668c0085aaa..3d0f16cbb23 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3372/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3372/Fixture.cs @@ -42,6 +42,5 @@ public void CanGeneratePropertyOnUpdateOfEntityWithCustomLoader() Assert.That(entity.ShardId, Is.Not.Null & Has.Length.GreaterThan(0)); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3383/FixtureByCode.cs b/src/NHibernate.Test/NHSpecificTest/NH3383/FixtureByCode.cs index 6d8bb28094e..8709a1a8119 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3383/FixtureByCode.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3383/FixtureByCode.cs @@ -21,7 +21,6 @@ protected override HbmMapping GetMappings() return mapper.CompileMappingForAllExplicitlyAddedEntities(); } - [Test] public void DeserializedCascadeStyleRefersToSameObject() { @@ -43,7 +42,6 @@ public void DeserializedCascadeStyleRefersToSameObject() Assert.That(deserializedCascadeStyle, Is.SameAs(CascadeStyle.Evict)); } - [Test] public void CanRoundTripSerializedMultipleCascadeStyle() { @@ -70,7 +68,6 @@ public void CanRoundTripSerializedMultipleCascadeStyle() "[NHibernate.Engine.CascadeStyle+DeleteCascadeStyle,NHibernate.Engine.CascadeStyle+LockCascadeStyle]")); } - [Test] public void DeserializedPropertyMapping_RefersToSameCascadeStyle() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH3392/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3392/Fixture.cs index 80482b1b77e..d3c693cb3e1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3392/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3392/Fixture.cs @@ -27,7 +27,6 @@ public void ExpandSubCollectionWithEmbeddedCompositeID() using (ISession s = OpenSession()) using (var tx = s.BeginTransaction()) { - var jenny = new Mum {Name = "Jenny"}; s.Save(jenny); var benny = new Dad {Name = "Benny"}; @@ -56,7 +55,6 @@ public void ExpandSubCollectionWithCompositeID() using (ISession s = OpenSession()) using (var tx = s.BeginTransaction()) { - var jenny = new Mum { Name = "Jenny" }; s.Save(jenny); var benny = new Dad { Name = "Benny" }; @@ -78,7 +76,5 @@ public void ExpandSubCollectionWithCompositeID() Assert.That(result[0].x.Friends, Is.EquivalentTo(result[0].Friends)); } } - - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3401/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3401/Fixture.cs index f4b22141086..e598d0b3d5c 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3401/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3401/Fixture.cs @@ -38,7 +38,6 @@ public void YesNoParameterLengthShouldBe1() transaction.Commit(); } - using (ISession session = OpenSession()) using (session.BeginTransaction()) { @@ -50,4 +49,4 @@ where e.YesNo } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3428/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3428/Fixture.cs index fff9f71b9b4..d9a7a0f1258 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3428/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3428/Fixture.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.NHSpecificTest.NH3428 [TestFixture] public class Fixture : BugTestCase { - protected override bool AppliesTo(Dialect.Dialect dialect) { return dialect is Dialect.MsSql2005Dialect; @@ -62,4 +61,4 @@ public void QueryFailsWhenDistinctOrderedResultIsPagedPastPageOne() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3453/Classes.cs b/src/NHibernate.Test/NHSpecificTest/NH3453/Classes.cs index 92569701588..878989b57f7 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3453/Classes.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3453/Classes.cs @@ -7,7 +7,6 @@ namespace NHibernate.Test.NHSpecificTest.NH3453 { class Direction { - #region Compisite ID public virtual Int32 Id1 { get; set; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3453/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3453/Fixture.cs index 8c4a503cccf..ebea5d3aa55 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3453/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3453/Fixture.cs @@ -13,7 +13,6 @@ public void PropertyRefWithCompositeIdUpdateTest() using (var session = OpenSession()) using (session.BeginTransaction()) { - var direction1 = new Direction { Id1 = 1, Id2 = 1, GUID = Guid.NewGuid() }; session.Save(direction1); @@ -40,6 +39,5 @@ public void PropertyRefWithCompositeIdUpdateTest() Assert.That(true); } } - - } -} \ No newline at end of file + } +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3487/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3487/Fixture.cs index 1ea873abf17..492c37a0d29 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3487/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3487/Fixture.cs @@ -78,7 +78,6 @@ public void CanDeserializeSessionWithEntityHashCollision() { formatter.Deserialize(serializationStream); } - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs index 2b81ffe7bd9..eb12306b13f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs @@ -1,21 +1,16 @@ - - -namespace NHibernate.Test.NHSpecificTest.NH3567 +namespace NHibernate.Test.NHSpecificTest.NH3567 { public class Site { public virtual int Id { get; set; } public virtual string Name { get; set; } - - } + public class Post { public virtual int Id { get; set; } public virtual string Content { get; set; } public virtual Site Site { get; set; } - - } public class Comment @@ -23,7 +18,5 @@ public class Comment public virtual int Id { get; set; } public virtual string Content { get; set; } public virtual Post Post { get; set; } - } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3567/NH3567Tests.cs b/src/NHibernate.Test/NHSpecificTest/NH3567/NH3567Tests.cs index ca549cdfd31..ae67d774e3f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3567/NH3567Tests.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3567/NH3567Tests.cs @@ -20,7 +20,6 @@ protected override void OnSetUp() session.Save(site1); session.Save(site2); - var p1 = new Post { Id = ++id, Content = "Post 1", Site = site1 }; var p2 = new Post { Id = ++id, Content = "Post 2", Site = site2 }; @@ -92,16 +91,9 @@ public void TestFlushModeAuto() Assert.That(numberOfComments, Is.EqualTo(2), "Query with sub-query returned an invalid number of rows."); - transaction.Rollback(); - } - } } - - } - - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3571/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3571/Fixture.cs index 00c76e6ddcd..1ef8fd60113 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3571/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3571/Fixture.cs @@ -73,7 +73,6 @@ protected override void OnTearDown() tran.Commit(); } } - } [Test] @@ -92,7 +91,6 @@ public void CanQueryDynamicComponentInComponent() } } - [Test] public void MultipleQueriesShouldNotCache() { @@ -113,7 +111,6 @@ public void MultipleQueriesShouldNotCache() } } - [Test] public void DifferentKeyInDynamicComponentDictionaryReturnsDifferentExpressionKeys() { @@ -131,4 +128,4 @@ public void DifferentKeyInDynamicComponentDictionaryReturnsDifferentExpressionKe } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3604/FixtureByCode.cs b/src/NHibernate.Test/NHSpecificTest/NH3604/FixtureByCode.cs index f12d53072ce..383dcf7bc22 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3604/FixtureByCode.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3604/FixtureByCode.cs @@ -41,7 +41,6 @@ protected override void OnSetUp() var e1 = new Entity { Name = "Bob" }; session.Save(e1); - var e2 = new Entity { Name = "Sally" }; var ed2 = new EntityDetail(e2) { ExtraInfo = "Jo" }; e2.Detail = ed2; diff --git a/src/NHibernate.Test/NHSpecificTest/NH3620/TwoBlobs.cs b/src/NHibernate.Test/NHSpecificTest/NH3620/TwoBlobs.cs index 5f875f2338b..1e4cf6b4bb3 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3620/TwoBlobs.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3620/TwoBlobs.cs @@ -6,6 +6,5 @@ public class TwoBlobs { public virtual byte[] Blob1 { get; set; } public virtual byte[] Blob2 { get; set; } public virtual DateTime TheDate { get; set; } - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs index b58449c04ac..9f96ca1d221 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Test.NHSpecificTest.NH3641 +namespace NHibernate.Test.NHSpecificTest.NH3641 { public interface IEntity { diff --git a/src/NHibernate.Test/NHSpecificTest/NH3749/TestDialect.cs b/src/NHibernate.Test/NHSpecificTest/NH3749/TestDialect.cs index e8ec6ebe300..5e143e7e1a8 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3749/TestDialect.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3749/TestDialect.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.NHSpecificTest.NH3749 { public class TestDialect : Dialect.Dialect diff --git a/src/NHibernate.Test/NHSpecificTest/NH3754/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH3754/Model.cs index 1f335d8f4f5..fe2756f2676 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3754/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3754/Model.cs @@ -24,5 +24,4 @@ public virtual short IsActive set { _isActive = value; } } } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH3800/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH3800/Domain.cs index b94e1481bf1..c90fe375949 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3800/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3800/Domain.cs @@ -37,7 +37,6 @@ public TimeRecord() public virtual Project Project { get; set; } public virtual IList Components { get; set; } public virtual IList Tags { get; set; } - } public class Tag diff --git a/src/NHibernate.Test/NHSpecificTest/NH3818/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3818/Fixture.cs index e8ef6797db5..b08574f6856 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3818/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3818/Fixture.cs @@ -58,9 +58,7 @@ public void SelectConditionalValuesTest() //Console.WriteLine(spy.ToString()); Assert.That(catInfo2.AliveDays, Is.EqualTo(0)); - - } + } } - - } + } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3844/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH3844/Domain.cs index 2d437aaec93..c00f19984b6 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3844/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3844/Domain.cs @@ -36,7 +36,6 @@ public TimeRecord() public virtual double TimeInHours { get; set; } public virtual Project Project { get; set; } public virtual IList Components { get; set; } - } public class Job diff --git a/src/NHibernate.Test/NHSpecificTest/NH3844/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3844/Fixture.cs index d8cca9fe754..ae7e0204e23 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3844/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3844/Fixture.cs @@ -54,7 +54,6 @@ protected override void OnSetUp() session.Save(compP3_x); session.Save(compP3_y); - session.Save(new TimeRecord { TimeInHours = 1, Project = project1, Components = { } }); session.Save(new TimeRecord { TimeInHours = 2, Project = project1, Components = { compP1_x } }); session.Save(new TimeRecord { TimeInHours = 3, Project = project1, Components = { compP1_y } }); diff --git a/src/NHibernate.Test/NHSpecificTest/NH3848/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3848/Fixture.cs index c4514867255..f617a69752f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3848/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3848/Fixture.cs @@ -274,7 +274,6 @@ public virtual void ChildCollectionsWithSelectModeFetchAndWhereClauseShouldNotBe } } - [Test] public void ChildCollectionsFromLeftOuterJoinWithWhereClauseRestrictionOnCollectionShouldNotBeInSecondLevelCache() { diff --git a/src/NHibernate.Test/NHSpecificTest/NH386/_Parent.cs b/src/NHibernate.Test/NHSpecificTest/NH386/_Parent.cs index 98e4b2a99af..ef3c00ed7ee 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH386/_Parent.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH386/_Parent.cs @@ -6,7 +6,6 @@ // ReSharper disable InconsistentNaming namespace NHibernate.Test.NHSpecificTest.NH386 { - public class _Parent { public int _Id { get; set; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3909/Entity.cs b/src/NHibernate.Test/NHSpecificTest/NH3909/Entity.cs index e125c563256..d47d9f56b67 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3909/Entity.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3909/Entity.cs @@ -8,7 +8,6 @@ public class ParentEntity public virtual string Name { get; set; } } - public class ChildEntity { public virtual Guid Id { get; set; } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3909/FixtureByCode.cs b/src/NHibernate.Test/NHSpecificTest/NH3909/FixtureByCode.cs index 85112494612..33b21285a9b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3909/FixtureByCode.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3909/FixtureByCode.cs @@ -79,7 +79,6 @@ public void YourTestName() //select b; Assert.AreEqual(2, q.ToList().Count); - } } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3992/Entities.cs b/src/NHibernate.Test/NHSpecificTest/NH3992/Entities.cs index 635e1e0d6b7..9b2aee0cd0b 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3992/Entities.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3992/Entities.cs @@ -97,7 +97,6 @@ public class MappedExtension : UnmappedExtension public virtual string MappedExtensionField { get; set; } } - public class TopLevel : MappedExtension { public virtual string TopLevelExtensionField { get; set; } @@ -133,5 +132,4 @@ public class TopLevel : SecondUnmappedExtension public virtual string TopLevelExtensionField { get; set; } } } - } diff --git a/src/NHibernate.Test/NHSpecificTest/NH3992/FixtureByCode.cs b/src/NHibernate.Test/NHSpecificTest/NH3992/FixtureByCode.cs index 9702f8318d0..22a5cb3829a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3992/FixtureByCode.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3992/FixtureByCode.cs @@ -30,7 +30,6 @@ public void Test_MappedSubclass_AllMapsAtTopLevel() Assert.IsNotNull(extendedProperty, "Sub class mapping did not map extended (class not mapped) class property"); var topLevelProperty = targetMapping.Properties.SingleOrDefault(p => p.Name == "TopLevelField"); Assert.IsNotNull(topLevelProperty, "Sub class mapping did not map base class property"); - } [Test] @@ -54,7 +53,6 @@ public void Test_MappedJoinedSubclass_AllMapsAtTopLevel() Assert.IsNotNull(extendedProperty, "Sub class mapping did not map extended (class not mapped) class property"); var topLevelProperty = targetMapping.Properties.SingleOrDefault(p => p.Name == "TopLevelField"); Assert.IsNotNull(topLevelProperty, "Sub class mapping did not map base class property"); - } [Test] @@ -78,7 +76,6 @@ public void Test_MappedUnionSubclass_AllMapsAtTopLevel() Assert.IsNotNull(extendedProperty, "Sub class mapping did not map extended (class not mapped) class property"); var topLevelProperty = targetMapping.Properties.SingleOrDefault(p => p.Name == "TopLevelField"); Assert.IsNotNull(topLevelProperty, "Sub class mapping did not map base class property"); - } [Test] @@ -102,7 +99,6 @@ public void Test_MappedSubclassInterface_AllMapsAtTopLevel() Assert.IsNotNull(extendedProperty, "Sub class mapping did not map extended (class not mapped) class property"); var topLevelProperty = targetMapping.Properties.SingleOrDefault(p => p.Name == "TopLevelField"); Assert.IsNotNull(topLevelProperty, "Sub class mapping did not map base class property"); - } [Test] @@ -126,7 +122,6 @@ public void Test_MappedJoinedSubclassInterface_AllMapsAtTopLevel() Assert.IsNotNull(extendedProperty, "Sub class mapping did not map extended (class not mapped) class property"); var topLevelProperty = targetMapping.Properties.SingleOrDefault(p => p.Name == "TopLevelField"); Assert.IsNotNull(topLevelProperty, "Sub class mapping did not map base class property"); - } [Test] @@ -150,7 +145,6 @@ public void Test_MappedUnionSubclassInterface_AllMapsAtTopLevel() Assert.IsNotNull(extendedProperty, "Sub class mapping did not map extended (class not mapped) class property"); var topLevelProperty = targetMapping.Properties.SingleOrDefault(p => p.Name == "TopLevelField"); Assert.IsNotNull(topLevelProperty, "Sub class mapping did not map base class property"); - } [Test] diff --git a/src/NHibernate.Test/NHSpecificTest/NH3993/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3993/Fixture.cs index e90b611328f..4f5ff5684ea 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH3993/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH3993/Fixture.cs @@ -39,7 +39,6 @@ public void Test_MapPrivateComponentProperty_MapsCorrectly() // Component element component var componentMapping = elementMapping.Properties.SingleOrDefault(p => p.Name == "_component"); Assert.IsNotNull(componentMapping, "Component Element did not private component"); - } [Test] @@ -64,4 +63,4 @@ protected override HbmMapping GetMappings() return mapper.CompileMappingForAllExplicitlyAddedEntities(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH401/Club.cs b/src/NHibernate.Test/NHSpecificTest/NH401/Club.cs index abeb5e3cb6c..a200ac09269 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH401/Club.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH401/Club.cs @@ -10,7 +10,6 @@ public class Club private Boolean m_Freelpcmember; private DateTime m_Lastupdated; - public Club() { this.Active = true; @@ -49,4 +48,4 @@ public DateTime LastUpdated set { m_Lastupdated = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH401/Clubmember.cs b/src/NHibernate.Test/NHSpecificTest/NH401/Clubmember.cs index f1598c24855..6e75bdf4c49 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH401/Clubmember.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH401/Clubmember.cs @@ -29,7 +29,6 @@ public Decimal ProfileId set { m_ProfileId = value; } } - /*public Accountdistribution Accountdistribution { get @@ -138,4 +137,4 @@ public Decimal Withdrawlamount } }*/ } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH440/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH440/Fixture.cs index 144bd2e1f64..0e2637fcc88 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH440/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH440/Fixture.cs @@ -21,7 +21,6 @@ protected override bool AppliesTo(Dialect.Dialect dialect) return TestDialect.SupportsEmptyInsertsOrHasNonIdentityNativeGenerator; } - protected override void OnSetUp() { base.OnSetUp(); diff --git a/src/NHibernate.Test/NHSpecificTest/NH521/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH521/Fixture.cs index 2e99e3fd759..ad60cc6e1a8 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH521/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH521/Fixture.cs @@ -51,7 +51,6 @@ public void AttachUninitProxyCausesInit() NHibernateUtil.IsInitialized(uninitEntity), "session.GetCurrentLockMode() causes initialization of an unitialized entity."); - session.Delete("from System.Object"); transaction.Commit(); } diff --git a/src/NHibernate.Test/NHSpecificTest/NH646/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH646/Fixture.cs index 0ba58b356cc..989926d55e0 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH646/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH646/Fixture.cs @@ -62,7 +62,6 @@ public void PolicemenOrderedByRank() { var station = session.Query().Single(); - Assert.AreEqual(2, station.Policemen.Count()); Assert.That(station.Policemen, Is.Ordered.By("Name")); } diff --git a/src/NHibernate.Test/NHSpecificTest/NH681/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH681/Fixture.cs index b1b4d4a6c70..34cd7b0dc6f 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH681/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH681/Fixture.cs @@ -8,7 +8,6 @@ public class Fixture : BugTestCase { protected override void Configure(NHibernate.Cfg.Configuration cfg) { - } [Test] diff --git a/src/NHibernate.Test/NHSpecificTest/NH712/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH712/Fixture.cs index bc5d67e2f52..6ecc89c0ef1 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH712/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH712/Fixture.cs @@ -10,7 +10,7 @@ namespace NHibernate.Test.NHSpecificTest.NH712 //Fri, 15 Sep 2006 07:31:13 -0400 (EDT) //1.2.0.Alpha1 //Core - //http://nhibernate.jira.com/browse/NH-712 + //http://nhibernate.jira.com/browse/NH-712 [TestFixture] public class Fixture { diff --git a/src/NHibernate.Test/NHSpecificTest/NH719/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH719/Domain.cs index 2da737c0048..d11c1f26382 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH719/Domain.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH719/Domain.cs @@ -49,7 +49,6 @@ public virtual int Id set { id = value; } } - public virtual string Foo { get { return foo; } @@ -112,4 +111,4 @@ public object Owner set { owner = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs index fc62e5fb4fb..b45a4e2a2fc 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs @@ -12,7 +12,6 @@ namespace NHibernate.Test.NHSpecificTest.NH732 [TestFixture] public class Fixture : BugTestCase { - protected override bool AppliesTo(Dialect.Dialect dialect) { return dialect is MsSql2000Dialect; @@ -68,7 +67,6 @@ public System.Type ReturnedType get { return typeof (string); } } - public new bool Equals(object x, object y) { return StringComparer.InvariantCultureIgnoreCase.Equals((string)x, (string)y); diff --git a/src/NHibernate.Test/NHSpecificTest/NH898/ClassC.cs b/src/NHibernate.Test/NHSpecificTest/NH898/ClassC.cs index 2c34052881d..670e9fc5f8e 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH898/ClassC.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH898/ClassC.cs @@ -4,6 +4,5 @@ namespace NHibernate.Test.NHSpecificTest.NH898 { public class ClassC : ClassBParent { - } } diff --git a/src/NHibernate.Test/NHSpecificTest/NH930/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH930/Model.cs index bc1dd419649..d2439c834ea 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH930/Model.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH930/Model.cs @@ -28,5 +28,4 @@ public class NConditionalUDV : NVariable public class NFilterUDV : NVariable { } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/NHSpecificTest/NH995/LogPlugin.cs b/src/NHibernate.Test/NHSpecificTest/NH995/LogPlugin.cs index 4a29c696707..2b9f50d881a 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH995/LogPlugin.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH995/LogPlugin.cs @@ -7,7 +7,6 @@ public class LogPlugin : IPlugin { public void Attach(ILoggerRepository repository) { - } public void Shutdown() diff --git a/src/NHibernate.Test/NHSpecificTest/ProxyValidator/ShouldBeProxiableTests.cs b/src/NHibernate.Test/NHSpecificTest/ProxyValidator/ShouldBeProxiableTests.cs index 8e15f8419d3..1a6fe621ccd 100644 --- a/src/NHibernate.Test/NHSpecificTest/ProxyValidator/ShouldBeProxiableTests.cs +++ b/src/NHibernate.Test/NHSpecificTest/ProxyValidator/ShouldBeProxiableTests.cs @@ -12,7 +12,6 @@ private class MyClass: IDisposable { public void Dispose() { - } } private class ProtectedNoVirtualProperty diff --git a/src/NHibernate.Test/NHSpecificTest/SimpleComponentFixture.cs b/src/NHibernate.Test/NHSpecificTest/SimpleComponentFixture.cs index 8e7c0bef0b6..eb0becc55ca 100644 --- a/src/NHibernate.Test/NHSpecificTest/SimpleComponentFixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/SimpleComponentFixture.cs @@ -37,7 +37,6 @@ protected override void OnSetUp() simpleComp.Audit.UpdatedDate = DateTime.Now; simpleComp.Audit.UpdatedUserId = "TestUpdated"; - s.Save(simpleComp, 10L); t.Commit(); @@ -53,7 +52,6 @@ protected override void OnTearDown() } } - [Test] public void TestLoad() { diff --git a/src/NHibernate.Test/Naturalid/Mutable/MutableNaturalIdFixture.cs b/src/NHibernate.Test/Naturalid/Mutable/MutableNaturalIdFixture.cs index c773e309ebf..216735a64ad 100644 --- a/src/NHibernate.Test/Naturalid/Mutable/MutableNaturalIdFixture.cs +++ b/src/NHibernate.Test/Naturalid/Mutable/MutableNaturalIdFixture.cs @@ -216,7 +216,6 @@ public void NaturalIdCache() t.Commit(); s.Close(); - s = OpenSession(); t = s.BeginTransaction(); s.Delete("from User"); @@ -247,4 +246,4 @@ public void Querying() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/ObjectAssertion.cs b/src/NHibernate.Test/ObjectAssertion.cs index c74d55db065..5c7e03eab71 100644 --- a/src/NHibernate.Test/ObjectAssertion.cs +++ b/src/NHibernate.Test/ObjectAssertion.cs @@ -24,7 +24,6 @@ internal static void AreEqual(ISet expected, ISet actual) } } - /// /// Compares one dimensional arrays for equality. /// @@ -59,7 +58,6 @@ internal static void AreEqual(IList expected, IList actual, bool indexM } } - /// /// /// @@ -78,7 +76,6 @@ internal static void AreEqual(IDictionary expected, IDi } } - [Test] public void TestIDictionaryEqual() { @@ -94,7 +91,6 @@ public void TestIDictionaryEqual() AreEqual(expected, actualWithEqualValues, true); } - public static void AreEqual(DateTime expected, DateTime actual, bool useMilliseconds) { Assert.AreEqual(expected.Year, actual.Year, "Year"); @@ -107,4 +103,4 @@ public static void AreEqual(DateTime expected, DateTime actual, bool useMillisec Assert.AreEqual(expected.Millisecond, actual.Millisecond, "Millisecond"); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Pagination/CustomDialectFixture.cs b/src/NHibernate.Test/Pagination/CustomDialectFixture.cs index aedcceba788..3d0e571ae9a 100644 --- a/src/NHibernate.Test/Pagination/CustomDialectFixture.cs +++ b/src/NHibernate.Test/Pagination/CustomDialectFixture.cs @@ -68,7 +68,6 @@ protected override void OnSetUp() protected override void OnTearDown() { - using (ISession s = OpenSession()) using (ITransaction t = s.BeginTransaction()) { diff --git a/src/NHibernate.Test/PolymorphicGetAndLoad/Domain.cs b/src/NHibernate.Test/PolymorphicGetAndLoad/Domain.cs index 0dcad23004b..c94613335ab 100644 --- a/src/NHibernate.Test/PolymorphicGetAndLoad/Domain.cs +++ b/src/NHibernate.Test/PolymorphicGetAndLoad/Domain.cs @@ -37,5 +37,4 @@ public interface IMultiGraphNamed { string Name { get; set; } } - -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs b/src/NHibernate.Test/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs index 82e1cc4286a..0c586ad49b6 100644 --- a/src/NHibernate.Test/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs +++ b/src/NHibernate.Test/PolymorphicGetAndLoad/PolymorphicGetAndLoadTest.cs @@ -102,7 +102,6 @@ public void WhenSaveDeleteBaseClassCastedToInterfaceThenNotThrows() s.Flush(); } }, Throws.Nothing); - } [Test] diff --git a/src/NHibernate.Test/ProjectionFixtures/Fixture.cs b/src/NHibernate.Test/ProjectionFixtures/Fixture.cs index dd791b2909a..1f3aad19d54 100644 --- a/src/NHibernate.Test/ProjectionFixtures/Fixture.cs +++ b/src/NHibernate.Test/ProjectionFixtures/Fixture.cs @@ -64,7 +64,6 @@ protected override void OnTearDown() } } - [Test] public void ErrorFromDBWillGiveTheActualSQLExecuted() { @@ -89,7 +88,6 @@ public void ErrorFromDBWillGiveTheActualSQLExecuted() .Add(Projections.Count("child.Key.Area")) ); - var e = Assert.Throws(() => { using (var s = Sfi.OpenSession()) diff --git a/src/NHibernate.Test/PropertyRef/B.cs b/src/NHibernate.Test/PropertyRef/B.cs index 6c3a7299261..6e40d0b3720 100644 --- a/src/NHibernate.Test/PropertyRef/B.cs +++ b/src/NHibernate.Test/PropertyRef/B.cs @@ -18,6 +18,5 @@ public virtual string Name get { return _name; } set { _name = value; } } - - } -} \ No newline at end of file + } +} diff --git a/src/NHibernate.Test/PropertyRef/KeyPropertyRefFixture.cs b/src/NHibernate.Test/PropertyRef/KeyPropertyRefFixture.cs index 2ec67edbaef..35fcf33a53b 100644 --- a/src/NHibernate.Test/PropertyRef/KeyPropertyRefFixture.cs +++ b/src/NHibernate.Test/PropertyRef/KeyPropertyRefFixture.cs @@ -52,7 +52,6 @@ public void PropertyRefUsesOtherColumn() Assert.AreEqual(1, newA.Items.Count); s.Close(); - } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/PropertyTest/FieldClass.cs b/src/NHibernate.Test/PropertyTest/FieldClass.cs index ef518c0e3ce..0bb70cb783e 100644 --- a/src/NHibernate.Test/PropertyTest/FieldClass.cs +++ b/src/NHibernate.Test/PropertyTest/FieldClass.cs @@ -89,7 +89,6 @@ public int CamelUnderscoreFoo } } - public int Blah { get @@ -144,4 +143,4 @@ public int CamelMUnderscore } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/QueryTest/DetachedQueryFixture.cs b/src/NHibernate.Test/QueryTest/DetachedQueryFixture.cs index f55c3298b54..cca72466183 100644 --- a/src/NHibernate.Test/QueryTest/DetachedQueryFixture.cs +++ b/src/NHibernate.Test/QueryTest/DetachedQueryFixture.cs @@ -443,7 +443,6 @@ public void Serializable() [Test, Explicit] public void PerformanceDiffSimplyQuery() { - DateTime sDQStart = DateTime.Now; DetachedQuery dq = new DetachedQuery("from Foo f where f.Name=:pn and f.Description=:pd"); dq.SetString("pn", "N2").SetString("pd", "D2"); @@ -460,7 +459,6 @@ public void PerformanceDiffSimplyQuery() } DateTime sQStop = DateTime.Now; - Console.WriteLine("DetachedQueryCycle={0} QueryCycl={1} Diff={2}", sDQStop - sDQStart, sQStop - sQStart, (sDQStop - sDQStart) - (sQStop - sQStart)); } diff --git a/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs b/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs index a2bfc7887c0..2b170b95905 100644 --- a/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs +++ b/src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs @@ -544,7 +544,6 @@ public void MultiCriteriaAutoFlush() tx.Commit(); Assert.That(count, Is.EqualTo(0), "Session wasn't auto flushed."); - } } } diff --git a/src/NHibernate.Test/QueryTest/QueryBatchFixture.cs b/src/NHibernate.Test/QueryTest/QueryBatchFixture.cs index 29a901c452f..f28c0af8dce 100644 --- a/src/NHibernate.Test/QueryTest/QueryBatchFixture.cs +++ b/src/NHibernate.Test/QueryTest/QueryBatchFixture.cs @@ -479,7 +479,6 @@ public void TwoMultiHqlWithDifferentPagingGetDifferentResultsWhenUsingCachedQuer [Test] public void CanUseSecondLevelCacheWithPositionalParametersAndHql() { - Sfi.QueryCache.Clear(); CreateItems(); @@ -763,7 +762,6 @@ public void TwoMultiQueriesWithDifferentPagingGetDifferentResultsWhenUsingCached [Test] public void CanUseSecondLevelCacheWithPositionalParameters() { - Sfi.QueryCache.Clear(); CreateItems(); diff --git a/src/NHibernate.Test/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs b/src/NHibernate.Test/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs index dbb628f9556..ad33891ee36 100644 --- a/src/NHibernate.Test/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs +++ b/src/NHibernate.Test/ReadOnly/ReadOnlySessionLazyNonLazyTest.cs @@ -273,7 +273,6 @@ public void ExistingReadOnlyAfterSetSessionModifiable() [Test] public void ExistingReadOnlyAfterSetSessionModifiableExisting() { - Container cOrig = CreateContainer(); ISet expectedInitializedObjects = new HashSet( @@ -365,13 +364,11 @@ public void ExistingReadOnlyAfterSetSessionModifiableExisting() s.CreateQuery("delete from Owner").ExecuteUpdate(); t.Commit(); s.Close(); - } [Test] public void ExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnly() { - Container cOrig = CreateContainer(); ISet expectedInitializedObjects = new HashSet( @@ -472,7 +469,6 @@ public void ExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnly() [Test] public void ExistingReadOnlyAfterSetSessionModifiableProxyExisting() { - Container cOrig = CreateContainer(); ISet expectedInitializedObjects = new HashSet( @@ -565,7 +561,6 @@ public void ExistingReadOnlyAfterSetSessionModifiableProxyExisting() s.CreateQuery("delete from Owner").ExecuteUpdate(); t.Commit(); s.Close(); - } [Test] @@ -1387,8 +1382,7 @@ public void DefaultModifiableWithFilterCollectionEntities() t.Commit(); s.Close(); } - - + private Container CreateContainer() { Container c = new Container("container"); diff --git a/src/NHibernate.Test/ReadOnly/ReadOnlySessionTest.cs b/src/NHibernate.Test/ReadOnly/ReadOnlySessionTest.cs index ee7029a6559..a5d01ebd78e 100644 --- a/src/NHibernate.Test/ReadOnly/ReadOnlySessionTest.cs +++ b/src/NHibernate.Test/ReadOnly/ReadOnlySessionTest.cs @@ -1079,7 +1079,6 @@ public void MergeWithReadOnlyEntity() t.Commit(); } } - } [Test] diff --git a/src/NHibernate.Test/ReadOnly/TextHolder.cs b/src/NHibernate.Test/ReadOnly/TextHolder.cs index f0561a59d5d..e367f379710 100644 --- a/src/NHibernate.Test/ReadOnly/TextHolder.cs +++ b/src/NHibernate.Test/ReadOnly/TextHolder.cs @@ -13,7 +13,6 @@ public static bool SupportedForDialect(Dialect.Dialect dialect) return !(dialect is FirebirdDialect || dialect is Oracle8iDialect || dialect is MsSqlCeDialect || dialect is HanaRowStoreDialect); } - private long id; private string theText; diff --git a/src/NHibernate.Test/ReflectionOptimizerTest/LcgFixture.cs b/src/NHibernate.Test/ReflectionOptimizerTest/LcgFixture.cs index e248515cfc3..06ece20f721 100644 --- a/src/NHibernate.Test/ReflectionOptimizerTest/LcgFixture.cs +++ b/src/NHibernate.Test/ReflectionOptimizerTest/LcgFixture.cs @@ -94,6 +94,5 @@ public void TestGetterTypeMismatch() Assert.AreEqual("str", values[0]); } - } } diff --git a/src/NHibernate.Test/SecondLevelCacheTest/AnotherItem.cs b/src/NHibernate.Test/SecondLevelCacheTest/AnotherItem.cs index d91e0e3df59..5442c9599b4 100644 --- a/src/NHibernate.Test/SecondLevelCacheTest/AnotherItem.cs +++ b/src/NHibernate.Test/SecondLevelCacheTest/AnotherItem.cs @@ -8,7 +8,6 @@ public class AnotherItem public AnotherItem() { - } public AnotherItem(string name) @@ -34,4 +33,4 @@ public virtual string Description set { description = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs b/src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs index 47b6d76d2bd..3acc648ac64 100644 --- a/src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs +++ b/src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs @@ -92,7 +92,6 @@ public void InvalidatesEntities() tx.Commit(); } - //Update Item using LINQ using (var tx = session.BeginTransaction()) { diff --git a/src/NHibernate.Test/SqlCommandTest/SqlDeleteBuilderFixture.cs b/src/NHibernate.Test/SqlCommandTest/SqlDeleteBuilderFixture.cs index 746345cbdc8..b3c69b13db5 100644 --- a/src/NHibernate.Test/SqlCommandTest/SqlDeleteBuilderFixture.cs +++ b/src/NHibernate.Test/SqlCommandTest/SqlDeleteBuilderFixture.cs @@ -25,7 +25,6 @@ public void DeleteSqlStringTest() delete.SetTableName("test_delete_builder"); - delete.SetIdentityColumn(new string[] {"decimalColumn"}, NHibernateUtil.Decimal); delete.SetVersionColumn(new string[] {"versionColumn"}, (IVersionType) NHibernateUtil.Int32); @@ -43,4 +42,4 @@ public void DeleteSqlStringTest() Assert.AreEqual(SqlTypeFactory.Int32, actualParameterTypes[1], "secondParam Type"); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs b/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs index 901b2cea983..e15e947780c 100644 --- a/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs +++ b/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs @@ -44,7 +44,6 @@ public void SelectStringSqlTest() .Append("ORDER BY column1 DESC") .ToString(); - Assert.AreEqual(expectedSql, sqlString.ToString(), "SQL String"); Assert.AreEqual(1, sqlString.GetParameterCount(), "One parameter"); } diff --git a/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs b/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs index 1fa2aa19df0..361b2b1525e 100644 --- a/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs +++ b/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs @@ -13,7 +13,6 @@ namespace NHibernate.Test.SqlCommandTest [TestFixture] public class SqlStringFixture { - //[Test] //public void StringPerf() //{ @@ -35,7 +34,6 @@ public class SqlStringFixture // } // Console.WriteLine("Substring average per 10000 iters (ms): " + allSub.Average()); - // double[] allTrim = new double[5]; // for (int a = 0; a < 5; ++a) // { @@ -50,7 +48,6 @@ public class SqlStringFixture // Console.WriteLine("Trim average per 10000 iters (ms): " + allTrim.Average()); //} - [Test] public void Append() { @@ -343,7 +340,6 @@ public void Parse() Assert.AreEqual(SqlString.Empty, SqlString.Parse("")); } - [Test] public void GetSubselectStringSimple() { @@ -441,7 +437,6 @@ public void ParameterPropertyShouldReturnNewInstances() Assert.That(Parameter.Placeholder, Is.Not.SameAs(Parameter.Placeholder)); } - [Test] public void HashcodeEqualForEqualStringsWithDifferentHistory() { diff --git a/src/NHibernate.Test/SqlTest/Custom/CustomSQLSupportTest.cs b/src/NHibernate.Test/SqlTest/Custom/CustomSQLSupportTest.cs index 62dc09ddb02..8ee760763c3 100644 --- a/src/NHibernate.Test/SqlTest/Custom/CustomSQLSupportTest.cs +++ b/src/NHibernate.Test/SqlTest/Custom/CustomSQLSupportTest.cs @@ -81,6 +81,5 @@ public void HandSQL() t.Commit(); s.Close(); } - } } diff --git a/src/NHibernate.Test/SqlTest/Custom/CustomStoredProcSupportTest.cs b/src/NHibernate.Test/SqlTest/Custom/CustomStoredProcSupportTest.cs index 0ab1cc0c2f9..73bb920d571 100644 --- a/src/NHibernate.Test/SqlTest/Custom/CustomStoredProcSupportTest.cs +++ b/src/NHibernate.Test/SqlTest/Custom/CustomStoredProcSupportTest.cs @@ -69,6 +69,5 @@ public void EntityStoredProcedure() t.Commit(); s.Close(); } - } } diff --git a/src/NHibernate.Test/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs b/src/NHibernate.Test/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs index 5adedf4a81c..70fcd1d47e3 100644 --- a/src/NHibernate.Test/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs +++ b/src/NHibernate.Test/SqlTest/Custom/Oracle/OracleCustomSQLFixture.cs @@ -55,6 +55,5 @@ public void RefCursorOutStoredProcedure() t.Commit(); s.Close(); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/SqlTest/Query/NativeSQLQueriesFixture.cs b/src/NHibernate.Test/SqlTest/Query/NativeSQLQueriesFixture.cs index 87c646e8fde..7804f6fb2f9 100644 --- a/src/NHibernate.Test/SqlTest/Query/NativeSQLQueriesFixture.cs +++ b/src/NHibernate.Test/SqlTest/Query/NativeSQLQueriesFixture.cs @@ -536,7 +536,6 @@ public void AutoDetectAliasing() AssertClassAssignability(o[0].GetType(), typeof(long)); AssertClassAssignability(o[1].GetType(), typeof(Employment)); - IQuery queryWithCollection = s.GetNamedQuery("organizationEmploymentsExplicitAliases"); queryWithCollection.SetInt64("id", jboss.Id); list = queryWithCollection.List(); diff --git a/src/NHibernate.Test/Stateless/Fetching/Resource.cs b/src/NHibernate.Test/Stateless/Fetching/Resource.cs index c54f168849b..662042a4e93 100644 --- a/src/NHibernate.Test/Stateless/Fetching/Resource.cs +++ b/src/NHibernate.Test/Stateless/Fetching/Resource.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.Stateless.Fetching { public class Resource diff --git a/src/NHibernate.Test/Stateless/Fetching/StatelessSessionFetchingTest.cs b/src/NHibernate.Test/Stateless/Fetching/StatelessSessionFetchingTest.cs index b0f7c91a4d9..5ca6ddd6ff3 100644 --- a/src/NHibernate.Test/Stateless/Fetching/StatelessSessionFetchingTest.cs +++ b/src/NHibernate.Test/Stateless/Fetching/StatelessSessionFetchingTest.cs @@ -71,5 +71,4 @@ private void cleanup() } } } - } diff --git a/src/NHibernate.Test/Stateless/Fetching/Task.cs b/src/NHibernate.Test/Stateless/Fetching/Task.cs index 8d7b06f8f6d..698bae0dd43 100644 --- a/src/NHibernate.Test/Stateless/Fetching/Task.cs +++ b/src/NHibernate.Test/Stateless/Fetching/Task.cs @@ -1,6 +1,5 @@ using System; - namespace NHibernate.Test.Stateless.Fetching { public class Task @@ -45,7 +44,6 @@ public virtual long? Id } } - public virtual User User { get @@ -59,7 +57,6 @@ public virtual User User } } - public virtual Resource Resource { get @@ -73,7 +70,6 @@ public virtual Resource Resource } } - public virtual string Description { get @@ -87,7 +83,6 @@ public virtual string Description } } - public virtual DateTime DueDate { get @@ -101,7 +96,6 @@ public virtual DateTime DueDate } } - public virtual DateTime? StartDate { get @@ -115,7 +109,6 @@ public virtual DateTime? StartDate } } - public virtual DateTime? CompletionDate { get @@ -128,7 +121,5 @@ public virtual DateTime? CompletionDate this.completionDate = value; } } - } - } diff --git a/src/NHibernate.Test/Stateless/Fetching/User.cs b/src/NHibernate.Test/Stateless/Fetching/User.cs index 6d4a961ec54..78c6472336e 100644 --- a/src/NHibernate.Test/Stateless/Fetching/User.cs +++ b/src/NHibernate.Test/Stateless/Fetching/User.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Test.Stateless.Fetching { public class User @@ -40,6 +39,5 @@ public virtual string Name this.name = value; } } - } } diff --git a/src/NHibernate.Test/Stateless/StatelessWithRelationsFixture.cs b/src/NHibernate.Test/Stateless/StatelessWithRelationsFixture.cs index 7f181c6d029..331d01efd2f 100644 --- a/src/NHibernate.Test/Stateless/StatelessWithRelationsFixture.cs +++ b/src/NHibernate.Test/Stateless/StatelessWithRelationsFixture.cs @@ -86,6 +86,5 @@ public void ShouldWorkLoadingComplexEntities() tx.Commit(); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Stateless/TreeNode.cs b/src/NHibernate.Test/Stateless/TreeNode.cs index ca8614036cc..5afbfdd7b22 100644 --- a/src/NHibernate.Test/Stateless/TreeNode.cs +++ b/src/NHibernate.Test/Stateless/TreeNode.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - namespace NHibernate.Test.Stateless { public class TreeNode diff --git a/src/NHibernate.Test/SystemTransactions/ResourceManagerFixture.cs b/src/NHibernate.Test/SystemTransactions/ResourceManagerFixture.cs index 0550fc5c08a..3e278f8d8a8 100644 --- a/src/NHibernate.Test/SystemTransactions/ResourceManagerFixture.cs +++ b/src/NHibernate.Test/SystemTransactions/ResourceManagerFixture.cs @@ -582,7 +582,6 @@ public void NonDistributedRollback([Values(false, true)] bool fromConnection, [V } else _log.Info("Scope not completed for triggering rollback"); - } } catch (TransactionAbortedException) diff --git a/src/NHibernate.Test/SystemTransactions/TransactionNotificationFixture.cs b/src/NHibernate.Test/SystemTransactions/TransactionNotificationFixture.cs index 5ac3276bb0f..0d75a8d6860 100644 --- a/src/NHibernate.Test/SystemTransactions/TransactionNotificationFixture.cs +++ b/src/NHibernate.Test/SystemTransactions/TransactionNotificationFixture.cs @@ -70,7 +70,6 @@ public void Complete() session.Dispose(); Assert.AreEqual(1, interceptor.beforeTransactionCompletionCalled); Assert.AreEqual(1, interceptor.afterTransactionCompletionCalled); - } [Test] @@ -125,7 +124,6 @@ public void OneTransactionScopesInsideOneSession() Assert.AreEqual(1, interceptor.afterTransactionCompletionCalled); } - [Description("NH2128, NH3572")] [Theory] public void ShouldNotifyAfterDistributedTransaction(bool doCommit) diff --git a/src/NHibernate.Test/TestDialect.cs b/src/NHibernate.Test/TestDialect.cs index 68cc20c26b8..c62c4a7cb28 100644 --- a/src/NHibernate.Test/TestDialect.cs +++ b/src/NHibernate.Test/TestDialect.cs @@ -98,7 +98,6 @@ public bool NativeGeneratorSupportsBulkInsertion public bool SupportsEmptyInsertsOrHasNonIdentityNativeGenerator => SupportsEmptyInserts || !HasIdentityNativeGenerator; - /// /// Supports condition not bound to any data, like "where @p1 = @p2". /// diff --git a/src/NHibernate.Test/Tools/hbm2ddl/SchemaUpdate/Version.cs b/src/NHibernate.Test/Tools/hbm2ddl/SchemaUpdate/Version.cs index 5c6bb6610ec..05c09712892 100644 --- a/src/NHibernate.Test/Tools/hbm2ddl/SchemaUpdate/Version.cs +++ b/src/NHibernate.Test/Tools/hbm2ddl/SchemaUpdate/Version.cs @@ -25,7 +25,6 @@ public virtual string Description set { description = value; } } - public virtual Version Previous { get { return previous; } diff --git a/src/NHibernate.Test/TypedManyToOne/Address.cs b/src/NHibernate.Test/TypedManyToOne/Address.cs index 95fb87baccc..5cb79290600 100644 --- a/src/NHibernate.Test/TypedManyToOne/Address.cs +++ b/src/NHibernate.Test/TypedManyToOne/Address.cs @@ -5,7 +5,7 @@ namespace NHibernate.Test.TypedManyToOne [Serializable] public class Address { - public virtual AddressId AddressId {get; set;} + public virtual AddressId AddressId {get; set; } public virtual string Street { get; set; } public virtual string City { get; set; } public virtual string State { get; set; } diff --git a/src/NHibernate.Test/TypedManyToOne/Customer.cs b/src/NHibernate.Test/TypedManyToOne/Customer.cs index d4e6d3f63f6..67b0a402096 100644 --- a/src/NHibernate.Test/TypedManyToOne/Customer.cs +++ b/src/NHibernate.Test/TypedManyToOne/Customer.cs @@ -6,8 +6,8 @@ namespace NHibernate.Test.TypedManyToOne public class Customer { public virtual string CustomerId { get; set; } - public virtual string Name {get; set;} - public virtual Address BillingAddress {get; set;} - public virtual Address ShippingAddress {get; set;} + public virtual string Name {get; set; } + public virtual Address BillingAddress {get; set; } + public virtual Address ShippingAddress {get; set; } } } diff --git a/src/NHibernate.Test/TypesTest/CurrencyTypeFixture.cs b/src/NHibernate.Test/TypesTest/CurrencyTypeFixture.cs index 8eacc215bda..fd4f81cd660 100644 --- a/src/NHibernate.Test/TypesTest/CurrencyTypeFixture.cs +++ b/src/NHibernate.Test/TypesTest/CurrencyTypeFixture.cs @@ -66,6 +66,5 @@ public void UnsavedValue() Assert.AreEqual(0m, mappedValue); Assert.IsTrue(type.IsEqual(mappedValue, 0m), "'0' in the mapping file should have been converted to a 0m"); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/TypesTest/EnumCharClass.cs b/src/NHibernate.Test/TypesTest/EnumCharClass.cs index 2d3ee8e2a4e..e256c8cba15 100644 --- a/src/NHibernate.Test/TypesTest/EnumCharClass.cs +++ b/src/NHibernate.Test/TypesTest/EnumCharClass.cs @@ -28,7 +28,6 @@ public enum SampleCharEnum Dimmed = 'D' } - public class EnumCharFoo { private Int32 id; @@ -59,4 +58,4 @@ public virtual SampleCharEnum Type set { type = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/TypesTest/EnumCharTypeFixture.cs b/src/NHibernate.Test/TypesTest/EnumCharTypeFixture.cs index b8cb3881564..1528b3b5931 100644 --- a/src/NHibernate.Test/TypesTest/EnumCharTypeFixture.cs +++ b/src/NHibernate.Test/TypesTest/EnumCharTypeFixture.cs @@ -14,7 +14,6 @@ protected override string TypeName protected override void OnSetUp() { - EnumCharClass basic = new EnumCharClass(); basic.Id = 1; basic.EnumValue = SampleCharEnum.Dimmed; @@ -143,4 +142,4 @@ public void CanBeUsedAsDiscriminator() } } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/TypesTest/EnumStringTypeFixture.cs b/src/NHibernate.Test/TypesTest/EnumStringTypeFixture.cs index 3b5bbb32ddf..ca3a07797df 100644 --- a/src/NHibernate.Test/TypesTest/EnumStringTypeFixture.cs +++ b/src/NHibernate.Test/TypesTest/EnumStringTypeFixture.cs @@ -37,7 +37,6 @@ protected override void OnTearDown() s.Close(); } - [Test] public void ReadFromLoad() { @@ -88,4 +87,4 @@ public void ReadFromQuery() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/TypesTest/GenericEnumStringTypeFixture.cs b/src/NHibernate.Test/TypesTest/GenericEnumStringTypeFixture.cs index 4e7586a86d8..ea64fc18a2c 100644 --- a/src/NHibernate.Test/TypesTest/GenericEnumStringTypeFixture.cs +++ b/src/NHibernate.Test/TypesTest/GenericEnumStringTypeFixture.cs @@ -39,7 +39,6 @@ protected override void OnTearDown() s.Close(); } - [Test] public void ReadFromLoad() { diff --git a/src/NHibernate.Test/TypesTest/PersistentEnumTypeFixture.cs b/src/NHibernate.Test/TypesTest/PersistentEnumTypeFixture.cs index f950e3326cf..b2a20b042be 100644 --- a/src/NHibernate.Test/TypesTest/PersistentEnumTypeFixture.cs +++ b/src/NHibernate.Test/TypesTest/PersistentEnumTypeFixture.cs @@ -37,7 +37,6 @@ protected override void OnSetUp() p = new PersistentEnumClass(1, A.One, B.Two); } - [Test] public void EqualsTrue() { @@ -146,4 +145,4 @@ public void TheNameShouldBeFullNameAndAssembly() Assert.That(enumType.Name, Is.EqualTo(typeof(EnumType).FullName + ", NHibernate")); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/TypesTest/TypeFactoryFixture.cs b/src/NHibernate.Test/TypesTest/TypeFactoryFixture.cs index b7b870d3f43..33bfe99a710 100644 --- a/src/NHibernate.Test/TypesTest/TypeFactoryFixture.cs +++ b/src/NHibernate.Test/TypesTest/TypeFactoryFixture.cs @@ -59,7 +59,6 @@ public void GetNullableGeneric() Assert.AreEqual( int64Type, TypeFactory.HeuristicType( reflectedType ), "using System.Type should return nh Int64Type" ); Assert.AreEqual( int64Type, TypeFactory.HeuristicType( reflectedType.AssemblyQualifiedName ), "using AQN should return nh Int64Type" ); Assert.AreEqual( int64Type, TypeFactory.HeuristicType( reflectedType.FullName ), "using FullName should return nh Int64Type" ); - } public class GenericPropertyClass diff --git a/src/NHibernate.Test/TypesTest/UriTypeFixture.cs b/src/NHibernate.Test/TypesTest/UriTypeFixture.cs index 2a7c740362f..92ebbe5b389 100644 --- a/src/NHibernate.Test/TypesTest/UriTypeFixture.cs +++ b/src/NHibernate.Test/TypesTest/UriTypeFixture.cs @@ -41,7 +41,6 @@ public void ReadWrite() } } - [Test(Description = "NH-2887")] public void ReadWriteRelativeUri() { @@ -98,6 +97,5 @@ public void AutoDiscoverFromNetType() var propertyType = Sfi.GetEntityPersister(typeof(UriClass).FullName).GetPropertyType("AutoUri"); Assert.That(propertyType, Is.InstanceOf()); } - } } diff --git a/src/NHibernate.Test/Unionsubclass/Being.cs b/src/NHibernate.Test/Unionsubclass/Being.cs index 2c52d611cc4..7e0115c1ff6 100644 --- a/src/NHibernate.Test/Unionsubclass/Being.cs +++ b/src/NHibernate.Test/Unionsubclass/Being.cs @@ -45,6 +45,5 @@ public virtual string Species get { return null; } set { throw new System.NotSupportedException(); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/Unionsubclass2/Person.cs b/src/NHibernate.Test/Unionsubclass2/Person.cs index 4db67a177df..7c8f343c5b3 100644 --- a/src/NHibernate.Test/Unionsubclass2/Person.cs +++ b/src/NHibernate.Test/Unionsubclass2/Person.cs @@ -29,6 +29,5 @@ public virtual Address Address { get { return address; } } - } } diff --git a/src/NHibernate.Test/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs b/src/NHibernate.Test/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs index b1c9ede3ca1..d730dbb8f39 100644 --- a/src/NHibernate.Test/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs +++ b/src/NHibernate.Test/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs @@ -37,7 +37,6 @@ public void QueryOverPersonTest() s.Delete(result); t.Commit(); } - } } @@ -58,7 +57,6 @@ public void QueryOverCompanyTest() var result = s.QueryOver().Where(p => p.Name == "Limited").SingleOrDefault(); Assert.NotNull(result); } - } } } diff --git a/src/NHibernate.Test/UserCollection/Parameterized/IDefaultableList.cs b/src/NHibernate.Test/UserCollection/Parameterized/IDefaultableList.cs index ead6c69a985..846d4043467 100644 --- a/src/NHibernate.Test/UserCollection/Parameterized/IDefaultableList.cs +++ b/src/NHibernate.Test/UserCollection/Parameterized/IDefaultableList.cs @@ -4,6 +4,6 @@ namespace NHibernate.Test.UserCollection.Parameterized { public interface IDefaultableList : IList { - string DefaultValue { get;} + string DefaultValue { get; } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/UserCollection/UserCollectionTypeTest.cs b/src/NHibernate.Test/UserCollection/UserCollectionTypeTest.cs index 8066ee6b1d4..f2fb3950fc2 100644 --- a/src/NHibernate.Test/UserCollection/UserCollectionTypeTest.cs +++ b/src/NHibernate.Test/UserCollection/UserCollectionTypeTest.cs @@ -17,7 +17,6 @@ protected override string[] Mappings get { return new string[] {"UserCollection.UserPermissions.hbm.xml"}; } } - [Test] public void BasicOperation() { @@ -40,4 +39,4 @@ public void BasicOperation() s.Close(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/UtilityTest/IdentityMapFixture.cs b/src/NHibernate.Test/UtilityTest/IdentityMapFixture.cs index a5d9250f84a..8b11a385ff8 100644 --- a/src/NHibernate.Test/UtilityTest/IdentityMapFixture.cs +++ b/src/NHibernate.Test/UtilityTest/IdentityMapFixture.cs @@ -191,7 +191,6 @@ public void ContainsDiffObjectWithEquals() Assert.IsFalse(map.Contains(item2), "Even though item1.Equals(item2) IdentityMap should not find by item2"); } - /// /// Add the same MutableHashCode class twice and ensure there is only /// one item in the IdentityMap. @@ -272,4 +271,4 @@ public void MethodMissingException() RuntimeHelpers.GetHashCode(new object()); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/UtilityTest/IdentitySetFixture.cs b/src/NHibernate.Test/UtilityTest/IdentitySetFixture.cs index 979aa07ebe2..be9ce7362d4 100644 --- a/src/NHibernate.Test/UtilityTest/IdentitySetFixture.cs +++ b/src/NHibernate.Test/UtilityTest/IdentitySetFixture.cs @@ -58,7 +58,6 @@ public void AddNoHashCode() Assert.AreEqual(1, set.Count, "The item was added succesfully"); } - /// /// An IdentityMap can not use a ValueType as the Key because of the boxing/unboxing /// that occurs with them. This verifies that an Exception is thrown if a ValueType @@ -134,7 +133,6 @@ public void ContainsDiffObjectWithEquals() Assert.IsFalse(map.Contains(item2), "Even though item1.Equals(item2) IdentitySet should not find by item2"); } - /// /// Add the same MutableHashCode class twice and ensure there is only /// one item in the IdentitySet. @@ -178,6 +176,5 @@ public void SetItemsEqualHashCodeDiffIdentity() Assert.AreEqual(2, actualSet.Count, "The IdentityMap should have 2 elements"); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/UtilityTest/JoinedEnumerableFixture.cs b/src/NHibernate.Test/UtilityTest/JoinedEnumerableFixture.cs index 678f728332b..c037121dc7c 100644 --- a/src/NHibernate.Test/UtilityTest/JoinedEnumerableFixture.cs +++ b/src/NHibernate.Test/UtilityTest/JoinedEnumerableFixture.cs @@ -123,7 +123,6 @@ private void WrapsMultipleBreak(int breakIndex) Assert.IsTrue(second.WasDisposed, "second should have been disposed of. "); } - private JoinedEnumerable InitSingle(out EnumerableTester first) { first = new EnumerableTester(new ArrayList(new int[] {1, 2, 3})); @@ -211,4 +210,4 @@ public void Dispose() #endregion } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/UtilityTest/JoinedEnumerableGenericFixture.cs b/src/NHibernate.Test/UtilityTest/JoinedEnumerableGenericFixture.cs index c8e5e3a8d56..d3acabd74c7 100644 --- a/src/NHibernate.Test/UtilityTest/JoinedEnumerableGenericFixture.cs +++ b/src/NHibernate.Test/UtilityTest/JoinedEnumerableGenericFixture.cs @@ -102,7 +102,6 @@ private static void WrapsMultipleBreak(int breakIndex) Assert.IsTrue(second.WasDisposed, "second should have been disposed of. "); } - private static JoinedEnumerable InitSingle(out EnumerableTester first) { first = new EnumerableTester(new List(new int[] { 1, 2, 3 })); diff --git a/src/NHibernate.Test/UtilityTest/LinkedHashMapFixture.cs b/src/NHibernate.Test/UtilityTest/LinkedHashMapFixture.cs index 70dac775551..bfa995e190e 100644 --- a/src/NHibernate.Test/UtilityTest/LinkedHashMapFixture.cs +++ b/src/NHibernate.Test/UtilityTest/LinkedHashMapFixture.cs @@ -62,7 +62,6 @@ public void FirstKeyFirstValue() Assert.AreEqual(players[1], lhm.FirstValue); } - [Test] public void Clear() { @@ -261,7 +260,6 @@ public void Serialization() Assert.AreEqual(6, index); } - [Test, Explicit] public void ShowDiff() { @@ -415,4 +413,3 @@ public override string ToString() } } } - diff --git a/src/NHibernate.Test/UtilityTest/ReflectHelperFixture.cs b/src/NHibernate.Test/UtilityTest/ReflectHelperFixture.cs index 2f7979afaf0..d6ee2454010 100644 --- a/src/NHibernate.Test/UtilityTest/ReflectHelperFixture.cs +++ b/src/NHibernate.Test/UtilityTest/ReflectHelperFixture.cs @@ -32,12 +32,10 @@ public interface IMyInheritedWithEqual : IMyBaseWithEqual public interface IEmpty { - } public interface IComplex: IEmpty, IMyInheritedWithEqual { - } [Test] diff --git a/src/NHibernate.Test/UtilityTest/ReflectionHelperIsMethodOfTests.cs b/src/NHibernate.Test/UtilityTest/ReflectionHelperIsMethodOfTests.cs index 51f21b4563a..7f6b5a01b22 100644 --- a/src/NHibernate.Test/UtilityTest/ReflectionHelperIsMethodOfTests.cs +++ b/src/NHibernate.Test/UtilityTest/ReflectionHelperIsMethodOfTests.cs @@ -31,7 +31,6 @@ public void WhenDeclaringTypeMatchThenTrue() private class MyCollection: List { - } [Test] @@ -73,7 +72,7 @@ private abstract class MyAbstractClass private class MyClass : MyAbstractClass { - public override int MyMethod() {return 0;} + public override int MyMethod() {return 0; } } [Test] diff --git a/src/NHibernate.Test/UtilityTest/SequencedHashMapFixture.cs b/src/NHibernate.Test/UtilityTest/SequencedHashMapFixture.cs index 7b650b1c648..023e84c5bb0 100644 --- a/src/NHibernate.Test/UtilityTest/SequencedHashMapFixture.cs +++ b/src/NHibernate.Test/UtilityTest/SequencedHashMapFixture.cs @@ -52,7 +52,6 @@ public void Add() _shm.Add(newKey, newValue); - int i = 0; foreach (DictionaryEntry de in _shm) { @@ -290,7 +289,6 @@ public void LastValue() Assert.IsNull(_emptyShm.LastValue); } - [Test, Explicit] public void Performance() { @@ -381,7 +379,6 @@ public void Performance() listItemTicks[runIndex] = DateTime.Now.Ticks - listStart; - list.Clear(); } @@ -447,4 +444,4 @@ public void Serialize() Assert.AreEqual(3, index); } } -} \ No newline at end of file +} diff --git a/src/NHibernate.Test/UtilityTest/StringHelperFixture.cs b/src/NHibernate.Test/UtilityTest/StringHelperFixture.cs index a8230430007..f949c604b3c 100644 --- a/src/NHibernate.Test/UtilityTest/StringHelperFixture.cs +++ b/src/NHibernate.Test/UtilityTest/StringHelperFixture.cs @@ -138,7 +138,6 @@ public void PurgeBackticksEnclosing() Assert.That(StringHelper.PurgeBackticksEnclosing("`something`"), Is.EqualTo("something")); } - [TestCase("ab", 0, -1, 0)] [TestCase("a\r\nb", 0, 1, 2)] [TestCase("a\nb", 0, 1, 1)] @@ -153,7 +152,6 @@ public void IndexOfAnyNewLineReturnsIndexAndLength(string str, int startIndex, i Assert.That(matchLength, Is.EqualTo(expectedMatchLength)); } - [TestCase("ab", 0, false, 0)] [TestCase("a\r\nb", 0, false, 0)] [TestCase("a\nb", 1, true, 1)] diff --git a/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs b/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs index caaacaea1e6..f6c47ff38c8 100644 --- a/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs +++ b/src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs @@ -202,12 +202,10 @@ public void ParseGenericTypeNameWithDefaultNamespaceUnused() public class MyGClass { - } public class MyComplexClass { - } [Test] diff --git a/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs b/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs index ec08849ce03..5dd5fc8fe22 100644 --- a/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs +++ b/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs @@ -295,5 +295,3 @@ private static void RunProcess(string processName, string arguments, bool checkS #endif } } - - diff --git a/src/NHibernate/ADOException.cs b/src/NHibernate/ADOException.cs index f8cfe3b7331..f3c5108b5fd 100644 --- a/src/NHibernate/ADOException.cs +++ b/src/NHibernate/ADOException.cs @@ -20,7 +20,6 @@ public class ADOException : HibernateException public ADOException() { - } /// /// Initializes a new instance of the class. diff --git a/src/NHibernate/Action/BulkOperationCleanupAction.cs b/src/NHibernate/Action/BulkOperationCleanupAction.cs index fa52f0f878c..edd5b8f20bd 100644 --- a/src/NHibernate/Action/BulkOperationCleanupAction.cs +++ b/src/NHibernate/Action/BulkOperationCleanupAction.cs @@ -88,7 +88,6 @@ private bool AffectedEntity(ISet querySpaces, string[] entitySpaces) return true; } - return entitySpaces.Any(querySpaces.Contains); } diff --git a/src/NHibernate/Action/EntityAction.cs b/src/NHibernate/Action/EntityAction.cs index 34b3919786d..70b2b1e60c2 100644 --- a/src/NHibernate/Action/EntityAction.cs +++ b/src/NHibernate/Action/EntityAction.cs @@ -91,7 +91,7 @@ public IEntityPersister Persister get { return persister; } } - protected internal abstract bool HasPostCommitEventListeners { get;} + protected internal abstract bool HasPostCommitEventListeners { get; } #region IExecutable Members diff --git a/src/NHibernate/Action/EntityInsertAction.cs b/src/NHibernate/Action/EntityInsertAction.cs index 71250f48373..0f8e7e6ac24 100644 --- a/src/NHibernate/Action/EntityInsertAction.cs +++ b/src/NHibernate/Action/EntityInsertAction.cs @@ -48,7 +48,6 @@ public override void Execute() // else inserted the same pk first, the insert would fail if (!veto) { - persister.Insert(id, State, instance, Session); EntityEntry entry = Session.PersistenceContext.GetEntry(instance); diff --git a/src/NHibernate/AdoNet/Expectations.cs b/src/NHibernate/AdoNet/Expectations.cs index 06a3fa5901f..d8909dfea8a 100644 --- a/src/NHibernate/AdoNet/Expectations.cs +++ b/src/NHibernate/AdoNet/Expectations.cs @@ -144,4 +144,4 @@ public static void VerifyOutcomeBatched(int expectedRowCount, int rowCount, DbCo } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/AdoNet/IEmbeddedBatcherFactoryProvider.cs b/src/NHibernate/AdoNet/IEmbeddedBatcherFactoryProvider.cs index 42d96215163..3d380219b5e 100644 --- a/src/NHibernate/AdoNet/IEmbeddedBatcherFactoryProvider.cs +++ b/src/NHibernate/AdoNet/IEmbeddedBatcherFactoryProvider.cs @@ -13,6 +13,6 @@ public interface IEmbeddedBatcherFactoryProvider /// /// The class type. /// - System.Type BatcherFactoryClass { get;} + System.Type BatcherFactoryClass { get; } } } diff --git a/src/NHibernate/AdoNet/NonBatchingBatcher.cs b/src/NHibernate/AdoNet/NonBatchingBatcher.cs index 10b113eb040..134c91ccfad 100644 --- a/src/NHibernate/AdoNet/NonBatchingBatcher.cs +++ b/src/NHibernate/AdoNet/NonBatchingBatcher.cs @@ -56,11 +56,10 @@ protected override int CountOfStatementsInCurrentBatch get { return 1; } } - public override int BatchSize { get { return 1; } set { throw new NotSupportedException("No batch size was defined for the session factory, batching is disabled. Set adonet.batch_size = 1 to enable batching."); } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs b/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs index 57e681e16e3..bb54028d85e 100644 --- a/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs +++ b/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs @@ -76,7 +76,6 @@ private static void AssertHasParameters(SqlCommand command) } } - /// /// Return the batch command to be executed /// diff --git a/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs b/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs index b911fd9f94b..c01ce145a68 100644 --- a/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs +++ b/src/NHibernate/AdoNet/Util/SqlStatementLogger.cs @@ -134,7 +134,6 @@ public string GetParameterLoggableValue(DbParameter parameter) } return parameter.Value.ToString(); - } private static string GetBufferAsHexString(byte[] buffer) diff --git a/src/NHibernate/AssertionFailure.cs b/src/NHibernate/AssertionFailure.cs index ca4963d7dc6..52cbbdae11d 100644 --- a/src/NHibernate/AssertionFailure.cs +++ b/src/NHibernate/AssertionFailure.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.Serialization; - namespace NHibernate { /// diff --git a/src/NHibernate/Async/Action/EntityInsertAction.cs b/src/NHibernate/Async/Action/EntityInsertAction.cs index dced95776c3..17f5c4d0bfb 100644 --- a/src/NHibernate/Async/Action/EntityInsertAction.cs +++ b/src/NHibernate/Async/Action/EntityInsertAction.cs @@ -44,7 +44,6 @@ public override async Task ExecuteAsync(CancellationToken cancellationToken) // else inserted the same pk first, the insert would fail if (!veto) { - await (persister.InsertAsync(id, State, instance, Session, cancellationToken)).ConfigureAwait(false); EntityEntry entry = Session.PersistenceContext.GetEntry(instance); diff --git a/src/NHibernate/Async/AdoNet/NonBatchingBatcher.cs b/src/NHibernate/Async/AdoNet/NonBatchingBatcher.cs index 49d67f22ac5..6b5134c78fb 100644 --- a/src/NHibernate/Async/AdoNet/NonBatchingBatcher.cs +++ b/src/NHibernate/Async/AdoNet/NonBatchingBatcher.cs @@ -66,4 +66,4 @@ protected override Task DoExecuteBatchAsync(DbCommand ps, CancellationToken canc } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Cache/ReadWriteCache.cs b/src/NHibernate/Async/Cache/ReadWriteCache.cs index 9b4b5e4ddb3..326e344bbc4 100644 --- a/src/NHibernate/Async/Cache/ReadWriteCache.cs +++ b/src/NHibernate/Async/Cache/ReadWriteCache.cs @@ -400,7 +400,6 @@ public async Task AfterInsertAsync(CacheKey key, object value, object vers var lockValue = await (_cache.LockAsync(key, cancellationToken)).ConfigureAwait(false); try { - ILockable lockable = (ILockable) await (Cache.GetAsync(key, cancellationToken)).ConfigureAwait(false); if (lockable == null) { diff --git a/src/NHibernate/Async/Collection/Generic/PersistentGenericSet.cs b/src/NHibernate/Async/Collection/Generic/PersistentGenericSet.cs index 30bb0d65e90..9e5cb020340 100644 --- a/src/NHibernate/Async/Collection/Generic/PersistentGenericSet.cs +++ b/src/NHibernate/Async/Collection/Generic/PersistentGenericSet.cs @@ -75,7 +75,6 @@ public override async Task EqualsSnapshotAsync(ICollectionPersister persis return false; } - foreach (T obj in WrappedSet) { T oldValue; @@ -143,7 +142,6 @@ public override async Task GetDeletesAsync(ICollectionPersister per deletes.AddRange(sn.Where(obj => !WrappedSet.Contains(obj))); - foreach (var obj in WrappedSet) { T oldValue; diff --git a/src/NHibernate/Async/Collection/ILazyInitializedCollection.cs b/src/NHibernate/Async/Collection/ILazyInitializedCollection.cs index d853a513792..f09c28bb698 100644 --- a/src/NHibernate/Async/Collection/ILazyInitializedCollection.cs +++ b/src/NHibernate/Async/Collection/ILazyInitializedCollection.cs @@ -20,6 +20,5 @@ public partial interface ILazyInitializedCollection /// /// A cancellation token that can be used to cancel the work Task ForceInitializationAsync(CancellationToken cancellationToken); - } } diff --git a/src/NHibernate/Async/Connection/UserSuppliedConnectionProvider.cs b/src/NHibernate/Async/Connection/UserSuppliedConnectionProvider.cs index 45ce11aa0e0..23422dd1bc8 100644 --- a/src/NHibernate/Async/Connection/UserSuppliedConnectionProvider.cs +++ b/src/NHibernate/Async/Connection/UserSuppliedConnectionProvider.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.Data.Common; - namespace NHibernate.Connection { using System.Threading.Tasks; @@ -37,4 +36,4 @@ public override Task GetConnectionAsync(CancellationToken cancella throw new InvalidOperationException("The user must provide an ADO.NET connection - NHibernate is not creating it."); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Criterion/QueryOver.cs b/src/NHibernate/Async/Criterion/QueryOver.cs index afd2e581858..0a579305300 100644 --- a/src/NHibernate/Async/Criterion/QueryOver.cs +++ b/src/NHibernate/Async/Criterion/QueryOver.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using System; using System.Collections.Generic; using System.Linq; @@ -63,7 +62,6 @@ private Task SingleOrDefaultAsync(CancellationToken cancellationToken) return criteria.UniqueResultAsync(cancellationToken); } - Task> IQueryOver.ListAsync(CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) @@ -131,7 +129,5 @@ Task IQueryOver.SingleOrDefaultAsync(CancellationToken cancellation } return SingleOrDefaultAsync(cancellationToken); } - } - } diff --git a/src/NHibernate/Async/Engine/Cascade.cs b/src/NHibernate/Async/Engine/Cascade.cs index e554de20988..c0165e5cf66 100644 --- a/src/NHibernate/Async/Engine/Cascade.cs +++ b/src/NHibernate/Async/Engine/Cascade.cs @@ -26,7 +26,6 @@ namespace NHibernate.Engine public sealed partial class Cascade { - /// Cascade an action from the parent entity instance to all its children. /// The parent's entity persister /// The parent reference. diff --git a/src/NHibernate/Async/Engine/Collections.cs b/src/NHibernate/Async/Engine/Collections.cs index b87792fea7c..412316fe09d 100644 --- a/src/NHibernate/Async/Engine/Collections.cs +++ b/src/NHibernate/Async/Engine/Collections.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Collection; using NHibernate.Impl; using NHibernate.Persister.Collection; diff --git a/src/NHibernate/Async/Engine/ForeignKeys.cs b/src/NHibernate/Async/Engine/ForeignKeys.cs index df04ce9c177..8185a996af4 100644 --- a/src/NHibernate/Async/Engine/ForeignKeys.cs +++ b/src/NHibernate/Async/Engine/ForeignKeys.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Id; using NHibernate.Persister.Entity; using NHibernate.Proxy; @@ -99,7 +98,6 @@ private async Task NullifyTransientReferencesAsync(object value, IType t private async Task IsNullifiableAsync(string entityName, object obj, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); - //if (obj == org.hibernate.intercept.LazyPropertyInitializer_Fields.UNFETCHED_PROPERTY) // return false; //this is kinda the best we can do... @@ -271,7 +269,6 @@ public static async Task GetEntityIdentifierIfNotUnsavedAsync(string ent string entityString = entity.ToString(); throw new TransientObjectException( string.Format("object references an unsaved transient instance - save the transient instance before flushing or set cascade action for the property to something that would make it autosave. Type: {0}, Entity: {1}", entityName, entityString)); - } id = session.GetEntityPersister(entityName, entity).GetIdentifier(entity); } diff --git a/src/NHibernate/Async/Engine/Versioning.cs b/src/NHibernate/Async/Engine/Versioning.cs index 69db5134409..061f598a9b8 100644 --- a/src/NHibernate/Async/Engine/Versioning.cs +++ b/src/NHibernate/Async/Engine/Versioning.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Persister.Entity; using NHibernate.Type; diff --git a/src/NHibernate/Async/Event/Default/DefaultAutoFlushEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultAutoFlushEventListener.cs index fed30c185b7..6b53cb2685a 100644 --- a/src/NHibernate/Async/Event/Default/DefaultAutoFlushEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultAutoFlushEventListener.cs @@ -56,7 +56,6 @@ public virtual async Task OnAutoFlushAsync(AutoFlushEvent @event, CancellationTo } else { - if (log.IsDebugEnabled()) log.Debug("Dont need to execute flush"); source.ActionQueue.ClearFromFlushNeededCheck(oldSize); diff --git a/src/NHibernate/Async/Event/Default/DefaultDirtyCheckEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultDirtyCheckEventListener.cs index 5862db48115..f4b47a26a9c 100644 --- a/src/NHibernate/Async/Event/Default/DefaultDirtyCheckEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultDirtyCheckEventListener.cs @@ -10,7 +10,6 @@ using System; - namespace NHibernate.Event.Default { using System.Threading.Tasks; diff --git a/src/NHibernate/Async/Event/Default/DefaultEvictEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultEvictEventListener.cs index 8a21bbe5602..12f93dc6289 100644 --- a/src/NHibernate/Async/Event/Default/DefaultEvictEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultEvictEventListener.cs @@ -65,7 +65,6 @@ public virtual async Task OnEvictAsync(EvictEvent @event, CancellationToken canc protected virtual async Task DoEvictAsync(object obj, EntityKey key, IEntityPersister persister, IEventSource session, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); - if (log.IsDebugEnabled()) { log.Debug("evicting {0}", MessageHelper.InfoString(persister)); diff --git a/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs index 1341bccd9d2..d70bbb4b562 100644 --- a/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs @@ -351,7 +351,6 @@ protected Task IsUpdateNecessaryAsync(FlushEntityEvent @event, Cancellatio } else { - int[] dirtyProperties = @event.DirtyProperties; if (dirtyProperties != null && dirtyProperties.Length != 0) { @@ -455,7 +454,6 @@ protected virtual async Task DirtyCheckAsync(FlushEntityEvent @event, Cancellati @event.DirtyCheckPossible = !cannotDirtyCheck; } - private async Task GetDatabaseSnapshotAsync(ISessionImplementor session, IEntityPersister persister, object id, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); @@ -483,6 +481,5 @@ private async Task GetDatabaseSnapshotAsync(ISessionImplementor sessio return session.PersistenceContext.GetCachedDatabaseSnapshot(entityKey); } } - } } diff --git a/src/NHibernate/Async/Event/Default/DefaultLoadEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultLoadEventListener.cs index a351b6f0437..e71e91aee2b 100644 --- a/src/NHibernate/Async/Event/Default/DefaultLoadEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultLoadEventListener.cs @@ -47,7 +47,6 @@ public virtual async Task OnLoadAsync(LoadEvent @event, LoadType loadType, Cance if (persister == null) { - var message = new StringBuilder(512); message.AppendLine(string.Format("Unable to locate persister for the entity named '{0}'.", @event.EntityClassName)); message.AppendLine("The persister define the persistence strategy for an entity."); @@ -393,7 +392,6 @@ protected virtual async Task LoadFromSessionCacheAsync(LoadEvent @event, return old; } - /// Attempts to load the entity from the second-level cache. /// The load event /// The persister for the entity being requested for load diff --git a/src/NHibernate/Async/Event/Default/DefaultMergeEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultMergeEventListener.cs index 9384b786b79..abb74ca8b20 100644 --- a/src/NHibernate/Async/Event/Default/DefaultMergeEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultMergeEventListener.cs @@ -19,7 +19,6 @@ using NHibernate.Proxy; using NHibernate.Type; - namespace NHibernate.Event.Default { using System.Threading.Tasks; diff --git a/src/NHibernate/Async/Event/Default/DefaultSaveOrUpdateEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultSaveOrUpdateEventListener.cs index 99aa1b95e7a..1b7dd4c99d7 100644 --- a/src/NHibernate/Async/Event/Default/DefaultSaveOrUpdateEventListener.cs +++ b/src/NHibernate/Async/Event/Default/DefaultSaveOrUpdateEventListener.cs @@ -71,7 +71,7 @@ protected virtual async Task PerformSaveOrUpdateAsync(SaveOrUpdateEvent case EntityState.Persistent: return EntityIsPersistent(@event); - default: //TRANSIENT or DELETED + default: //TRANSIENT or DELETED return await (EntityIsTransientAsync(@event, cancellationToken)).ConfigureAwait(false); } } diff --git a/src/NHibernate/Async/Event/Default/EvictVisitor.cs b/src/NHibernate/Async/Event/Default/EvictVisitor.cs index c6432848862..7bf193fca0b 100644 --- a/src/NHibernate/Async/Event/Default/EvictVisitor.cs +++ b/src/NHibernate/Async/Event/Default/EvictVisitor.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Collection; using NHibernate.Engine; using NHibernate.Impl; diff --git a/src/NHibernate/Async/Event/Default/ReattachVisitor.cs b/src/NHibernate/Async/Event/Default/ReattachVisitor.cs index c6a81a49ee5..9bee8f1b652 100644 --- a/src/NHibernate/Async/Event/Default/ReattachVisitor.cs +++ b/src/NHibernate/Async/Event/Default/ReattachVisitor.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Action; using NHibernate.Engine; using NHibernate.Impl; diff --git a/src/NHibernate/Async/Event/Default/WrapVisitor.cs b/src/NHibernate/Async/Event/Default/WrapVisitor.cs index 42c9442d258..8423f1a2d43 100644 --- a/src/NHibernate/Async/Event/Default/WrapVisitor.cs +++ b/src/NHibernate/Async/Event/Default/WrapVisitor.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Collection; using NHibernate.Engine; using NHibernate.Persister.Collection; diff --git a/src/NHibernate/Async/Hql/IQueryTranslator.cs b/src/NHibernate/Async/Hql/IQueryTranslator.cs index 879d940e3a7..fd11e81d03b 100644 --- a/src/NHibernate/Async/Hql/IQueryTranslator.cs +++ b/src/NHibernate/Async/Hql/IQueryTranslator.cs @@ -47,4 +47,4 @@ public partial interface IQueryTranslator /// Task ExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/IQueryOver.cs b/src/NHibernate/Async/IQueryOver.cs index 78f1f2b1fe1..28109dc0ec7 100644 --- a/src/NHibernate/Async/IQueryOver.cs +++ b/src/NHibernate/Async/IQueryOver.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -66,7 +65,5 @@ public partial interface IQueryOver : IQueryOver /// /// A cancellation token that can be used to cancel the work Task SingleOrDefaultAsync(CancellationToken cancellationToken = default(CancellationToken)); - } - } diff --git a/src/NHibernate/Async/Id/Enhanced/TableGenerator.cs b/src/NHibernate/Async/Id/Enhanced/TableGenerator.cs index be2da466fff..3dd339de624 100644 --- a/src/NHibernate/Async/Id/Enhanced/TableGenerator.cs +++ b/src/NHibernate/Async/Id/Enhanced/TableGenerator.cs @@ -28,7 +28,6 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe { private readonly NHibernate.Util.AsyncLock _generate = new NHibernate.Util.AsyncLock(); - [MethodImpl()] public virtual async Task GenerateAsync(ISessionImplementor session, object obj, CancellationToken cancellationToken) { @@ -39,7 +38,6 @@ public virtual async Task GenerateAsync(ISessionImplementor session, obj } } - private partial class TableAccessCallback : IAccessCallback { @@ -54,7 +52,6 @@ public async Task GetNextValueAsync(CancellationToken cancellationToken) #endregion } - public override async Task DoWorkInCurrentTransactionAsync(ISessionImplementor session, DbConnection conn, DbTransaction transaction, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); @@ -108,7 +105,6 @@ public override async Task DoWorkInCurrentTransactionAsync(ISessionImple throw; } - try { var updateCmd = session.Factory.ConnectionProvider.Driver.GenerateCommand(CommandType.Text, updateQuery, updateParameterTypes); diff --git a/src/NHibernate/Async/Id/IIdentifierGenerator.cs b/src/NHibernate/Async/Id/IIdentifierGenerator.cs index 12d7141668c..d9e06bee10f 100644 --- a/src/NHibernate/Async/Id/IIdentifierGenerator.cs +++ b/src/NHibernate/Async/Id/IIdentifierGenerator.cs @@ -15,7 +15,6 @@ namespace NHibernate.Id using System.Threading.Tasks; using System.Threading; - public partial interface IIdentifierGenerator { /// @@ -27,4 +26,4 @@ public partial interface IIdentifierGenerator /// The new identifier Task GenerateAsync(ISessionImplementor session, object obj, CancellationToken cancellationToken); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Id/IdentityGenerator.cs b/src/NHibernate/Async/Id/IdentityGenerator.cs index d70e2f80e40..6908290a417 100644 --- a/src/NHibernate/Async/Id/IdentityGenerator.cs +++ b/src/NHibernate/Async/Id/IdentityGenerator.cs @@ -62,4 +62,4 @@ protected internal override Task GetResultAsync(ISessionImplementor sess } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Id/Insert/IBinder.cs b/src/NHibernate/Async/Id/Insert/IBinder.cs index 394c8491836..18a008641e6 100644 --- a/src/NHibernate/Async/Id/Insert/IBinder.cs +++ b/src/NHibernate/Async/Id/Insert/IBinder.cs @@ -18,4 +18,4 @@ public partial interface IBinder { Task BindValuesAsync(DbCommand cm, CancellationToken cancellationToken); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Impl/SessionImpl.cs b/src/NHibernate/Async/Impl/SessionImpl.cs index 5905e6801a9..7843a87a307 100644 --- a/src/NHibernate/Async/Impl/SessionImpl.cs +++ b/src/NHibernate/Async/Impl/SessionImpl.cs @@ -924,7 +924,6 @@ public override async Task ImmediateLoadAsync(string entityName, object } } - /// /// Return the object with the specified id or throw exception if no row with that id exists. Defer the load, /// return a new proxy or return an existing proxy if possible. Do not check if the object was deleted. diff --git a/src/NHibernate/Async/Loader/Criteria/CriteriaLoader.cs b/src/NHibernate/Async/Loader/Criteria/CriteriaLoader.cs index ccae5a22c23..8d5cbbd7cc6 100644 --- a/src/NHibernate/Async/Loader/Criteria/CriteriaLoader.cs +++ b/src/NHibernate/Async/Loader/Criteria/CriteriaLoader.cs @@ -51,7 +51,6 @@ protected override async Task GetResultColumnOrRowAsync(object[] row, IR .TransformTuple(await (GetResultRowAsync(row, rs, session, cancellationToken)).ConfigureAwait(false), ResultRowAliases); } - protected override async Task GetResultRowAsync(object[] row, DbDataReader rs, ISessionImplementor session, CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/src/NHibernate/Async/Loader/Loader.cs b/src/NHibernate/Async/Loader/Loader.cs index 58c6f066d45..33dff86b077 100644 --- a/src/NHibernate/Async/Loader/Loader.cs +++ b/src/NHibernate/Async/Loader/Loader.cs @@ -59,7 +59,6 @@ private Task DoQueryAndInitializeNonLazyCollectionsAsync(ISessionImplemen return DoQueryAndInitializeNonLazyCollectionsAsync(session, queryParameters, returnProxies, null, null, cancellationToken); } - private async Task DoQueryAndInitializeNonLazyCollectionsAsync(ISessionImplementor session, QueryParameters queryParameters, bool returnProxies, IResultTransformer forcedResultTransformer, QueryCacheResultBuilder queryCacheResultBuilder, CancellationToken cancellationToken) @@ -437,7 +436,6 @@ private Task EndCollectionLoadAsync(DbDataReader reader, ISessionImplementor ses } } - /// /// Get the actual object that is returned in the user-visible result list. /// diff --git a/src/NHibernate/Async/NHibernateUtil.cs b/src/NHibernate/Async/NHibernateUtil.cs index 29fb3e3bf1e..fd7959973ac 100644 --- a/src/NHibernate/Async/NHibernateUtil.cs +++ b/src/NHibernate/Async/NHibernateUtil.cs @@ -25,7 +25,6 @@ namespace NHibernate public static partial class NHibernateUtil { - /// /// Force initialization of a proxy or persistent collection. /// @@ -58,7 +57,6 @@ public static partial class NHibernateUtil return persistent.ForceInitializationAsync(cancellationToken); } return Task.CompletedTask; - } catch (Exception ex) { diff --git a/src/NHibernate/Async/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs b/src/NHibernate/Async/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs index 2610e8c09fc..57893dade62 100644 --- a/src/NHibernate/Async/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs +++ b/src/NHibernate/Async/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs @@ -34,7 +34,6 @@ public partial class AggregatedIndexCollectionSelectorParameterSpecifications : // return bindCount; //} - public Task BindAsync(DbCommand command, IList sqlQueryParametersList, QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken) { throw new NotImplementedException(); @@ -45,4 +44,4 @@ public Task BindAsync(DbCommand command, IList multiSqlQueryParameter throw new NotImplementedException(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Persister/Collection/NamedQueryCollectionInitializer.cs b/src/NHibernate/Async/Persister/Collection/NamedQueryCollectionInitializer.cs index 7349bbdf4c8..128b0f23d27 100644 --- a/src/NHibernate/Async/Persister/Collection/NamedQueryCollectionInitializer.cs +++ b/src/NHibernate/Async/Persister/Collection/NamedQueryCollectionInitializer.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Engine; using NHibernate.Impl; using NHibernate.Loader.Collection; diff --git a/src/NHibernate/Async/Persister/Entity/NamedQueryLoader.cs b/src/NHibernate/Async/Persister/Entity/NamedQueryLoader.cs index 67bb866837f..ed130ad0603 100644 --- a/src/NHibernate/Async/Persister/Entity/NamedQueryLoader.cs +++ b/src/NHibernate/Async/Persister/Entity/NamedQueryLoader.cs @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ - using NHibernate.Engine; using NHibernate.Impl; using NHibernate.Loader.Entity; diff --git a/src/NHibernate/Async/Proxy/ILazyInitializer.cs b/src/NHibernate/Async/Proxy/ILazyInitializer.cs index 2e86311b819..4008180a426 100644 --- a/src/NHibernate/Async/Proxy/ILazyInitializer.cs +++ b/src/NHibernate/Async/Proxy/ILazyInitializer.cs @@ -32,4 +32,4 @@ public partial interface ILazyInitializer /// The persistent object this proxy is proxying. Task GetImplementationAsync(CancellationToken cancellationToken); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Tool/hbm2ddl/IConnectionHelper.cs b/src/NHibernate/Async/Tool/hbm2ddl/IConnectionHelper.cs index 5f71dee295e..7d53932c317 100644 --- a/src/NHibernate/Async/Tool/hbm2ddl/IConnectionHelper.cs +++ b/src/NHibernate/Async/Tool/hbm2ddl/IConnectionHelper.cs @@ -22,5 +22,4 @@ public partial interface IConnectionHelper /// A cancellation token that can be used to cancel the work Task PrepareAsync(CancellationToken cancellationToken); } - } diff --git a/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs b/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs index 5f3ac5a485e..046f3aebda5 100644 --- a/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs +++ b/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs @@ -334,7 +334,6 @@ public async Task ExecuteAsync(Action scriptAction, bool execute, bool j } } - public Task ExecuteAsync(Action scriptAction, bool execute, bool justDrop, CancellationToken cancellationToken = default(CancellationToken)) { if (cancellationToken.IsCancellationRequested) @@ -344,7 +343,6 @@ public async Task ExecuteAsync(Action scriptAction, bool execute, bool j return ExecuteAsync(scriptAction, execute, justDrop, null, cancellationToken); } - public async Task ExecuteAsync(Action scriptAction, bool execute, bool justDrop, TextWriter exportOutput, CancellationToken cancellationToken = default(CancellationToken)) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/src/NHibernate/Async/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs b/src/NHibernate/Async/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs index 861a527556c..6a4af39710f 100644 --- a/src/NHibernate/Async/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs +++ b/src/NHibernate/Async/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs @@ -15,7 +15,6 @@ namespace NHibernate.Tool.hbm2ddl { using System.Threading.Tasks; using System.Threading; - public partial class SuppliedConnectionProviderConnectionHelper : IConnectionHelper { diff --git a/src/NHibernate/Async/Type/AnyType.cs b/src/NHibernate/Async/Type/AnyType.cs index 996e25fa6bf..ff030de2f1a 100644 --- a/src/NHibernate/Async/Type/AnyType.cs +++ b/src/NHibernate/Async/Type/AnyType.cs @@ -218,6 +218,5 @@ private Task ResolveAnyAsync(string entityName, object id, ISessionImple } return entityName == null || id == null ? Task.FromResult(null ): session.InternalLoadAsync(entityName, id, false, false, cancellationToken); } - } } diff --git a/src/NHibernate/Async/Type/CompositeCustomType.cs b/src/NHibernate/Async/Type/CompositeCustomType.cs index fc054ada810..0fffef1b131 100644 --- a/src/NHibernate/Async/Type/CompositeCustomType.cs +++ b/src/NHibernate/Async/Type/CompositeCustomType.cs @@ -180,6 +180,5 @@ public override Task ReplaceAsync(object original, object current, ISess return Task.FromException(ex); } } - } } diff --git a/src/NHibernate/Async/Type/IAbstractComponentType.cs b/src/NHibernate/Async/Type/IAbstractComponentType.cs index fe4aa0392ea..fe6de170698 100644 --- a/src/NHibernate/Async/Type/IAbstractComponentType.cs +++ b/src/NHibernate/Async/Type/IAbstractComponentType.cs @@ -26,4 +26,4 @@ public partial interface IAbstractComponentType : IType Task GetPropertyValueAsync(object component, int i, ISessionImplementor session, CancellationToken cancellationToken); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Type/ImmutableType.cs b/src/NHibernate/Async/Type/ImmutableType.cs index b7e24bed407..b2663974643 100644 --- a/src/NHibernate/Async/Type/ImmutableType.cs +++ b/src/NHibernate/Async/Type/ImmutableType.cs @@ -36,6 +36,5 @@ public override Task ReplaceAsync(object original, object current, ISess return Task.FromException(ex); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Async/Type/MutableType.cs b/src/NHibernate/Async/Type/MutableType.cs index dfcc79632e8..3e5f06cb84c 100644 --- a/src/NHibernate/Async/Type/MutableType.cs +++ b/src/NHibernate/Async/Type/MutableType.cs @@ -36,6 +36,5 @@ public override Task ReplaceAsync(object original, object target, ISessi return Task.FromException(ex); } } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Bytecode/IBytecodeProvider.cs b/src/NHibernate/Bytecode/IBytecodeProvider.cs index d17daaa32b3..264b1c7c29e 100644 --- a/src/NHibernate/Bytecode/IBytecodeProvider.cs +++ b/src/NHibernate/Bytecode/IBytecodeProvider.cs @@ -10,7 +10,7 @@ public interface IBytecodeProvider /// The specific factory for this provider capable of /// generating run-time proxies for lazy-loading purposes. /// - IProxyFactoryFactory ProxyFactoryFactory { get;} + IProxyFactoryFactory ProxyFactoryFactory { get; } /// /// Retrieve the delegate for this provider diff --git a/src/NHibernate/Bytecode/Lightweight/BytecodeProviderImpl.cs b/src/NHibernate/Bytecode/Lightweight/BytecodeProviderImpl.cs index 09877c20409..bcc3ac6f5c6 100644 --- a/src/NHibernate/Bytecode/Lightweight/BytecodeProviderImpl.cs +++ b/src/NHibernate/Bytecode/Lightweight/BytecodeProviderImpl.cs @@ -12,7 +12,6 @@ namespace NHibernate.Bytecode.Lightweight /// public class BytecodeProviderImpl : AbstractBytecodeProvider { - #region IBytecodeProvider Members /// diff --git a/src/NHibernate/Bytecode/UnableToLoadProxyFactoryFactoryException.cs b/src/NHibernate/Bytecode/UnableToLoadProxyFactoryFactoryException.cs index fc9bbe48284..d37d031e370 100644 --- a/src/NHibernate/Bytecode/UnableToLoadProxyFactoryFactoryException.cs +++ b/src/NHibernate/Bytecode/UnableToLoadProxyFactoryFactoryException.cs @@ -7,7 +7,6 @@ namespace NHibernate.Bytecode [Serializable] public class UnableToLoadProxyFactoryFactoryException : HibernateByteCodeException { - public UnableToLoadProxyFactoryFactoryException(string typeName, Exception inner) : base("", inner) { diff --git a/src/NHibernate/Cache/IOptimisticCacheSource.cs b/src/NHibernate/Cache/IOptimisticCacheSource.cs index 840ad8f022f..08b27d4d93f 100644 --- a/src/NHibernate/Cache/IOptimisticCacheSource.cs +++ b/src/NHibernate/Cache/IOptimisticCacheSource.cs @@ -15,10 +15,10 @@ public interface IOptimisticCacheSource /// Does this source represent versioned (i.e., and thus optimistically lockable) data? /// /// True if this source represents versioned data; false otherwise. - bool IsVersioned { get;} + bool IsVersioned { get; } /// Get the comparator used to compare two different version values together. /// An appropriate comparator. - IComparer VersionComparator { get;} + IComparer VersionComparator { get; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cache/NoCacheProvider.cs b/src/NHibernate/Cache/NoCacheProvider.cs index fa95bb595a4..f4afc9b40aa 100644 --- a/src/NHibernate/Cache/NoCacheProvider.cs +++ b/src/NHibernate/Cache/NoCacheProvider.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; - namespace NHibernate.Cache { /// diff --git a/src/NHibernate/Cache/QueryKey.cs b/src/NHibernate/Cache/QueryKey.cs index cdd8ed44179..11f57923c78 100644 --- a/src/NHibernate/Cache/QueryKey.cs +++ b/src/NHibernate/Cache/QueryKey.cs @@ -280,7 +280,6 @@ public override string ToString() buf.Append("; "); } - return buf.ToString(); } } diff --git a/src/NHibernate/Cache/ReadWriteCache.cs b/src/NHibernate/Cache/ReadWriteCache.cs index adc7991f5fe..2bf891f3068 100644 --- a/src/NHibernate/Cache/ReadWriteCache.cs +++ b/src/NHibernate/Cache/ReadWriteCache.cs @@ -446,7 +446,6 @@ public bool AfterInsert(CacheKey key, object value, object version) var lockValue = _cache.Lock(key); try { - ILockable lockable = (ILockable) Cache.Get(key); if (lockable == null) { diff --git a/src/NHibernate/Cfg/Configuration.cs b/src/NHibernate/Cfg/Configuration.cs index f9e2fb23cd6..6b52f6008ba 100644 --- a/src/NHibernate/Cfg/Configuration.cs +++ b/src/NHibernate/Cfg/Configuration.cs @@ -2229,7 +2229,6 @@ public void SetListeners(ListenerType type, object[] listeners) } } - /// /// Append the listeners to the end of the currently configured /// listeners diff --git a/src/NHibernate/Cfg/ConfigurationSchema/CfgXmlHelper.cs b/src/NHibernate/Cfg/ConfigurationSchema/CfgXmlHelper.cs index d2cb08ecdd2..caa9c4c2191 100644 --- a/src/NHibernate/Cfg/ConfigurationSchema/CfgXmlHelper.cs +++ b/src/NHibernate/Cfg/ConfigurationSchema/CfgXmlHelper.cs @@ -280,5 +280,4 @@ internal static string ListenerTypeConvertToString(ListenerType listenerType) } } } - } diff --git a/src/NHibernate/Cfg/ConfigurationSchema/ClassCacheConfiguration.cs b/src/NHibernate/Cfg/ConfigurationSchema/ClassCacheConfiguration.cs index b5ca288c32b..75341d5b228 100644 --- a/src/NHibernate/Cfg/ConfigurationSchema/ClassCacheConfiguration.cs +++ b/src/NHibernate/Cfg/ConfigurationSchema/ClassCacheConfiguration.cs @@ -127,7 +127,6 @@ public string Region get { return region; } } - private EntityCacheUsage usage; /// /// Cache strategy. @@ -149,6 +148,5 @@ public ClassCacheInclude Include { get { return include; } } - } } diff --git a/src/NHibernate/Cfg/ConfigurationSchema/EventConfiguration.cs b/src/NHibernate/Cfg/ConfigurationSchema/EventConfiguration.cs index 7b1acc186b9..a45165c3afb 100644 --- a/src/NHibernate/Cfg/ConfigurationSchema/EventConfiguration.cs +++ b/src/NHibernate/Cfg/ConfigurationSchema/EventConfiguration.cs @@ -57,6 +57,5 @@ public IList Listeners { get { return listeners; } } - } } diff --git a/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs b/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs index 5208e7428e8..1631a31a226 100644 --- a/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs +++ b/src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs @@ -2,7 +2,6 @@ using System.Xml; using System.Xml.XPath; - namespace NHibernate.Cfg.ConfigurationSchema { /// diff --git a/src/NHibernate/Cfg/ConfigurationSchema/ListenerConfiguration.cs b/src/NHibernate/Cfg/ConfigurationSchema/ListenerConfiguration.cs index 4a4fc977cb7..de341beed70 100644 --- a/src/NHibernate/Cfg/ConfigurationSchema/ListenerConfiguration.cs +++ b/src/NHibernate/Cfg/ConfigurationSchema/ListenerConfiguration.cs @@ -84,6 +84,5 @@ public ListenerType Type { get { return type; } } - } } diff --git a/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs b/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs index 3e96946feca..7b565d7ff1c 100644 --- a/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs +++ b/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs @@ -83,7 +83,6 @@ private void ParseClassesCache(XPathNavigator navigator) } } - private void ParseCollectionsCache(XPathNavigator navigator) { XPathNodeIterator xpni = navigator.Select(CfgXmlHelper.SessionFactoryCollectionsCacheExpression); @@ -93,7 +92,6 @@ private void ParseCollectionsCache(XPathNavigator navigator) } } - private void ParseListeners(XPathNavigator navigator) { XPathNodeIterator xpni = navigator.Select(CfgXmlHelper.SessionFactoryListenersExpression); diff --git a/src/NHibernate/Cfg/FilterSecondPassArgs.cs b/src/NHibernate/Cfg/FilterSecondPassArgs.cs index e1026286743..2db9e888371 100644 --- a/src/NHibernate/Cfg/FilterSecondPassArgs.cs +++ b/src/NHibernate/Cfg/FilterSecondPassArgs.cs @@ -22,7 +22,7 @@ public FilterSecondPassArgs(IFilterable filterable, string filterName) FilterName = filterName; } - public IFilterable Filterable{ get; private set;} + public IFilterable Filterable{ get; private set; } public string FilterName { get; private set; } } } diff --git a/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs b/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs index 44acc41d84e..a861b281428 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs @@ -64,6 +64,5 @@ protected override HbmMeta[] Metadatas } #endregion - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs b/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs index aac2748a7c8..5c5608cdfe1 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmCompositeElement.cs @@ -21,7 +21,7 @@ public HbmParent Parent public string EmbeddedNode { - get { return node;} + get { return node; } } public string Name @@ -50,4 +50,4 @@ public IEnumerable Properties #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs b/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs index 238a755f985..6af94596c57 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmDynamicComponent.cs @@ -64,6 +64,5 @@ protected override HbmMeta[] Metadatas } #endregion - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmElement.cs b/src/NHibernate/Cfg/MappingSchema/HbmElement.cs index 16cadfb532b..2573da02b07 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmElement.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmElement.cs @@ -62,7 +62,6 @@ private IEnumerable AsFormulas() #endregion - #region Implementation of ITypeMapping public HbmType Type diff --git a/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs b/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs index e4916d44220..48513187ac8 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs @@ -189,6 +189,5 @@ public HbmCache Cache } #endregion - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs b/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs index f5d68ff7282..afde48b427c 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmKeyManyToOne.cs @@ -6,7 +6,6 @@ namespace NHibernate.Cfg.MappingSchema { public partial class HbmKeyManyToOne : AbstractDecoratable, IColumnsMapping, IRelationship, IEntityPropertyMapping { - #region Implementation of IColumnsMapping [XmlIgnore] @@ -89,4 +88,4 @@ public bool OptimisticLock #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs b/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs index d6bd5217f4d..fcc9f87543f 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmKeyProperty.cs @@ -6,7 +6,6 @@ namespace NHibernate.Cfg.MappingSchema { public partial class HbmKeyProperty : AbstractDecoratable, IColumnsMapping, ITypeMapping, IEntityPropertyMapping { - #region Implementation of IColumnsMapping [XmlIgnore] @@ -75,4 +74,4 @@ public bool OptimisticLock #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs b/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs index bad08a8ee94..1587869c19e 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmManyToAny.cs @@ -6,7 +6,6 @@ namespace NHibernate.Cfg.MappingSchema { public partial class HbmManyToAny : IColumnsMapping, IAnyMapping { - #region Implementation of IColumnsMapping [XmlIgnore] @@ -49,4 +48,4 @@ public ICollection MetaValues #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs b/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs index f9bc6ae35ef..274e6e320f0 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs @@ -135,7 +135,7 @@ public IEnumerable ColumnsAndFormulas public HbmLaziness? Lazy { - get { return lazySpecified ? lazy : (HbmLaziness?) null;} + get { return lazySpecified ? lazy : (HbmLaziness?) null; } } } } diff --git a/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs b/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs index ffe0082034c..15ed2c6e2b8 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmMapKey.cs @@ -7,7 +7,6 @@ namespace NHibernate.Cfg.MappingSchema { public partial class HbmMapKey: IColumnsMapping, ITypeMapping { - #region Implementation of IColumnsMapping [XmlIgnore] diff --git a/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs b/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs index 96619ed8302..017e0b63aab 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmMapKeyManyToMany.cs @@ -7,7 +7,6 @@ namespace NHibernate.Cfg.MappingSchema { public partial class HbmMapKeyManyToMany: IColumnsMapping, IFormulasMapping, IRelationship { - #region Implementation of IColumnsMapping [XmlIgnore] diff --git a/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs b/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs index a941789f592..8162f93f029 100644 --- a/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs +++ b/src/NHibernate/Cfg/MappingSchema/HbmNestedCompositeElement.cs @@ -55,7 +55,7 @@ public bool OptimisticLock protected override HbmMeta[] Metadatas { - get { return Array.Empty();} + get { return Array.Empty(); } } #endregion diff --git a/src/NHibernate/Cfg/SettingsFactory.cs b/src/NHibernate/Cfg/SettingsFactory.cs index 3cb29c0e306..24c5eebce67 100644 --- a/src/NHibernate/Cfg/SettingsFactory.cs +++ b/src/NHibernate/Cfg/SettingsFactory.cs @@ -207,7 +207,6 @@ public Settings BuildSettings(IDictionary properties) if (string.IsNullOrEmpty(cacheRegionPrefix)) cacheRegionPrefix = null; if (cacheRegionPrefix != null) log.Info("Cache region prefix: {0}", cacheRegionPrefix); - if (useQueryCache) { string queryCacheFactoryClassName = PropertiesHelper.GetString(Environment.QueryCacheFactory, properties, diff --git a/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs index 5e111956a15..a8db6c1638f 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs @@ -306,7 +306,6 @@ protected void BindComponent(IComponentMapping componentMapping, Component model model.IsEmbedded = false; model.IsDynamic = true; } - else if (reflectedClass != null) { model.ComponentClass = reflectedClass; diff --git a/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs index fff9351682c..00e384c5e76 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs @@ -153,12 +153,10 @@ private System.Type GetPropertyType(System.Type containingType, string propertyN { return ClassForNameChecked(idSchema.@class, mappings, "could not find class: {0}"); } - else if (containingType == null) { return null; } - else { string access = idSchema.access ?? mappings.DefaultAccess; diff --git a/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs index edf40d8cf00..8984459d119 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs @@ -942,7 +942,6 @@ private void BindManyToManySubelements(HbmManyToMany manyToManyMapping, Mapping. string.Format( "many-to-many defining filter or where without join fetching not valid within collection using join fetching [{0}]", collection.Role)); - } new FiltersBinder(collection, Mappings).Bind(filters, collection.AddManyToManyFilter); diff --git a/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs b/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs index d212e89e5ed..afbb135c143 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/MappingLogExtensions.cs @@ -3,7 +3,6 @@ using NHibernate.Mapping; using NHibernate.Type; - namespace NHibernate.Cfg.XmlHbmBinding { public static class MappingLogExtensions diff --git a/src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs index f168868b621..9de85b622e9 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs @@ -53,20 +53,20 @@ private INativeSQLQueryReturn CreateQueryReturn(object item, int count) HbmReturnScalar returnScalarSchema = item as HbmReturnScalar; if (returnScalarSchema != null) - return CreateScalarReturn(returnScalarSchema); + return CreateScalarReturn(returnScalarSchema); else if (returnSchema != null) - return CreateReturn(returnSchema, count); + return CreateReturn(returnSchema, count); else if (returnJoinSchema != null) - return CreateJoinReturn(returnJoinSchema); + return CreateJoinReturn(returnJoinSchema); else if (loadCollectionSchema != null) - return CreateLoadCollectionReturn(loadCollectionSchema); + return CreateLoadCollectionReturn(loadCollectionSchema); else - return null; - } + return null; + } private INativeSQLQueryReturn CreateScalarReturn(HbmReturnScalar returnScalarSchema) { diff --git a/src/NHibernate/Cfg/XmlHbmBinding/SubclassBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/SubclassBinder.cs index 00c57e4d000..bd1b133b3c2 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/SubclassBinder.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/SubclassBinder.cs @@ -60,6 +60,5 @@ public void HandleSubclass(PersistentClass model, HbmSubclass subClassMapping, I new FiltersBinder(model, Mappings).Bind(subClassMapping.filter); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Cfg/XmlHbmBinding/ValuePropertyBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/ValuePropertyBinder.cs index 1d838b6b32e..ea62db092ec 100644 --- a/src/NHibernate/Cfg/XmlHbmBinding/ValuePropertyBinder.cs +++ b/src/NHibernate/Cfg/XmlHbmBinding/ValuePropertyBinder.cs @@ -190,7 +190,6 @@ public void BindSimpleValue(HbmKeyProperty mapKeyManyToManyMapping, string prope name = mappings.NamingStrategy.PropertyToColumnName(propertyPath), length = mapKeyManyToManyMapping.length, }); - } public void BindSimpleValue(HbmKeyManyToOne mapKeyManyToManyMapping, string propertyPath, bool isNullable) diff --git a/src/NHibernate/Collection/Generic/PersistentGenericList.cs b/src/NHibernate/Collection/Generic/PersistentGenericList.cs index 8c676663f56..4e54262a85e 100644 --- a/src/NHibernate/Collection/Generic/PersistentGenericList.cs +++ b/src/NHibernate/Collection/Generic/PersistentGenericList.cs @@ -53,7 +53,6 @@ public PersistentGenericList(ISessionImplementor session, IList list) : base( IsDirectlyAccessible = true; } - public override object GetSnapshot(ICollectionPersister persister) { var clonedList = new List(WrappedList.Count); @@ -242,7 +241,6 @@ public override int GetHashCode() return WrappedList.GetHashCode(); } - #region IList Members int IList.Add(object value) @@ -333,7 +331,6 @@ bool IList.IsFixedSize #endregion - #region IList Members public int IndexOf(T item) @@ -404,7 +401,6 @@ public T this[int index] #endregion - #region ICollection Members void ICollection.CopyTo(Array array, int arrayIndex) @@ -438,7 +434,6 @@ bool ICollection.IsSynchronized #endregion - #region ICollection Members public void Add(T item) @@ -492,7 +487,6 @@ public bool Remove(T item) #endregion - #region IEnumerable Members IEnumerator IEnumerable.GetEnumerator() diff --git a/src/NHibernate/Collection/Generic/PersistentGenericMap.cs b/src/NHibernate/Collection/Generic/PersistentGenericMap.cs index 994f71e0d44..20f4d5ba657 100644 --- a/src/NHibernate/Collection/Generic/PersistentGenericMap.cs +++ b/src/NHibernate/Collection/Generic/PersistentGenericMap.cs @@ -238,7 +238,6 @@ public override bool EntryExists(object entry, int i) return WrappedMap.ContainsKey(((KeyValuePair)entry).Key); } - #region IDictionary Members public bool ContainsKey(TKey key) @@ -285,7 +284,6 @@ public bool Remove(TKey key) return true; } - public bool TryGetValue(TKey key, out TValue value) { object result = ReadElementByIndex(key); diff --git a/src/NHibernate/Collection/Generic/PersistentGenericSet.cs b/src/NHibernate/Collection/Generic/PersistentGenericSet.cs index e1c522cf753..16a6169ce0c 100644 --- a/src/NHibernate/Collection/Generic/PersistentGenericSet.cs +++ b/src/NHibernate/Collection/Generic/PersistentGenericSet.cs @@ -45,7 +45,6 @@ public PersistentGenericSet() { } - /// /// Constructor matching super. /// Instantiates a lazy set (the underlying set is un-initialized). @@ -110,7 +109,6 @@ public override bool EqualsSnapshot(ICollectionPersister persister) return false; } - foreach (T obj in WrappedSet) { T oldValue; @@ -224,7 +222,6 @@ public override IEnumerable GetDeletes(ICollectionPersister persister, bool inde deletes.AddRange(sn.Where(obj => !WrappedSet.Contains(obj))); - foreach (var obj in WrappedSet) { T oldValue; @@ -295,14 +292,12 @@ public override bool IsWrapper(object collection) #region ISet Members - public bool Contains(T item) { bool? exists = ReadElementExistence(item); return exists == null ? WrappedSet.Contains(item) : exists.Value; } - public bool Add(T o) { bool? exists = IsOperationQueueEnabled ? ReadElementExistence(o) : null; diff --git a/src/NHibernate/Collection/ILazyInitializedCollection.cs b/src/NHibernate/Collection/ILazyInitializedCollection.cs index 768c0702c75..6423a5241fc 100644 --- a/src/NHibernate/Collection/ILazyInitializedCollection.cs +++ b/src/NHibernate/Collection/ILazyInitializedCollection.cs @@ -22,6 +22,5 @@ public partial interface ILazyInitializedCollection /// Force immediate initialization. /// void ForceInitialization(); - } } diff --git a/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs b/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs index 076b3b0b3ad..cbdf5bb3f16 100644 --- a/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs +++ b/src/NHibernate/Connection/UserSuppliedConnectionProvider.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Data.Common; - namespace NHibernate.Connection { /// @@ -61,4 +60,4 @@ public override void Configure(IDictionary settings) ConfigureDriver(settings); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/ConnectionReleaseMode.cs b/src/NHibernate/ConnectionReleaseMode.cs index a7d828fe9e6..3f9967ab807 100644 --- a/src/NHibernate/ConnectionReleaseMode.cs +++ b/src/NHibernate/ConnectionReleaseMode.cs @@ -33,7 +33,7 @@ public static string ToString(ConnectionReleaseMode value) case ConnectionReleaseMode.AfterStatement: return "after_statement"; case ConnectionReleaseMode.AfterTransaction: - return "after_transaction" ; + return "after_transaction"; case ConnectionReleaseMode.OnClose: return "on_close"; default: @@ -41,4 +41,4 @@ public static string ToString(ConnectionReleaseMode value) } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Context/ThreadLocalSessionContext.cs b/src/NHibernate/Context/ThreadLocalSessionContext.cs index 52735306949..2f59d103ee3 100644 --- a/src/NHibernate/Context/ThreadLocalSessionContext.cs +++ b/src/NHibernate/Context/ThreadLocalSessionContext.cs @@ -40,7 +40,6 @@ public partial class ThreadLocalSessionContext : ICurrentSessionContext protected readonly ISessionFactoryImplementor factory; - public ThreadLocalSessionContext(ISessionFactoryImplementor factory) { this.factory = factory; diff --git a/src/NHibernate/Criterion/AbstractCriterion.cs b/src/NHibernate/Criterion/AbstractCriterion.cs index 6ce1d41247c..98ffe003802 100644 --- a/src/NHibernate/Criterion/AbstractCriterion.cs +++ b/src/NHibernate/Criterion/AbstractCriterion.cs @@ -41,7 +41,6 @@ public abstract class AbstractCriterion : ICriterion /// /// An array of IProjection used by the Expression. public abstract IProjection[] GetProjections(); - #endregion @@ -57,7 +56,6 @@ public abstract class AbstractCriterion : ICriterion return new OrExpression(lhs, rhs); } - public static AbstractCriterion operator &(AbstractCriterion lhs, AbstractEmptinessExpression rhs) { return new AndExpression(lhs, rhs); @@ -68,7 +66,6 @@ public abstract class AbstractCriterion : ICriterion return new OrExpression(lhs, rhs); } - public static AbstractCriterion operator !(AbstractCriterion crit) { return new NotExpression(crit); diff --git a/src/NHibernate/Criterion/AbstractEmptinessExpression.cs b/src/NHibernate/Criterion/AbstractEmptinessExpression.cs index bd0f5ed45fd..88631c595b9 100644 --- a/src/NHibernate/Criterion/AbstractEmptinessExpression.cs +++ b/src/NHibernate/Criterion/AbstractEmptinessExpression.cs @@ -16,7 +16,6 @@ public abstract class AbstractEmptinessExpression : AbstractCriterion protected abstract bool ExcludeEmpty { get; } - protected AbstractEmptinessExpression(string propertyName) { this.propertyName = propertyName; @@ -62,7 +61,6 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri return new SqlString(new object[] {ExcludeEmpty ? "exists" : "not exists", innerSelect.ToString()}); } - protected IQueryableCollection GetQueryableCollection(string entityName, string actualPropertyName, ISessionFactoryImplementor factory) { diff --git a/src/NHibernate/Criterion/CriterionUtil.cs b/src/NHibernate/Criterion/CriterionUtil.cs index f07c07f1447..175ce58dbe1 100644 --- a/src/NHibernate/Criterion/CriterionUtil.cs +++ b/src/NHibernate/Criterion/CriterionUtil.cs @@ -120,7 +120,6 @@ public static TypedValue[] GetTypedValues(ICriteriaQuery criteriaQuery, ICriteri } } return types.ToArray(); - } } } diff --git a/src/NHibernate/Criterion/Example.cs b/src/NHibernate/Criterion/Example.cs index c6002b01ea4..c3dd2b40142 100644 --- a/src/NHibernate/Criterion/Example.cs +++ b/src/NHibernate/Criterion/Example.cs @@ -345,7 +345,6 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri return builder.ToSqlString(); } - //note: now that Criterion are adding typed values via ICriteriaQuery.AddUsedTypedValues this function is never called. public override TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery criteriaQuery) { diff --git a/src/NHibernate/Criterion/Junction.cs b/src/NHibernate/Criterion/Junction.cs index c6f9fc671b2..d7becef1005 100644 --- a/src/NHibernate/Criterion/Junction.cs +++ b/src/NHibernate/Criterion/Junction.cs @@ -98,7 +98,6 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri sqlBuilder.Add(this.criteria[this.criteria.Count - 1].ToSqlString(criteria, criteriaQuery)); - sqlBuilder.Add(")"); return sqlBuilder.ToSqlString(); diff --git a/src/NHibernate/Criterion/Lambda/LambdaNaturalIdentifierBuilder.cs b/src/NHibernate/Criterion/Lambda/LambdaNaturalIdentifierBuilder.cs index 781d11b8979..58fccb6d8e1 100644 --- a/src/NHibernate/Criterion/Lambda/LambdaNaturalIdentifierBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/LambdaNaturalIdentifierBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections; using System.Collections.Generic; @@ -25,7 +24,5 @@ public NaturalIdentifier Is(object value) { return naturalIdentifier.Set(propertyName, value); } - } - } diff --git a/src/NHibernate/Criterion/Lambda/LambdaRestrictionBuilder.cs b/src/NHibernate/Criterion/Lambda/LambdaRestrictionBuilder.cs index f1bb38f93df..841ab5892ad 100644 --- a/src/NHibernate/Criterion/Lambda/LambdaRestrictionBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/LambdaRestrictionBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections; using System.Collections.Generic; @@ -9,7 +8,6 @@ namespace NHibernate.Criterion.Lambda { - public class LambdaRestrictionBuilder { public class LambdaBetweenBuilder @@ -167,7 +165,5 @@ public AbstractCriterion IsLike(string value, MatchMode matchMode, char? escapeC { return Process(Restrictions.Like(projection.AsProperty(), value, matchMode, escapeChar)); } - } - } diff --git a/src/NHibernate/Criterion/Lambda/LambdaSubqueryBuilder.cs b/src/NHibernate/Criterion/Lambda/LambdaSubqueryBuilder.cs index 9206e406718..a40c43911c7 100644 --- a/src/NHibernate/Criterion/Lambda/LambdaSubqueryBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/LambdaSubqueryBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -8,7 +7,6 @@ namespace NHibernate.Criterion.Lambda { - public class LambdaSubqueryBuilder { private string propertyName; @@ -189,7 +187,5 @@ public AbstractCriterion NotIn(QueryOver detachedCriteria) { return CreatePropertyCriterion(Subqueries.PropertyNotIn, Subqueries.NotIn, detachedCriteria); } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverFetchBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverFetchBuilder.cs index c2991047c6e..54dd84bdae4 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverFetchBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverFetchBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -12,27 +11,22 @@ namespace NHibernate.Criterion.Lambda [Obsolete] public class QueryOverFetchBuilder : QueryOverFetchBuilderBase, TRoot, TSubType> { - public QueryOverFetchBuilder(QueryOver root, Expression> path) : base(root, path) { } - } //Since 5.2 [Obsolete] public class IQueryOverFetchBuilder : QueryOverFetchBuilderBase, TRoot, TSubType> { - public IQueryOverFetchBuilder(IQueryOver root, Expression> path) : base(root, path) { } - } //Since 5.2 [Obsolete] public class QueryOverFetchBuilderBase where TReturn : IQueryOver { - protected TReturn root; protected string path; @@ -68,7 +62,5 @@ public TReturn Default return this.root; } } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverJoinBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverJoinBuilder.cs index 3061b46c505..b1cfe32fef7 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverJoinBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverJoinBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -8,7 +7,6 @@ namespace NHibernate.Criterion.Lambda { - public class QueryOverJoinBuilder : QueryOverJoinBuilderBase, TRoot, TSubType> { public QueryOverJoinBuilder(QueryOver root, JoinType joinType) : base(root, joinType) { } @@ -112,7 +110,6 @@ public QueryOver JoinQueryOver(Expression>> path { return root.JoinQueryOver(path, alias, joinType, withClause); } - } public class IQueryOverJoinBuilder : QueryOverJoinBuilderBase, TRoot, TSubType> @@ -218,12 +215,10 @@ public IQueryOver JoinQueryOver(Expression>> pat { return root.JoinQueryOver(path, alias, joinType, withClause); } - } public class QueryOverJoinBuilderBase where TReturn : IQueryOver { - protected TReturn root; protected JoinType joinType; @@ -302,7 +297,5 @@ public TReturn JoinAlias(Expression>> path, Expression : QueryOverLockBuilderBase, TRoot, TSubType> { - public QueryOverLockBuilder(QueryOver root, Expression> alias) : base(root, alias) { } - } public class IQueryOverLockBuilder : QueryOverLockBuilderBase, TRoot, TSubType> { - public IQueryOverLockBuilder(IQueryOver root, Expression> alias) : base(root, alias) { } - } public class QueryOverLockBuilderBase where TReturn : IQueryOver { - protected TReturn root; protected string alias; @@ -100,7 +93,5 @@ public TReturn Write return this.root; } } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverOrderBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverOrderBuilder.cs index 40a4bc5d5d8..1bc7044a61f 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverOrderBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverOrderBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -8,10 +7,8 @@ namespace NHibernate.Criterion.Lambda { - public class QueryOverOrderBuilder : QueryOverOrderBuilderBase, TRoot, TSubType> { - public QueryOverOrderBuilder(QueryOver root, Expression> path) : base(root, path) {} @@ -20,12 +17,10 @@ public QueryOverOrderBuilder(QueryOver root, Expression root, ExpressionProcessor.ProjectionInfo projection) : base(root, projection) {} - } public class IQueryOverOrderBuilder : QueryOverOrderBuilderBase, TRoot, TSubType> { - public IQueryOverOrderBuilder(IQueryOver root, Expression> path) : base(root, path) {} @@ -34,12 +29,10 @@ public IQueryOverOrderBuilder(IQueryOver root, Expression root, ExpressionProcessor.ProjectionInfo projection) : base(root, projection) {} - } public class QueryOverOrderBuilderBase where TReturn : IQueryOver { - protected TReturn root; protected LambdaExpression path; protected bool isAlias; @@ -93,7 +86,5 @@ public TReturn Desc return this.root; } } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverProjectionBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverProjectionBuilder.cs index c480ba4f209..8912fdf17ff 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverProjectionBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverProjectionBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Linq.Expressions; @@ -6,10 +5,8 @@ namespace NHibernate.Criterion.Lambda { - public class QueryOverProjectionBuilder { - private ProjectionList projectionList; private IProjection lastProjection = null; @@ -216,7 +213,5 @@ public QueryOverProjectionBuilder SelectSum(Expression> expressi PushProjection(Projections.Sum(expression)); return this; } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverRestrictionBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverRestrictionBuilder.cs index a7f71c68c42..79d165bfb59 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverRestrictionBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverRestrictionBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections; using System.Collections.Generic; @@ -9,10 +8,8 @@ namespace NHibernate.Criterion.Lambda { - public class QueryOverRestrictionBuilder : QueryOverRestrictionBuilderBase, TRoot, TSubType> { - public QueryOverRestrictionBuilder(QueryOver root, ExpressionProcessor.ProjectionInfo projection) : base(root, projection) { } @@ -24,12 +21,10 @@ public QueryOverRestrictionBuilder Not return this; } } - } public class IQueryOverRestrictionBuilder : QueryOverRestrictionBuilderBase, TRoot, TSubType> { - public IQueryOverRestrictionBuilder(IQueryOver root, ExpressionProcessor.ProjectionInfo projection) : base(root, projection) { } @@ -41,7 +36,6 @@ public IQueryOverRestrictionBuilder Not return this; } } - } public class QueryOverRestrictionBuilderBase @@ -200,7 +194,5 @@ public TReturn IsLike(string value, MatchMode matchMode, char? escapeChar) { return Add(Restrictions.Like(projection.AsProperty(), value, matchMode, escapeChar)); } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverSubqueryBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverSubqueryBuilder.cs index 978e37db5a9..752eadc3f97 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverSubqueryBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverSubqueryBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -8,28 +7,22 @@ namespace NHibernate.Criterion.Lambda { - public class QueryOverSubqueryBuilder : QueryOverSubqueryBuilderBase, TRoot, TSubType, QueryOverSubqueryPropertyBuilder> { - public QueryOverSubqueryBuilder(QueryOver root) : base(root) { } - } public class IQueryOverSubqueryBuilder : QueryOverSubqueryBuilderBase, TRoot, TSubType, IQueryOverSubqueryPropertyBuilder> { - public IQueryOverSubqueryBuilder(IQueryOver root) : base(root) { } - } public class QueryOverSubqueryBuilderBase where TReturn : IQueryOver where TBuilderType : QueryOverSubqueryPropertyBuilderBase, new() { - protected TReturn root; protected QueryOverSubqueryBuilderBase(TReturn root) @@ -137,7 +130,5 @@ public TBuilderType WhereValue(object value) { return (TBuilderType)new TBuilderType().Set(root, null, value); } - } - } diff --git a/src/NHibernate/Criterion/Lambda/QueryOverSubqueryPropertyBuilder.cs b/src/NHibernate/Criterion/Lambda/QueryOverSubqueryPropertyBuilder.cs index abcef2cf8f5..ad065bf4e9f 100644 --- a/src/NHibernate/Criterion/Lambda/QueryOverSubqueryPropertyBuilder.cs +++ b/src/NHibernate/Criterion/Lambda/QueryOverSubqueryPropertyBuilder.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -8,21 +7,16 @@ namespace NHibernate.Criterion.Lambda { - public class QueryOverSubqueryPropertyBuilder : QueryOverSubqueryPropertyBuilderBase, TRoot, TSubType> { - public QueryOverSubqueryPropertyBuilder() : base() { } - } public class IQueryOverSubqueryPropertyBuilder : QueryOverSubqueryPropertyBuilderBase, TRoot, TSubType> { - public IQueryOverSubqueryPropertyBuilder() : base() { } - } public abstract class QueryOverSubqueryPropertyBuilderBase @@ -35,7 +29,6 @@ protected QueryOverSubqueryPropertyBuilderBase() { } public class QueryOverSubqueryPropertyBuilderBase : QueryOverSubqueryPropertyBuilderBase where TReturn : IQueryOver { - protected TReturn root; protected string path; protected object value; @@ -236,7 +229,5 @@ public TReturn NotIn(QueryOver detachedCriteria) AddSubquery(Subqueries.PropertyNotIn, Subqueries.NotIn, detachedCriteria); return root; } - } - } diff --git a/src/NHibernate/Criterion/LikeExpression.cs b/src/NHibernate/Criterion/LikeExpression.cs index f18a59ee4f1..6cbaba95bc6 100644 --- a/src/NHibernate/Criterion/LikeExpression.cs +++ b/src/NHibernate/Criterion/LikeExpression.cs @@ -40,7 +40,6 @@ public LikeExpression(IProjection projection, string value, MatchMode matchMode) typedValue = new TypedValue(NHibernateUtil.String, this.value, false); } - public LikeExpression(string propertyName, string value) : this(propertyName, value, null, false) { diff --git a/src/NHibernate/Criterion/LogicalExpression.cs b/src/NHibernate/Criterion/LogicalExpression.cs index 83ee3759dbc..3b683f0163d 100644 --- a/src/NHibernate/Criterion/LogicalExpression.cs +++ b/src/NHibernate/Criterion/LogicalExpression.cs @@ -82,7 +82,6 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri false // not wrapping because the prefix and postfix params already take care of that ); - return sqlBuilder.ToSqlString(); } diff --git a/src/NHibernate/Criterion/Projections.cs b/src/NHibernate/Criterion/Projections.cs index 5142c94c281..468bcb50511 100644 --- a/src/NHibernate/Criterion/Projections.cs +++ b/src/NHibernate/Criterion/Projections.cs @@ -153,7 +153,6 @@ public static AggregateProjection Max(IProjection projection) return new AggregateProjection("max", projection); } - /// /// A property minimum value /// @@ -300,7 +299,6 @@ public static IProjection Cast(IType type, IProjection projection) return new CastProjection(type, projection); } - /// /// Return a constant value /// @@ -322,7 +320,6 @@ public static IProjection Constant(object obj, IType type) return new ConstantProjection(obj,type); } - /// /// Calls the named /// diff --git a/src/NHibernate/Criterion/ProjectionsExtensions.cs b/src/NHibernate/Criterion/ProjectionsExtensions.cs index 7d7067ea98b..c3fccc224f0 100644 --- a/src/NHibernate/Criterion/ProjectionsExtensions.cs +++ b/src/NHibernate/Criterion/ProjectionsExtensions.cs @@ -186,7 +186,6 @@ internal static IProjection ProcessInt64Abs(MethodCallExpression methodCallExpre return Projections.SqlFunction("abs", NHibernateUtil.Int64, property); } - internal static IProjection ProcessRound(MethodCallExpression methodCallExpression) { IProjection innerProjection = @@ -199,7 +198,6 @@ internal static IProjection ProcessRound(MethodCallExpression methodCallExpressi return Projections.SqlFunction("round", NHibernateUtil.Double, innerProjection, digitsProjection); } - /// /// Project SQL function abs() /// Note: throws an exception outside of a QueryOver expression diff --git a/src/NHibernate/Criterion/Property.cs b/src/NHibernate/Criterion/Property.cs index 0903544bb1e..c08325824ad 100644 --- a/src/NHibernate/Criterion/Property.cs +++ b/src/NHibernate/Criterion/Property.cs @@ -191,7 +191,6 @@ public Property GetProperty(String propertyName) return ForName(PropertyName + '.' + propertyName); } - public AbstractCriterion Eq(DetachedCriteria subselect) { return Subqueries.PropertyEq(PropertyName, subselect); @@ -277,4 +276,4 @@ public AbstractCriterion GeSome(DetachedCriteria subselect) return Subqueries.PropertyGeSome(PropertyName, subselect); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Criterion/QueryOver.cs b/src/NHibernate/Criterion/QueryOver.cs index 9994ce9b703..d1b77e7872a 100644 --- a/src/NHibernate/Criterion/QueryOver.cs +++ b/src/NHibernate/Criterion/QueryOver.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq; @@ -13,11 +12,9 @@ namespace NHibernate.Criterion { - [Serializable] public abstract class QueryOver { - protected ICriteria criteria; protected CriteriaImpl impl; @@ -219,7 +216,6 @@ public S As() throw new HibernateException("Incorrect syntax; .As method is for use in Lambda expressions only."); } - IList IQueryOver.List() { return List(); } @@ -279,7 +275,6 @@ IQueryOver IQueryOver.CacheRegion(string cacheRegion) IQueryOver IQueryOver.ReadOnly() { return ReadOnly(); } - } /// @@ -289,7 +284,6 @@ IQueryOver IQueryOver.ReadOnly() public class QueryOver : QueryOver, IQueryOver, ISupportEntityJoinQueryOver, ISupportSelectModeQueryOver { - protected internal QueryOver() { impl = new CriteriaImpl(typeof(TRoot), null); @@ -1023,5 +1017,4 @@ public QueryOver Fetch(SelectMode mode, Expression> path) instead")] @@ -109,7 +108,6 @@ public static IQueryOver Write(this Lambda.IQu return builder.Write; } - // Order builder public static QueryOver Asc(this Lambda.QueryOverOrderBuilder builder) { @@ -131,7 +129,6 @@ public static IQueryOver Desc(this Lambda.IQue return builder.Desc; } - // Restriction builder public static QueryOver IsEmpty(this Lambda.QueryOverRestrictionBuilder builder) { @@ -172,6 +169,5 @@ public static IQueryOver IsNull(this Lambda.IQ { return builder.IsNull; } - } } diff --git a/src/NHibernate/Criterion/Restrictions.cs b/src/NHibernate/Criterion/Restrictions.cs index bf74f424f11..2ca3e11d374 100644 --- a/src/NHibernate/Criterion/Restrictions.cs +++ b/src/NHibernate/Criterion/Restrictions.cs @@ -171,7 +171,6 @@ public static SimpleExpression Lt(string propertyName, object value) return new SimpleExpression(propertyName, value, " < "); } - /// /// Apply a "less than" constraint to the projection /// @@ -222,7 +221,6 @@ public static SimpleExpression Ge(IProjection projection, object value) return new SimpleExpression(projection, value, " >= "); } - /// /// Apply a "between" constraint to the named property /// @@ -378,7 +376,6 @@ public static AbstractCriterion EqProperty(IProjection projection, string otherP return new EqPropertyExpression(projection, otherPropertyName); } - /// /// Apply an "equal" constraint to lshProjection and rshProjection /// @@ -390,7 +387,6 @@ public static AbstractCriterion EqProperty(IProjection lshProjection, IProjectio return new EqPropertyExpression(lshProjection, rshProjection); } - /// /// Apply an "equal" constraint to the property and rshProjection /// @@ -523,7 +519,6 @@ public static AbstractCriterion GeProperty(IProjection projection, string otherP return new GePropertyExpression(projection, otherPropertyName); } - /// /// Apply a "greater than or equal" constraint to two properties /// @@ -590,7 +585,6 @@ public static AbstractCriterion LeProperty(string propertyName, string otherProp return new LePropertyExpression(propertyName, otherPropertyName); } - /// /// Apply a "less than or equal" constraint to two properties /// @@ -602,7 +596,6 @@ public static AbstractCriterion LeProperty(IProjection projection, string otherP return new LePropertyExpression(projection, otherPropertyName); } - /// /// Apply a "less than or equal" constraint to two properties /// @@ -614,7 +607,6 @@ public static AbstractCriterion LeProperty(string propertyName, IProjection proj return new LePropertyExpression(propertyName, projection); } - /// /// Apply a "less than or equal" constraint to two properties /// @@ -626,7 +618,6 @@ public static AbstractCriterion LeProperty(IProjection lhsProjection, IProjectio return new LePropertyExpression(lhsProjection, rhsProjection); } - /// /// Apply an "is not null" constraint to the named property /// @@ -804,6 +795,5 @@ public static LambdaRestrictionBuilder On(Expression> expression) ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(expression.Body); return new LambdaRestrictionBuilder(projection); } - } } diff --git a/src/NHibernate/Criterion/RowCountProjection.cs b/src/NHibernate/Criterion/RowCountProjection.cs index ff6ad411159..6b5bce40196 100644 --- a/src/NHibernate/Criterion/RowCountProjection.cs +++ b/src/NHibernate/Criterion/RowCountProjection.cs @@ -38,7 +38,6 @@ public override bool IsGrouped public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery) { - throw new InvalidOperationException("not a grouping projection"); } } diff --git a/src/NHibernate/Criterion/SubqueryExpression.cs b/src/NHibernate/Criterion/SubqueryExpression.cs index 6fa12f37936..6d2d76a76f4 100644 --- a/src/NHibernate/Criterion/SubqueryExpression.cs +++ b/src/NHibernate/Criterion/SubqueryExpression.cs @@ -98,7 +98,6 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri return buf.ToSqlString(); } - public override string ToString() { if (prefixOp) @@ -135,4 +134,4 @@ static ISessionImplementor DeriveRootSession(ICriteria criteria) return null; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Dialect/DB2Dialect.cs b/src/NHibernate/Dialect/DB2Dialect.cs index 9a830de2c4e..d56ab6dc06f 100644 --- a/src/NHibernate/Dialect/DB2Dialect.cs +++ b/src/NHibernate/Dialect/DB2Dialect.cs @@ -179,7 +179,6 @@ public override string IdentityInsertString get { return "default"; } } - public override string GetSelectSequenceNextValString(string sequenceName) { return "nextval for " + sequenceName; diff --git a/src/NHibernate/Dialect/Dialect.cs b/src/NHibernate/Dialect/Dialect.cs index 03afd28afb6..7447f9494e7 100644 --- a/src/NHibernate/Dialect/Dialect.cs +++ b/src/NHibernate/Dialect/Dialect.cs @@ -795,7 +795,6 @@ public virtual string GetDropForeignKeyConstraintString(string constraintName) return " drop constraint " + constraintName; } - /// /// The syntax that is used to check if a constraint does not exists before creating it /// diff --git a/src/NHibernate/Dialect/Function/AnsiTrimFunction.cs b/src/NHibernate/Dialect/Function/AnsiTrimFunction.cs index b7160f6afc7..741a4be79dc 100644 --- a/src/NHibernate/Dialect/Function/AnsiTrimFunction.cs +++ b/src/NHibernate/Dialect/Function/AnsiTrimFunction.cs @@ -11,7 +11,6 @@ public AnsiTrimFunction() { } - #region IFunctionGrammar Members bool IFunctionGrammar.IsSeparator(string token) diff --git a/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs b/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs index 4c080d62d59..299605adb03 100644 --- a/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs +++ b/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs @@ -96,7 +96,6 @@ public override string ToString() return name; } - #region IFunctionGrammar Members bool IFunctionGrammar.IsSeparator(string token) diff --git a/src/NHibernate/Dialect/Function/EmulatedLengthSubstringFunction.cs b/src/NHibernate/Dialect/Function/EmulatedLengthSubstringFunction.cs index 3758e21c67a..288cad0840d 100644 --- a/src/NHibernate/Dialect/Function/EmulatedLengthSubstringFunction.cs +++ b/src/NHibernate/Dialect/Function/EmulatedLengthSubstringFunction.cs @@ -24,7 +24,6 @@ public EmulatedLengthSubstringFunction() { } - #region ISQLFunction Members public override SqlString Render(IList args, ISessionFactoryImplementor factory) @@ -48,6 +47,5 @@ public override SqlString Render(IList args, ISessionFactoryImplementor factory) } #endregion - } } diff --git a/src/NHibernate/Dialect/GenericDialect.cs b/src/NHibernate/Dialect/GenericDialect.cs index a55c638d55e..2545630d291 100644 --- a/src/NHibernate/Dialect/GenericDialect.cs +++ b/src/NHibernate/Dialect/GenericDialect.cs @@ -1,4 +1,3 @@ - using System.Data; namespace NHibernate.Dialect diff --git a/src/NHibernate/Dialect/HanaDialectBase.cs b/src/NHibernate/Dialect/HanaDialectBase.cs index e76226eb449..b8de4f2a5d7 100644 --- a/src/NHibernate/Dialect/HanaDialectBase.cs +++ b/src/NHibernate/Dialect/HanaDialectBase.cs @@ -583,7 +583,6 @@ protected virtual void RegisterHANAFunctions() RegisterFunction("xmltable", new StandardSQLFunction("xmltable")); RegisterFunction("year", new StandardSQLFunction("year", NHibernateUtil.Int32)); RegisterFunction("years_between", new StandardSQLFunction("years_between", NHibernateUtil.Int32)); - } #region DDL support diff --git a/src/NHibernate/Dialect/InformixDialect.cs b/src/NHibernate/Dialect/InformixDialect.cs index 5c67f32c01b..7739018dc1e 100644 --- a/src/NHibernate/Dialect/InformixDialect.cs +++ b/src/NHibernate/Dialect/InformixDialect.cs @@ -68,7 +68,7 @@ public InformixDialect() RegisterFunction("substr", new StandardSQLFunction("substr")); // RegisterFunction("trim", new AnsiTrimFunction()); // defined in base class - // RegisterFunction("length", new StandardSQLFunction("length", NHibernateUtil.Int32)); // defined in base class + // RegisterFunction("length", new StandardSQLFunction("length", NHibernateUtil.Int32)); // defined in base class RegisterFunction("coalesce", new NvlFunction()); // base class override // RegisterFunction("abs", new StandardSQLFunction("abs")); // RegisterFunction("mod", new StandardSQLFunction("mod", NHibernateUtil.Int32)); diff --git a/src/NHibernate/Dialect/InformixDialect0940.cs b/src/NHibernate/Dialect/InformixDialect0940.cs index 59ef5b7a6e6..13563df43e8 100644 --- a/src/NHibernate/Dialect/InformixDialect0940.cs +++ b/src/NHibernate/Dialect/InformixDialect0940.cs @@ -8,7 +8,6 @@ //using NHibernate.Dialect.Schema; using Environment = NHibernate.Cfg.Environment; - namespace NHibernate.Dialect { /// @@ -42,7 +41,6 @@ public InformixDialect0940() RegisterColumnType(DbType.String, 2147483647, "CLOB"); } - /// Get the select command used retrieve the names of all sequences. /// The select command; or null if sequences are not supported. public override string QuerySequencesString @@ -106,8 +104,7 @@ public override string GetCreateSequenceString(string sequenceName) return "create sequence " + sequenceName; // + //" INCREMENT BY 1 START WITH 1 MINVALUE 1 NOCYCLE CACHE 20 NOORDER"; - - } + } // in .NET overloaded version cannot be overriden (in Java allowed) //protected override string GetCreateSequenceString(string sequenceName, int initialValue, int incrementSize) diff --git a/src/NHibernate/Dialect/InformixDialect1000.cs b/src/NHibernate/Dialect/InformixDialect1000.cs index db4c9781591..cc231b26263 100644 --- a/src/NHibernate/Dialect/InformixDialect1000.cs +++ b/src/NHibernate/Dialect/InformixDialect1000.cs @@ -7,7 +7,6 @@ //using NHibernate.Dialect.Schema; using Environment = NHibernate.Cfg.Environment; - namespace NHibernate.Dialect { /// @@ -54,4 +53,4 @@ public override bool SupportsLimitOffset get { return true; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Dialect/MySQL55Dialect.cs b/src/NHibernate/Dialect/MySQL55Dialect.cs index 9c47c111221..c7a8004cb1d 100644 --- a/src/NHibernate/Dialect/MySQL55Dialect.cs +++ b/src/NHibernate/Dialect/MySQL55Dialect.cs @@ -1,4 +1,3 @@ - using System.Data; using NHibernate.Dialect.Function; diff --git a/src/NHibernate/Dialect/MySQLDialect.cs b/src/NHibernate/Dialect/MySQLDialect.cs index 59539395226..475c1d1e5c2 100644 --- a/src/NHibernate/Dialect/MySQLDialect.cs +++ b/src/NHibernate/Dialect/MySQLDialect.cs @@ -43,7 +43,6 @@ public MySQLDialect() //default: //http://dev.mysql.com/doc/refman/5.0/en/data-type-defaults.html - //string type RegisterColumnType(DbType.AnsiStringFixedLength, "CHAR(255)"); RegisterColumnType(DbType.AnsiStringFixedLength, 255, "CHAR($l)"); diff --git a/src/NHibernate/Dialect/SQLiteDialect.cs b/src/NHibernate/Dialect/SQLiteDialect.cs index 1d056f4603c..f1f86743313 100644 --- a/src/NHibernate/Dialect/SQLiteDialect.cs +++ b/src/NHibernate/Dialect/SQLiteDialect.cs @@ -25,7 +25,6 @@ public class SQLiteDialect : Dialect /// private bool _binaryGuid = true; - /// /// /// @@ -109,7 +108,6 @@ protected virtual void RegisterFunctions() RegisterFunction("strguid", new SQLFunctionTemplate(NHibernateUtil.String, "cast(?1 as char)")); } - public override void Configure(IDictionary settings) { base.Configure(settings); @@ -376,7 +374,6 @@ public override string Qualify(string catalog, string schema, string table) if (quoted) return OpenQuote + name + CloseQuote; return name; - } public override string NoColumnsInsertString diff --git a/src/NHibernate/Dialect/Schema/FirebirdMetaData.cs b/src/NHibernate/Dialect/Schema/FirebirdMetaData.cs index 8a9b42021c4..02920c2f7d2 100644 --- a/src/NHibernate/Dialect/Schema/FirebirdMetaData.cs +++ b/src/NHibernate/Dialect/Schema/FirebirdMetaData.cs @@ -95,5 +95,4 @@ public FirebirdForeignKeyMetadata(DataRow rs) Name = Convert.ToString(rs["CONSTRAINT_NAME"]); } } - } diff --git a/src/NHibernate/Dialect/Schema/IDataBaseSchema.cs b/src/NHibernate/Dialect/Schema/IDataBaseSchema.cs index d7e29207163..913db3f5a65 100644 --- a/src/NHibernate/Dialect/Schema/IDataBaseSchema.cs +++ b/src/NHibernate/Dialect/Schema/IDataBaseSchema.cs @@ -56,7 +56,7 @@ public interface IDataBaseSchema /// The name of the column that represent the TABLE_NAME in the /// returned by . /// - string ColumnNameForTableName { get;} + string ColumnNameForTableName { get; } /// /// Get the Table MetaData. diff --git a/src/NHibernate/Dialect/Schema/PostgreSQLMetadata.cs b/src/NHibernate/Dialect/Schema/PostgreSQLMetadata.cs index b4977075e99..74796bc8dbb 100644 --- a/src/NHibernate/Dialect/Schema/PostgreSQLMetadata.cs +++ b/src/NHibernate/Dialect/Schema/PostgreSQLMetadata.cs @@ -75,7 +75,6 @@ public override DataTable GetForeignKeys(string catalog, string schema, string t foreignKeys.Locale = CultureInfo.InvariantCulture; return foreignKeys; } - } public class PostgreSQLTableMetadata : AbstractTableMetadata @@ -160,4 +159,4 @@ public PostgreSQLForeignKeyMetadata(DataRow rs) Name = Convert.ToString(rs["CONSTRAINT_NAME"]); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Dialect/Schema/SapSQLAnywhere17MetaData.cs b/src/NHibernate/Dialect/Schema/SapSQLAnywhere17MetaData.cs index 9ff41672b3e..3922b4ecb2c 100644 --- a/src/NHibernate/Dialect/Schema/SapSQLAnywhere17MetaData.cs +++ b/src/NHibernate/Dialect/Schema/SapSQLAnywhere17MetaData.cs @@ -3,7 +3,6 @@ using System.Data; using System.Data.Common; - namespace NHibernate.Dialect.Schema { // Metadata for connections using the Sap.Data.SQLAnywhere.v4.5 ADO.NET provider diff --git a/src/NHibernate/Dialect/Schema/SchemaHelper.cs b/src/NHibernate/Dialect/Schema/SchemaHelper.cs index c35e13c34b8..6366f31d56f 100644 --- a/src/NHibernate/Dialect/Schema/SchemaHelper.cs +++ b/src/NHibernate/Dialect/Schema/SchemaHelper.cs @@ -5,7 +5,6 @@ namespace NHibernate.Dialect.Schema { public static class SchemaHelper { - /// /// Get a value from the DataRow. Multiple alternative column names can be given. /// The names are tried in order, and the value from the first present column @@ -28,7 +27,6 @@ public static object GetValue(DataRow row, params string[] alternativeColumnName throw new InvalidOperationException("None of the alternative column names found in the DataTable."); } - /// /// Get a string value from the DataRow. Multiple alternative column names can be given. /// The names are tried in order, and the value from the first present column diff --git a/src/NHibernate/Dialect/Schema/SybaseAnywhereMetaData.cs b/src/NHibernate/Dialect/Schema/SybaseAnywhereMetaData.cs index 61b82c1386f..5eae685adc0 100644 --- a/src/NHibernate/Dialect/Schema/SybaseAnywhereMetaData.cs +++ b/src/NHibernate/Dialect/Schema/SybaseAnywhereMetaData.cs @@ -3,7 +3,6 @@ using System.Data; using System.Data.Common; - namespace NHibernate.Dialect.Schema { // Metadata for connections using the iAnywhere.Data.SQLAnywhere ADO.NET provider diff --git a/src/NHibernate/Driver/DriverBase.cs b/src/NHibernate/Driver/DriverBase.cs index 1d63bc64dd8..b5f04cacd42 100644 --- a/src/NHibernate/Driver/DriverBase.cs +++ b/src/NHibernate/Driver/DriverBase.cs @@ -249,7 +249,7 @@ public void RemoveUnusedCommandParameters(DbCommand cmd, SqlString sqlString) public virtual void ExpandQueryParameters(DbCommand cmd, SqlString sqlString, SqlType[] parameterTypes) { if (UseNamedPrefixInSql) - return; // named parameters are ok + return; // named parameters are ok var expandedParameters = new List(); foreach (object part in sqlString) diff --git a/src/NHibernate/Driver/NDataReader.cs b/src/NHibernate/Driver/NDataReader.cs index ad92135f1ad..515777eab1b 100644 --- a/src/NHibernate/Driver/NDataReader.cs +++ b/src/NHibernate/Driver/NDataReader.cs @@ -552,7 +552,6 @@ internal static NResult Create(DbDataReader reader, bool isMidstream) return result; } - private static DataTable SafeGetSchemaTable(IDataReader reader, out NotSupportedException exception) { exception = null; diff --git a/src/NHibernate/Driver/OdbcDriver.cs b/src/NHibernate/Driver/OdbcDriver.cs index 80e6358617e..cf8df041cea 100644 --- a/src/NHibernate/Driver/OdbcDriver.cs +++ b/src/NHibernate/Driver/OdbcDriver.cs @@ -25,7 +25,6 @@ public class OdbcDriver private byte? _dbDateTimeScale; - public override void Configure(IDictionary settings) { base.Configure(settings); diff --git a/src/NHibernate/Driver/OleDbDriver.cs b/src/NHibernate/Driver/OleDbDriver.cs index 504411995e0..0401673a907 100644 --- a/src/NHibernate/Driver/OleDbDriver.cs +++ b/src/NHibernate/Driver/OleDbDriver.cs @@ -16,7 +16,6 @@ public class OleDbDriver : ReflectionBasedDriver #endif { - #if !NETFX public OleDbDriver() : base ("System.Data.OleDb", "System.Data.OleDb.OleDbConnection", "System.Data.OleDb.OleDbCommand") diff --git a/src/NHibernate/Driver/SapSQLAnywhere17Driver.cs b/src/NHibernate/Driver/SapSQLAnywhere17Driver.cs index 2edf3e071d8..cac8b8bed14 100644 --- a/src/NHibernate/Driver/SapSQLAnywhere17Driver.cs +++ b/src/NHibernate/Driver/SapSQLAnywhere17Driver.cs @@ -5,7 +5,6 @@ public class SapSQLAnywhere17Driver : ReflectionBasedDriver public SapSQLAnywhere17Driver() : base("Sap.Data.SQLAnywhere", "Sap.Data.SQLAnywhere.v4.5", "Sap.Data.SQLAnywhere.SAConnection", "Sap.Data.SQLAnywhere.SACommand") { - } public override bool UseNamedPrefixInSql => true; diff --git a/src/NHibernate/Driver/SqlClientDriver.cs b/src/NHibernate/Driver/SqlClientDriver.cs index 81d46097a50..682d755472a 100644 --- a/src/NHibernate/Driver/SqlClientDriver.cs +++ b/src/NHibernate/Driver/SqlClientDriver.cs @@ -104,7 +104,6 @@ System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass } #endif - /// /// MsSql requires the use of a Named Prefix in the SQL statement. /// @@ -284,7 +283,6 @@ protected static bool IsBlob(DbParameter dbParam, SqlType sqlType) return (sqlType is BinaryBlobSqlType) || ((DbType.Binary == dbParam.DbType) && sqlType.LengthDefined && (sqlType.Length > MsSql2000Dialect.MaxSizeForLengthLimitedBinary)); } - public override IResultSetsCommand GetResultSetsCommand(ISessionImplementor session) { return new BasicResultSetsCommand(session); diff --git a/src/NHibernate/DuplicateMappingException.cs b/src/NHibernate/DuplicateMappingException.cs index b510b23b5e6..3b9d43ce626 100644 --- a/src/NHibernate/DuplicateMappingException.cs +++ b/src/NHibernate/DuplicateMappingException.cs @@ -7,7 +7,6 @@ namespace NHibernate [Serializable] public class DuplicateMappingException : MappingException { - /// /// Initializes a new instance of the class. /// diff --git a/src/NHibernate/Engine/Cascade.cs b/src/NHibernate/Engine/Cascade.cs index 99a052a54e4..2c2c2987a3b 100644 --- a/src/NHibernate/Engine/Cascade.cs +++ b/src/NHibernate/Engine/Cascade.cs @@ -86,7 +86,6 @@ public Cascade(CascadingAction action, CascadePoint point, IEventSource eventSou this.action = action; } - /// Cascade an action from the parent entity instance to all its children. /// The parent's entity persister /// The parent reference. diff --git a/src/NHibernate/Engine/CascadeStyle.cs b/src/NHibernate/Engine/CascadeStyle.cs index 9bb5fb97ec9..0267c35b459 100644 --- a/src/NHibernate/Engine/CascadeStyle.cs +++ b/src/NHibernate/Engine/CascadeStyle.cs @@ -129,7 +129,6 @@ Object IObjectReference.GetRealObject(StreamingContext context) #region The CascadeStyle implementations - [Serializable] private class AllDeleteOrphanCascadeStyle : CascadeStyle { diff --git a/src/NHibernate/Engine/CascadingAction.cs b/src/NHibernate/Engine/CascadingAction.cs index 14f8af2d173..68e3aa4ee6e 100644 --- a/src/NHibernate/Engine/CascadingAction.cs +++ b/src/NHibernate/Engine/CascadingAction.cs @@ -38,8 +38,7 @@ public abstract partial class CascadingAction /// Does this action potentially extrapolate to orphan deletes? /// True if this action can lead to deletions of orphans. - public abstract bool DeleteOrphans { get;} - + public abstract bool DeleteOrphans { get; } /// Does the specified cascading action require verification of no cascade validity? /// True if this action requires no-cascade verification; false otherwise. diff --git a/src/NHibernate/Engine/Collections.cs b/src/NHibernate/Engine/Collections.cs index 69de56655c2..311903bde46 100644 --- a/src/NHibernate/Engine/Collections.cs +++ b/src/NHibernate/Engine/Collections.cs @@ -1,4 +1,3 @@ - using NHibernate.Collection; using NHibernate.Impl; using NHibernate.Persister.Collection; diff --git a/src/NHibernate/Engine/EntityUniqueKey.cs b/src/NHibernate/Engine/EntityUniqueKey.cs index aa728f37667..15edf429bbe 100644 --- a/src/NHibernate/Engine/EntityUniqueKey.cs +++ b/src/NHibernate/Engine/EntityUniqueKey.cs @@ -112,6 +112,5 @@ public override string ToString() { return string.Format("EntityUniqueKey{0}", MessageHelper.InfoString(entityName, uniqueKeyName, key)); } - } } diff --git a/src/NHibernate/Engine/ForeignKeys.cs b/src/NHibernate/Engine/ForeignKeys.cs index 91d3b0d0875..fe8dbb9cdea 100644 --- a/src/NHibernate/Engine/ForeignKeys.cs +++ b/src/NHibernate/Engine/ForeignKeys.cs @@ -1,4 +1,3 @@ - using NHibernate.Id; using NHibernate.Persister.Entity; using NHibernate.Proxy; @@ -98,7 +97,6 @@ private object NullifyTransientReferences(object value, IType type) /// private bool IsNullifiable(string entityName, object obj) { - //if (obj == org.hibernate.intercept.LazyPropertyInitializer_Fields.UNFETCHED_PROPERTY) // return false; //this is kinda the best we can do... @@ -270,7 +268,6 @@ public static object GetEntityIdentifierIfNotUnsaved(string entityName, object e string entityString = entity.ToString(); throw new TransientObjectException( string.Format("object references an unsaved transient instance - save the transient instance before flushing or set cascade action for the property to something that would make it autosave. Type: {0}, Entity: {1}", entityName, entityString)); - } id = session.GetEntityPersister(entityName, entity).GetIdentifier(entity); } diff --git a/src/NHibernate/Engine/IPersistenceContext.cs b/src/NHibernate/Engine/IPersistenceContext.cs index 3544bc2d3a9..f23f9731788 100644 --- a/src/NHibernate/Engine/IPersistenceContext.cs +++ b/src/NHibernate/Engine/IPersistenceContext.cs @@ -17,44 +17,44 @@ namespace NHibernate.Engine /// public partial interface IPersistenceContext { - bool IsStateless { get;} + bool IsStateless { get; } /// /// Get the session to which this persistence context is bound. /// - ISessionImplementor Session { get;} + ISessionImplementor Session { get; } /// /// Retrieve this persistence context's managed load context. /// - LoadContexts LoadContexts { get;} + LoadContexts LoadContexts { get; } /// /// Get the BatchFetchQueue, instantiating one if necessary. /// - BatchFetchQueue BatchFetchQueue { get;} + BatchFetchQueue BatchFetchQueue { get; } /// Retrieve the set of EntityKeys representing nullifiable references - ISet NullifiableEntityKeys { get;} + ISet NullifiableEntityKeys { get; } /// Get the mapping from key value to entity instance - IDictionary EntitiesByKey { get;} + IDictionary EntitiesByKey { get; } /// Get the mapping from entity instance to entity entry - IDictionary EntityEntries { get;} + IDictionary EntityEntries { get; } /// Get the mapping from collection instance to collection entry - IDictionary CollectionEntries { get;} + IDictionary CollectionEntries { get; } /// Get the mapping from collection key to collection instance - IDictionary CollectionsByKey { get;} + IDictionary CollectionsByKey { get; } /// How deep are we cascaded? - int CascadeLevel { get;} + int CascadeLevel { get; } /// Is a flush cycle currently in process? /// Called before and after the flushcycle - bool Flushing { get; set;} + bool Flushing { get; set; } /// /// The read-only status for entities (and proxies) loaded into this persistence context. @@ -87,7 +87,7 @@ public partial interface IPersistenceContext void Clear(); /// False if we know for certain that all the entities are read-only - bool HasNonReadOnlyEntities { get;} + bool HasNonReadOnlyEntities { get; } /// Set the status of an entry void SetEntryStatus(EntityEntry entry, Status status); diff --git a/src/NHibernate/Engine/IdentifierValue.cs b/src/NHibernate/Engine/IdentifierValue.cs index 734616ccae6..8f44c7e434e 100644 --- a/src/NHibernate/Engine/IdentifierValue.cs +++ b/src/NHibernate/Engine/IdentifierValue.cs @@ -1,5 +1,3 @@ - - namespace NHibernate.Engine { /// diff --git a/src/NHibernate/Engine/JoinHelper.cs b/src/NHibernate/Engine/JoinHelper.cs index 95df9848c5e..0ca78b84a20 100644 --- a/src/NHibernate/Engine/JoinHelper.cs +++ b/src/NHibernate/Engine/JoinHelper.cs @@ -70,7 +70,6 @@ protected AbstractLhsAssociationTypeSqlInfo(string @alias, IOuterJoinLoadable pe #region Implementation of ILhsAssociationTypeSqlInfo - public string[] GetAliasedColumnNames(IAssociationType type, int begin) { if (type.UseLHSPrimaryKey) @@ -207,5 +206,4 @@ public override string GetTableName(IAssociationType type) #endregion } - } diff --git a/src/NHibernate/Engine/Query/CallableParser.cs b/src/NHibernate/Engine/Query/CallableParser.cs index dbd6c126dcb..73a4a784305 100644 --- a/src/NHibernate/Engine/Query/CallableParser.cs +++ b/src/NHibernate/Engine/Query/CallableParser.cs @@ -7,7 +7,6 @@ namespace NHibernate.Engine.Query { public static class CallableParser { - public class Detail { public bool IsCallable; diff --git a/src/NHibernate/Engine/Query/ParamLocationRecognizer.cs b/src/NHibernate/Engine/Query/ParamLocationRecognizer.cs index f9e33db651a..ff2ee80292f 100644 --- a/src/NHibernate/Engine/Query/ParamLocationRecognizer.cs +++ b/src/NHibernate/Engine/Query/ParamLocationRecognizer.cs @@ -117,6 +117,5 @@ public bool JpaStyle get { return jpaStyle; } } } - } } diff --git a/src/NHibernate/Engine/StatefulPersistenceContext.cs b/src/NHibernate/Engine/StatefulPersistenceContext.cs index 05f27d312a7..93fcd54948f 100644 --- a/src/NHibernate/Engine/StatefulPersistenceContext.cs +++ b/src/NHibernate/Engine/StatefulPersistenceContext.cs @@ -1477,7 +1477,6 @@ void IDeserializationCallback.OnDeserialization(object sender) { ce.AfterDeserialize(Session.Factory); } - } catch (HibernateException he) { diff --git a/src/NHibernate/Engine/Versioning.cs b/src/NHibernate/Engine/Versioning.cs index c9c293d3204..a450d8022db 100644 --- a/src/NHibernate/Engine/Versioning.cs +++ b/src/NHibernate/Engine/Versioning.cs @@ -1,4 +1,3 @@ - using NHibernate.Persister.Entity; using NHibernate.Type; diff --git a/src/NHibernate/Event/Default/AbstractSaveEventListener.cs b/src/NHibernate/Event/Default/AbstractSaveEventListener.cs index f4fe501ab2e..802ed4eeb6b 100644 --- a/src/NHibernate/Event/Default/AbstractSaveEventListener.cs +++ b/src/NHibernate/Event/Default/AbstractSaveEventListener.cs @@ -35,7 +35,7 @@ protected virtual bool? AssumedUnsaved get { return null; } } - protected abstract CascadingAction CascadeAction { get;} + protected abstract CascadingAction CascadeAction { get; } /// /// After the save, will te version number be incremented diff --git a/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs b/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs index 70a8bd898da..6434c2a2203 100644 --- a/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultAutoFlushEventListener.cs @@ -48,7 +48,6 @@ public virtual void OnAutoFlush(AutoFlushEvent @event) } else { - if (log.IsDebugEnabled()) log.Debug("Dont need to execute flush"); source.ActionQueue.ClearFromFlushNeededCheck(oldSize); diff --git a/src/NHibernate/Event/Default/DefaultDirtyCheckEventListener.cs b/src/NHibernate/Event/Default/DefaultDirtyCheckEventListener.cs index 482968352d3..e8692a1f0bd 100644 --- a/src/NHibernate/Event/Default/DefaultDirtyCheckEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultDirtyCheckEventListener.cs @@ -1,6 +1,5 @@ using System; - namespace NHibernate.Event.Default { /// diff --git a/src/NHibernate/Event/Default/DefaultEvictEventListener.cs b/src/NHibernate/Event/Default/DefaultEvictEventListener.cs index c19bc54fd90..a1b5612d9a9 100644 --- a/src/NHibernate/Event/Default/DefaultEvictEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultEvictEventListener.cs @@ -59,7 +59,6 @@ public virtual void OnEvict(EvictEvent @event) protected virtual void DoEvict(object obj, EntityKey key, IEntityPersister persister, IEventSource session) { - if (log.IsDebugEnabled()) { log.Debug("evicting {0}", MessageHelper.InfoString(persister)); diff --git a/src/NHibernate/Event/Default/DefaultFlushEntityEventListener.cs b/src/NHibernate/Event/Default/DefaultFlushEntityEventListener.cs index 28b4654ebbf..7848f25cdaa 100644 --- a/src/NHibernate/Event/Default/DefaultFlushEntityEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultFlushEntityEventListener.cs @@ -389,7 +389,6 @@ protected bool IsUpdateNecessary(FlushEntityEvent @event) } else { - int[] dirtyProperties = @event.DirtyProperties; if (dirtyProperties != null && dirtyProperties.Length != 0) { @@ -496,7 +495,6 @@ protected virtual void DirtyCheck(FlushEntityEvent @event) @event.DirtyCheckPossible = !cannotDirtyCheck; } - private object[] GetDatabaseSnapshot(ISessionImplementor session, IEntityPersister persister, object id) { if (persister.IsSelectBeforeUpdateRequired) @@ -523,6 +521,5 @@ private object[] GetDatabaseSnapshot(ISessionImplementor session, IEntityPersist return session.PersistenceContext.GetCachedDatabaseSnapshot(entityKey); } } - } } diff --git a/src/NHibernate/Event/Default/DefaultLoadEventListener.cs b/src/NHibernate/Event/Default/DefaultLoadEventListener.cs index c3db8bf4f0f..644cf67d1d1 100644 --- a/src/NHibernate/Event/Default/DefaultLoadEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultLoadEventListener.cs @@ -43,7 +43,6 @@ public virtual void OnLoad(LoadEvent @event, LoadType loadType) if (persister == null) { - var message = new StringBuilder(512); message.AppendLine(string.Format("Unable to locate persister for the entity named '{0}'.", @event.EntityClassName)); message.AppendLine("The persister define the persistence strategy for an entity."); @@ -406,7 +405,6 @@ protected virtual object LoadFromSessionCache(LoadEvent @event, EntityKey keyToL return old; } - /// Attempts to load the entity from the second-level cache. /// The load event /// The persister for the entity being requested for load diff --git a/src/NHibernate/Event/Default/DefaultMergeEventListener.cs b/src/NHibernate/Event/Default/DefaultMergeEventListener.cs index 31781db0df4..02922db2ebf 100644 --- a/src/NHibernate/Event/Default/DefaultMergeEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultMergeEventListener.cs @@ -9,7 +9,6 @@ using NHibernate.Proxy; using NHibernate.Type; - namespace NHibernate.Event.Default { /// diff --git a/src/NHibernate/Event/Default/DefaultSaveOrUpdateEventListener.cs b/src/NHibernate/Event/Default/DefaultSaveOrUpdateEventListener.cs index 897793a8180..06eebb15f1b 100644 --- a/src/NHibernate/Event/Default/DefaultSaveOrUpdateEventListener.cs +++ b/src/NHibernate/Event/Default/DefaultSaveOrUpdateEventListener.cs @@ -72,7 +72,7 @@ protected virtual object PerformSaveOrUpdate(SaveOrUpdateEvent @event) case EntityState.Persistent: return EntityIsPersistent(@event); - default: //TRANSIENT or DELETED + default: //TRANSIENT or DELETED return EntityIsTransient(@event); } } diff --git a/src/NHibernate/Event/Default/DirtyCollectionSearchVisitor.cs b/src/NHibernate/Event/Default/DirtyCollectionSearchVisitor.cs index 6f1181873bf..5296aedee20 100644 --- a/src/NHibernate/Event/Default/DirtyCollectionSearchVisitor.cs +++ b/src/NHibernate/Event/Default/DirtyCollectionSearchVisitor.cs @@ -51,7 +51,6 @@ public bool WasDirtyCollectionFound internal override object ProcessCollection(object collection, CollectionType type) { - if (collection != null) { ISessionImplementor session = Session; diff --git a/src/NHibernate/Event/Default/EvictVisitor.cs b/src/NHibernate/Event/Default/EvictVisitor.cs index ce4a3c89a95..8ad1dca730a 100644 --- a/src/NHibernate/Event/Default/EvictVisitor.cs +++ b/src/NHibernate/Event/Default/EvictVisitor.cs @@ -1,4 +1,3 @@ - using NHibernate.Collection; using NHibernate.Engine; using NHibernate.Impl; @@ -20,7 +19,6 @@ public EvictVisitor(IEventSource session) : base(session) { } internal override object ProcessCollection(object collection, CollectionType type) { - if (collection != null) EvictCollection(collection, type); diff --git a/src/NHibernate/Event/Default/ProxyVisitor.cs b/src/NHibernate/Event/Default/ProxyVisitor.cs index f725a4c5fe9..ddd7f8b0056 100644 --- a/src/NHibernate/Event/Default/ProxyVisitor.cs +++ b/src/NHibernate/Event/Default/ProxyVisitor.cs @@ -19,7 +19,6 @@ public ProxyVisitor(IEventSource session) : base(session) { } /// internal override object ProcessEntity(object value, EntityType entityType) { - if (value != null) { Session.PersistenceContext.ReassociateIfUninitializedProxy(value); diff --git a/src/NHibernate/Event/Default/ReattachVisitor.cs b/src/NHibernate/Event/Default/ReattachVisitor.cs index e2d14ac7d61..64584875a81 100644 --- a/src/NHibernate/Event/Default/ReattachVisitor.cs +++ b/src/NHibernate/Event/Default/ReattachVisitor.cs @@ -1,4 +1,3 @@ - using NHibernate.Action; using NHibernate.Engine; using NHibernate.Impl; diff --git a/src/NHibernate/Event/Default/WrapVisitor.cs b/src/NHibernate/Event/Default/WrapVisitor.cs index 309367aaea2..d5996d448d6 100644 --- a/src/NHibernate/Event/Default/WrapVisitor.cs +++ b/src/NHibernate/Event/Default/WrapVisitor.cs @@ -1,4 +1,3 @@ - using NHibernate.Collection; using NHibernate.Engine; using NHibernate.Persister.Collection; diff --git a/src/NHibernate/Event/IDestructible.cs b/src/NHibernate/Event/IDestructible.cs index 4c0182a1eca..f91756c36ec 100644 --- a/src/NHibernate/Event/IDestructible.cs +++ b/src/NHibernate/Event/IDestructible.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Event { /// @@ -12,4 +11,4 @@ public interface IDestructible /// void Cleanup(); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Event/IEventSource.cs b/src/NHibernate/Event/IEventSource.cs index 5f5c0d42090..e30d86ba441 100644 --- a/src/NHibernate/Event/IEventSource.cs +++ b/src/NHibernate/Event/IEventSource.cs @@ -9,7 +9,7 @@ namespace NHibernate.Event public partial interface IEventSource : ISessionImplementor, ISession { /// Get the ActionQueue for this session - ActionQueue ActionQueue { get;} + ActionQueue ActionQueue { get; } /// /// Is auto-flush suspended? diff --git a/src/NHibernate/Exceptions/GenericADOException.cs b/src/NHibernate/Exceptions/GenericADOException.cs index d45e298c3f3..b82dcfeb2b1 100644 --- a/src/NHibernate/Exceptions/GenericADOException.cs +++ b/src/NHibernate/Exceptions/GenericADOException.cs @@ -9,10 +9,9 @@ public class GenericADOException : ADOException { public GenericADOException() { - } public GenericADOException(SerializationInfo info, StreamingContext context) : base(info, context) { } public GenericADOException(string message, Exception innerException, string sql) : base(message, innerException, sql) { } public GenericADOException(string message, Exception innerException) : base(message, innerException) { } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Exceptions/ReflectionBasedSqlStateExtracter.cs b/src/NHibernate/Exceptions/ReflectionBasedSqlStateExtracter.cs index c89a0e87342..18838332370 100644 --- a/src/NHibernate/Exceptions/ReflectionBasedSqlStateExtracter.cs +++ b/src/NHibernate/Exceptions/ReflectionBasedSqlStateExtracter.cs @@ -6,7 +6,6 @@ namespace NHibernate.Exceptions { class ReflectionBasedSqlStateExtracter: SqlStateExtracter { - /* OdbcException, OleDbException, IfxException, Db2Exception, and possible others * have Errors collection which contains fields: NativeError and SQLState * These fields can be extracted using reflection @@ -61,4 +60,4 @@ public override string ExtractSingleSqlState(DbException sqle) return sqlState; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Exceptions/SqlParseException.cs b/src/NHibernate/Exceptions/SqlParseException.cs index 615d7dbed0b..758b3414afa 100644 --- a/src/NHibernate/Exceptions/SqlParseException.cs +++ b/src/NHibernate/Exceptions/SqlParseException.cs @@ -6,7 +6,6 @@ namespace NHibernate.Exceptions [Serializable] public class SqlParseException : Exception { - public SqlParseException(string message) : base(message) { } diff --git a/src/NHibernate/Exceptions/TemplatedViolatedConstraintNameExtracter.cs b/src/NHibernate/Exceptions/TemplatedViolatedConstraintNameExtracter.cs index b80095738ec..24702089849 100644 --- a/src/NHibernate/Exceptions/TemplatedViolatedConstraintNameExtracter.cs +++ b/src/NHibernate/Exceptions/TemplatedViolatedConstraintNameExtracter.cs @@ -8,7 +8,6 @@ namespace NHibernate.Exceptions /// public abstract class TemplatedViolatedConstraintNameExtracter : IViolatedConstraintNameExtracter { - /// /// Extracts the constraint name based on a template (i.e., templateStartconstraintNametemplateEnd). /// diff --git a/src/NHibernate/FKUnmatchingColumnsException.cs b/src/NHibernate/FKUnmatchingColumnsException.cs index 27d4f5e31ee..1a0c2996f5f 100644 --- a/src/NHibernate/FKUnmatchingColumnsException.cs +++ b/src/NHibernate/FKUnmatchingColumnsException.cs @@ -18,7 +18,6 @@ public FKUnmatchingColumnsException(string message) { } - /// /// Initializes a new instance of the class. /// @@ -49,5 +48,4 @@ protected FKUnmatchingColumnsException(SerializationInfo info, StreamingContext { } } - } diff --git a/src/NHibernate/Hql/Ast/ANTLR/ASTQueryTranslatorFactory.cs b/src/NHibernate/Hql/Ast/ANTLR/ASTQueryTranslatorFactory.cs index b598e71f597..7b9e937bd18 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/ASTQueryTranslatorFactory.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/ASTQueryTranslatorFactory.cs @@ -39,7 +39,6 @@ static IQueryTranslator[] CreateQueryTranslators(IASTNode ast, string queryIdent } return translators; - } } } diff --git a/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs b/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs index bf1ec84156c..f4978ba5c4c 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs @@ -11,7 +11,6 @@ namespace NHibernate.Hql.Ast.ANTLR /// internal static class CollectionProperties { - public static readonly Dictionary HQL_COLLECTION_PROPERTIES = new Dictionary(StringComparer.OrdinalIgnoreCase); static CollectionProperties() diff --git a/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs b/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs index 0c57c7f33f9..1c1897dcb04 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs @@ -3,7 +3,6 @@ using System.Text; using Antlr.Runtime; - namespace NHibernate.Hql.Ast.ANTLR { /// @@ -55,8 +54,8 @@ private string GetErrorString() if (!first) buf.Append('\n'); first = false; - } + return buf.ToString(); } @@ -83,5 +82,4 @@ public void ThrowQueryException() } } } - } diff --git a/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs b/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs index 9a585f6b1e5..f6fa990de25 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs @@ -42,7 +42,7 @@ protected AbstractStatementExecutor(IStatement statement, INHibernateLogger log) protected ISessionFactoryImplementor Factory { - get{return Walker.SessionFactoryHelper.Factory;} + get { return Walker.SessionFactoryHelper.Factory; } } protected virtual void CoordinateSharedCacheCleanup(ISessionImplementor session) diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs index 55e8912babe..72fcb938e4f 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs @@ -102,7 +102,6 @@ public bool Filter set { filter = value; } } - public override void ReportError(RecognitionException e) { _parseErrorHandler.ReportError(e); diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs index e4e5a9fa330..37e5eaffc6e 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs @@ -934,7 +934,7 @@ static void ProcessFunction(IASTNode functionCall, bool inSelect) void ProcessBool(IASTNode constant) { - _literalProcessor.ProcessBoolean(constant); // Use the delegate. + _literalProcessor.ProcessBoolean(constant); // Use the delegate. } static void PrepareLogicOperator(IASTNode operatorNode) @@ -1140,7 +1140,6 @@ public FromClause GetFinalFromClause() return top; } - // Helper methods public bool IsFilter() diff --git a/src/NHibernate/Hql/Ast/ANTLR/PolymorphicQuerySourceDetector.cs b/src/NHibernate/Hql/Ast/ANTLR/PolymorphicQuerySourceDetector.cs index e6263815d02..4b1cc080e17 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/PolymorphicQuerySourceDetector.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/PolymorphicQuerySourceDetector.cs @@ -57,7 +57,6 @@ private static string GetClassName(IASTNode querySource) // TODO throw new NotSupportedException($"{querySource.ToString()} {querySource.ToStringTree()}"); } - } private static IASTNode MakeIdent(IASTNode source, string text) @@ -89,6 +88,5 @@ private static void BuildPath(IASTNode node, StringBuilder sb) sb.Append(node.Text); } } - } } diff --git a/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs b/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs index 4681b1d4892..b88f22ec0a6 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs @@ -32,7 +32,7 @@ public SessionFactoryHelperExtensions(ISessionFactoryImplementor sfi) public ISessionFactoryImplementor Factory { - get { return _sfi;} + get { return _sfi; } } /// diff --git a/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs b/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs index c8aece9dd71..4f6f902891d 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs @@ -494,7 +494,6 @@ public SqlString ToSqlString() return builder.ToSqlString(); } - #endregion } diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs index fc4e1a670ea..351d29318fa 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs @@ -147,7 +147,6 @@ public SqlString SqlAssignmentFragment } return _sqlAssignmentString; } - } } } diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryArithmeticOperatorNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryArithmeticOperatorNode.cs index 14f68649f29..9b706facb49 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryArithmeticOperatorNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryArithmeticOperatorNode.cs @@ -99,7 +99,6 @@ public override IType DataType } } - private IType ResolveDataType() { // TODO : we may also want to check that the types here map to exactly one column/JDBC-type diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs index 85acd059b0b..bf0560dfc76 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs @@ -27,12 +27,12 @@ public BinaryLogicOperatorNode(IToken token) public IASTNode LeftHandOperand { - get { return GetChild(0);} + get { return GetChild(0); } } public IASTNode RightHandOperand { - get { return GetChild(1);} + get { return GetChild(1); } } /// diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/CountNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/CountNode.cs index 12e4f8073de..88ec9cc22fd 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/CountNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/CountNode.cs @@ -15,7 +15,6 @@ public CountNode(IToken token) : base(token) { } - public override IType DataType { get diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs index a1b485a2c43..92fb91b7e37 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs @@ -1,7 +1,6 @@ using System; using Antlr.Runtime; - namespace NHibernate.Hql.Ast.ANTLR.Tree { /// @@ -35,4 +34,4 @@ protected override int GetWhereClauseParentTokenType() return HqlSqlWalker.FROM; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs index 18f88d42842..e1ed1bce5e9 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs @@ -118,7 +118,6 @@ public override string Path } } - public string PropertyPath { get { return _propertyPath; } @@ -244,7 +243,6 @@ public override void Resolve(bool generateJoin, bool implicitJoin, string classA IsResolved = true; } - public FromReferenceNode GetLhs() { var lhs = ((FromReferenceNode)GetChild(0)); @@ -359,7 +357,6 @@ private void DereferenceCollection(CollectionType collectionType, bool implicitJ Walker.AddQuerySpaces( queryableCollection.CollectionSpaces ); // Always add the collection's query spaces. } - private void DereferenceEntity(EntityType entityType, bool implicitJoin, string classAlias, bool generateJoin, IASTNode parent) { CheckForCorrelatedSubquery( "dereferenceEntity" ); @@ -534,7 +531,6 @@ private void DereferenceEntityJoin(string classAlias, EntityType propertyType, b { currentFromClause.AddDuplicateAlias(classAlias, elem); } - SetImpliedJoin( elem ); Walker.AddQuerySpaces( elem.EntityPersister.QuerySpaces ); @@ -559,7 +555,6 @@ private void SetImpliedJoin(FromElement elem) } } - /// /// Is the given property name a reference to the primary key of the associated /// entity construed by the given entity type? @@ -611,7 +606,6 @@ private bool IsCorrelatedSubselect get { return Walker.IsSubQuery && FromElement.FromClause != Walker.CurrentFromClause; } } - private void CheckLhsIsNotCollection() { FromReferenceNode lhs = GetLhs(); diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs index 4c284dc84bc..d09f15bb4b8 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs @@ -163,7 +163,6 @@ public void AddCollectionJoinFromElementByPath(string path, FromElement destinat _collectionJoinFromElementsByPath.Add(path, destination); // Add the new node to the map so that we don't create it twice. } - private void AddChild(FromClause fromClause) { if (_childFromClauses == null) @@ -253,7 +252,6 @@ public void AddDuplicateAlias(string alias, FromElement element) } } - /// /// Look for an existing implicit or explicit join by the given path. /// diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs index fbe060fbb03..b84a43b23e6 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs @@ -121,7 +121,7 @@ public string[] FetchLazyProperties public virtual bool IsImpliedInFromClause { - get { return false; } // Since this is an explicit FROM element, it can't be implied in the FROM clause. + get { return false; } // Since this is an explicit FROM element, it can't be implied in the FROM clause. } public bool IsFetch @@ -457,7 +457,7 @@ public bool UseFromFragment public bool UseWhereFragment { - get { return _useWhereFragment;} + get { return _useWhereFragment; } set { _useWhereFragment = value; } } diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs index 509d9cbbd4a..3d04fdcfd7b 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs @@ -26,7 +26,6 @@ public class FromElementFactory private IQueryableCollection _queryableCollection; private CollectionType _collectionType; - /// /// Creates entity from elements. /// @@ -280,7 +279,6 @@ public FromElement CreateElementJoin(IQueryableCollection queryableCollection) return elem; } - public FromElement CreateEntityJoin( string entityClass, string tableAlias, @@ -430,7 +428,6 @@ private FromElement CreateManyToMany( return elem; } - private JoinSequence CreateJoinSequence(string roleAlias, JoinType joinType) { SessionFactoryHelperExtensions sessionFactoryHelper = _fromClause.SessionFactoryHelper; diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs index d8328bfdbf8..78b677b8e44 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs @@ -189,7 +189,6 @@ public virtual string RenderScalarIdentifierSelect(int i) return buf.ToString(); } - /// /// Returns the property select SQL fragment. /// diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs index 94ecc061188..2656e9cab06 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs @@ -2,7 +2,6 @@ using System.Text; using Antlr.Runtime; - namespace NHibernate.Hql.Ast.ANTLR.Tree { [CLSCompliant(false)] diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerNode.cs index c801aa588ba..030621af87c 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerNode.cs @@ -37,7 +37,6 @@ internal SessionFactoryHelperExtensions SessionFactoryHelper get { return _walker.SessionFactoryHelper; } } - public IASTFactory ASTFactory { get { return _walker.ASTFactory; } diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/ISelectExpression.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/ISelectExpression.cs index bf9c20028d7..a89fef53ade 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/ISelectExpression.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/ISelectExpression.cs @@ -60,4 +60,3 @@ public interface ISelectExpression string Alias { get; set; } } } - diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs index ab91df356e7..38bb20080bd 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs @@ -27,7 +27,6 @@ public override IType DataType { get { - IType type = base.DataType; if ( type != null ) { @@ -239,7 +238,7 @@ private bool ResolveAsNakedComponentPropertyRefLhs(DotNode parent) throw new QueryException("Property '" + OriginalText + "' is not a component. Use an alias to reference associations or collections."); } - IType propertyType ; // used to set the type of the parent dot node + IType propertyType; // used to set the type of the parent dot node string propertyPath = Text + "." + NextSibling.Text; try { @@ -291,7 +290,6 @@ private bool ResolveAsNakedComponentPropertyRefRhs(DotNode parent) return true; } - private IType GetNakedPropertyType(FromElement fromElement) { if (fromElement == null) diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/InsertStatement.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/InsertStatement.cs index 12672c4f188..4bbebd30a74 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/InsertStatement.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/InsertStatement.cs @@ -25,14 +25,14 @@ public override int StatementType /// The into-clause public IntoClause IntoClause { - get{return (IntoClause)GetFirstChild();} + get{return (IntoClause)GetFirstChild(); } } /// Retrieve this insert statement's select-clause. /// The select-clause. public SelectClause SelectClause { - get{return ((QueryNode)IntoClause.NextSibling).GetSelectClause();} + get{return ((QueryNode)IntoClause.NextSibling).GetSelectClause(); } } /// Performs detailed semantic validation on this insert statement tree. @@ -42,4 +42,4 @@ public virtual void Validate() IntoClause.ValidateTypes(SelectClause); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs index 07da64e1099..74e05746f5f 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs @@ -74,6 +74,5 @@ private void ProcessText() _processedText = true; } } - } } diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/ResultVariableRefNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/ResultVariableRefNode.cs index 3fc8c8ff808..2ce02ddfab7 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/ResultVariableRefNode.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/ResultVariableRefNode.cs @@ -35,7 +35,6 @@ public void SetSelectExpression(ISelectExpression selectExpression) _selectExpression = selectExpression; } - public override SqlString RenderText(ISessionFactoryImplementor sessionFactory) { int scalarColumnIndex = _selectExpression.ScalarColumnIndex; diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs index 3fca5b4f4d3..dfa5cf67f18 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs @@ -34,7 +34,6 @@ public SelectClause(IToken token) { } - /// /// Prepares a derived (i.e., not explicitly defined in the query) select clause. /// @@ -107,7 +106,6 @@ public void InitializeDerivedSelectClause(FromClause fromClause) FinishInitialization( /*sqlResultTypeList,*/ queryReturnTypeList); } - /// /// Prepares an explicitly defined select clause. /// @@ -208,7 +206,6 @@ public void InitializeExplicitSelectClause(FromClause fromClause) } else { - IType type = fromElement.SelectType; AddCollectionFromElement(fromElement); diff --git a/src/NHibernate/Hql/Ast/ANTLR/Util/LiteralProcessor.cs b/src/NHibernate/Hql/Ast/ANTLR/Util/LiteralProcessor.cs index 18c93dc3903..dd89906775b 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Util/LiteralProcessor.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Util/LiteralProcessor.cs @@ -44,7 +44,6 @@ public class LiteralProcessor /// public static readonly int DECIMAL_LITERAL_FORMAT = EXACT; - public LiteralProcessor(HqlSqlWalker walker) { _walker = walker; @@ -131,7 +130,6 @@ public void ProcessBoolean(IASTNode constant) } } - public void ProcessConstant(SqlNode constant, bool resolveIdent) { // If the constant is an IDENT, figure out what it means... @@ -369,7 +367,6 @@ public string Format(Decimal number) try { return number.ToString(FORMAT_STRING); - } catch (Exception t) { diff --git a/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs b/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs index 922f1a9ed98..68e2bc0cb19 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/Util/SyntheticAndFactory.cs @@ -198,6 +198,5 @@ public virtual void AddDiscriminatorWhereFragment(IRestrictableStatement stateme statement.WhereClause.SetFirstChild(and); } } - } } diff --git a/src/NHibernate/Hql/HolderInstantiator.cs b/src/NHibernate/Hql/HolderInstantiator.cs index acb0afb1942..8a616ceb677 100644 --- a/src/NHibernate/Hql/HolderInstantiator.cs +++ b/src/NHibernate/Hql/HolderInstantiator.cs @@ -21,7 +21,6 @@ public static HolderInstantiator GetHolderInstantiator(IResultTransformer select queryReturnAliases); } - public static IResultTransformer ResolveResultTransformer(IResultTransformer selectNewTransformer, IResultTransformer customTransformer) { return selectNewTransformer ?? customTransformer; @@ -93,4 +92,4 @@ public IResultTransformer ResultTransformer get { return transformer; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Hql/IQueryTranslator.cs b/src/NHibernate/Hql/IQueryTranslator.cs index e8a5017d078..b74bcfd2f8e 100644 --- a/src/NHibernate/Hql/IQueryTranslator.cs +++ b/src/NHibernate/Hql/IQueryTranslator.cs @@ -60,7 +60,7 @@ public partial interface IQueryTranslator // The query identifier for this translator. The query identifier is used in stats collection. // // Not ported: - //string QueryIdentifier { get;} + //string QueryIdentifier { get; } /// /// The SQL string generated by the translator. @@ -119,4 +119,4 @@ public partial interface IQueryTranslator ParameterMetadata BuildParameterMetadata(); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Hql/Util/SessionFactoryHelper.cs b/src/NHibernate/Hql/Util/SessionFactoryHelper.cs index 5abc7c3d678..96d4384cdc3 100644 --- a/src/NHibernate/Hql/Util/SessionFactoryHelper.cs +++ b/src/NHibernate/Hql/Util/SessionFactoryHelper.cs @@ -74,8 +74,6 @@ private static string GetEntityName(string assemblyQualifiedName) return TypeNameParser.Parse(assemblyQualifiedName).Type; } - - /// /// Locate the collection persister by the collection role. /// @@ -140,7 +138,6 @@ private IEntityPersister FindEntityPersisterByName(String name) return sfi.GetEntityPersister(importedClassName); } - public System.Type GetImportedClass(string className) { string importedName = sfi.GetImportedClassName(className); @@ -154,7 +151,6 @@ public System.Type GetImportedClass(string className) return System.Type.GetType(importedName, false); } - /// /// Retrieve a PropertyMapping describing the given collection role. /// @@ -165,7 +161,6 @@ public IPropertyMapping GetCollectionPropertyMapping(String role) return collectionPropertyMappingByRole[role]; } - /* Locate the collection persister by the collection role, requiring that * such a persister exist. * diff --git a/src/NHibernate/IMultiQuery.cs b/src/NHibernate/IMultiQuery.cs index 0cc6b693b33..49d1c280b80 100644 --- a/src/NHibernate/IMultiQuery.cs +++ b/src/NHibernate/IMultiQuery.cs @@ -161,7 +161,6 @@ public partial interface IMultiQuery /// The instance for method chain. IMultiQuery SetParameter(string name, object val, IType type); - /// /// Bind a value to a named query parameter, guessing the NHibernate /// from the class of the given object. diff --git a/src/NHibernate/IQueryOver.cs b/src/NHibernate/IQueryOver.cs index c9d9e95d3a2..0320da91a49 100644 --- a/src/NHibernate/IQueryOver.cs +++ b/src/NHibernate/IQueryOver.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -10,7 +9,6 @@ namespace NHibernate { - public interface IQueryOver { /// @@ -159,7 +157,6 @@ public partial interface IQueryOver : IQueryOver /// (see ). /// IQueryOver ReadOnly(); - } /// @@ -176,7 +173,6 @@ public partial interface IQueryOver : IQueryOver /// public interface IQueryOver : IQueryOver { - /// /// Add criterion expressed as a lambda expression /// @@ -658,7 +654,5 @@ public interface IQueryOver : IQueryOver IQueryOverJoinBuilder Left { get; } IQueryOverJoinBuilder Right { get; } IQueryOverJoinBuilder Full { get; } - } - } diff --git a/src/NHibernate/ISessionFactory.cs b/src/NHibernate/ISessionFactory.cs index 544f79d1a57..8e85f6258d0 100644 --- a/src/NHibernate/ISessionFactory.cs +++ b/src/NHibernate/ISessionFactory.cs @@ -296,10 +296,10 @@ public partial interface ISessionFactory : IDisposable ISession GetCurrentSession(); /// Get the statistics for this session factory - IStatistics Statistics { get;} + IStatistics Statistics { get; } /// Was this already closed? - bool IsClosed { get;} + bool IsClosed { get; } /// /// Obtain a set of the names of all filters defined on this SessionFactory. diff --git a/src/NHibernate/Id/Enhanced/OptimizerFactory.cs b/src/NHibernate/Id/Enhanced/OptimizerFactory.cs index 6305aebeb52..0a410f7fda2 100644 --- a/src/NHibernate/Id/Enhanced/OptimizerFactory.cs +++ b/src/NHibernate/Id/Enhanced/OptimizerFactory.cs @@ -76,7 +76,7 @@ private static IOptimizer BuildOptimizer(string type, System.Type returnClass, i } catch (Exception ex) { - Log.Error(ex, "Unable to instantiate id generator optimizer."); // FIXME: Review log message. + Log.Error(ex, "Unable to instantiate id generator optimizer."); // FIXME: Review log message. } // the default... diff --git a/src/NHibernate/Id/Enhanced/SequenceStyleGenerator.cs b/src/NHibernate/Id/Enhanced/SequenceStyleGenerator.cs index dd252771364..022d4101714 100644 --- a/src/NHibernate/Id/Enhanced/SequenceStyleGenerator.cs +++ b/src/NHibernate/Id/Enhanced/SequenceStyleGenerator.cs @@ -223,7 +223,6 @@ protected bool RequiresPooledSequence(int initialValue, int incrementSize, IOpti return (initialValue > 1 || sourceIncrementSize > 1); } - #endregion #region Implementation of IIdentifierGenerator diff --git a/src/NHibernate/Id/Enhanced/TableGenerator.cs b/src/NHibernate/Id/Enhanced/TableGenerator.cs index ff69ab2af97..881280f5237 100644 --- a/src/NHibernate/Id/Enhanced/TableGenerator.cs +++ b/src/NHibernate/Id/Enhanced/TableGenerator.cs @@ -89,7 +89,6 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe { private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(SequenceStyleGenerator)); - public const string ConfigPreferSegmentPerEntity = "prefer_entity_table_as_segment_value"; public const string TableParam = "table_name"; @@ -115,26 +114,22 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe public const string OptimizerParam = "optimizer"; - /// /// Type mapping for the identifier. /// public IType IdentifierType { get; private set; } - /// /// The name of the table in which we store this generator's persistent state. /// public string TableName { get; private set; } - /// /// The name of the column in which we store the segment to which each row /// belongs. The value here acts as primary key. /// public string SegmentColumnName { get; private set; } - /// /// The value in the column identified by which /// corresponds to this generator instance. In other words, this value @@ -142,7 +137,6 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe /// public string SegmentValue { get; private set; } - /// /// The size of the column identified by /// in the underlying table. @@ -152,27 +146,23 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe /// public int SegmentValueLength { get; private set; } - /// /// The name of the column in which we store our persistent generator value. /// public string ValueColumnName { get; private set; } - /// /// The initial value to use when we find no previous state in the /// generator table corresponding to this instance. /// public int InitialValue { get; private set; } - /// /// The amount of increment to use. The exact implications of this /// depends on the optimizer being used, see . /// public int IncrementSize { get; private set; } - /// /// The optimizer being used by this generator. This mechanism /// allows avoiding calling the database each time a new identifier @@ -180,13 +170,11 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe /// public IOptimizer Optimizer { get; private set; } - /// /// The table access count. Only really useful for unit test assertions. /// public long TableAccessCount { get; private set; } - private SqlString selectQuery; private SqlTypes.SqlType[] selectParameterTypes; private SqlString insertQuery; @@ -194,13 +182,11 @@ public partial class TableGenerator : TransactionHelper, IPersistentIdentifierGe private SqlString updateQuery; private SqlTypes.SqlType[] updateParameterTypes; - public virtual string GeneratorKey() { return TableName; } - #region Implementation of IConfigurable public virtual void Configure(IType type, IDictionary parms, Dialect.Dialect dialect) @@ -221,7 +207,6 @@ public virtual void Configure(IType type, IDictionary parms, Dia BuildUpdateQuery(); BuildInsertQuery(); - // if the increment size is greater than one, we prefer pooled optimization; but we // need to see if the user prefers POOL or POOL_LO... string defaultPooledOptimizerStrategy = PropertiesHelper.GetBoolean(Cfg.Environment.PreferPooledValuesLo, parms, false) @@ -234,7 +219,7 @@ public virtual void Configure(IType type, IDictionary parms, Dia optimizationStrategy, IdentifierType.ReturnedClass, IncrementSize, - PropertiesHelper.GetInt32(InitialParam, parms, -1) // Use -1 as default initial value here to signal that it's not set. + PropertiesHelper.GetInt32(InitialParam, parms, -1) // Use -1 as default initial value here to signal that it's not set. ); } @@ -288,7 +273,6 @@ protected string DetermineSegmentColumnName(IDictionary parms, D //return dialect.quote( normalizer.normalizeIdentifierQuoting( name ) ); } - /// /// Determine the name of the column in which we will store the generator persistent value. /// Called during configuration. @@ -303,7 +287,6 @@ protected string DetermineValueColumnName(IDictionary parms, Dia return dialect.QuoteForColumnName(name); } - /// /// Determine the segment value corresponding to this generator instance. Called during configuration. /// @@ -315,7 +298,6 @@ protected string DetermineSegmentValue(IDictionary parms) return segmentValue; } - /// /// Used in the cases where is unable to /// determine the value to use. @@ -330,7 +312,6 @@ protected string DetermineDefaultSegmentValue(IDictionary parms) return defaultToUse; } - /// /// Determine the size of the segment column. /// Called during configuration. @@ -340,19 +321,16 @@ protected int DetermineSegmentColumnSize(IDictionary parms) return PropertiesHelper.GetInt32(SegmentLengthParam, parms, DefaultSegmentLength); } - protected int DetermineInitialValue(IDictionary parms) { return PropertiesHelper.GetInt32(InitialParam, parms, DefaltInitialValue); } - protected int DetermineIncrementSize(IDictionary parms) { return PropertiesHelper.GetInt32(IncrementParam, parms, DefaultIncrementSize); } - protected void BuildSelectQuery(Dialect.Dialect dialect) { const string alias = "tbl"; @@ -373,7 +351,6 @@ protected void BuildSelectQuery(Dialect.Dialect dialect) selectParameterTypes = new[] { SqlTypes.SqlTypeFactory.GetAnsiString(SegmentValueLength) }; } - protected void BuildUpdateQuery() { updateQuery = new SqlString( @@ -389,7 +366,6 @@ protected void BuildUpdateQuery() }; } - protected void BuildInsertQuery() { insertQuery = new SqlString( @@ -402,14 +378,12 @@ protected void BuildInsertQuery() }; } - [MethodImpl(MethodImplOptions.Synchronized)] public virtual object Generate(ISessionImplementor session, object obj) { return Optimizer.Generate(new TableAccessCallback(session, this)); } - private partial class TableAccessCallback : IAccessCallback { private TableGenerator owner; @@ -431,7 +405,6 @@ public long GetNextValue() #endregion } - public override object DoWorkInCurrentTransaction(ISessionImplementor session, DbConnection conn, DbTransaction transaction) { long result; @@ -483,7 +456,6 @@ public override object DoWorkInCurrentTransaction(ISessionImplementor session, D throw; } - try { var updateCmd = session.Factory.ConnectionProvider.Driver.GenerateCommand(CommandType.Text, updateQuery, updateParameterTypes); @@ -513,7 +485,6 @@ public override object DoWorkInCurrentTransaction(ISessionImplementor session, D return result; } - public virtual string[] SqlCreateStrings(Dialect.Dialect dialect) { string createString = dialect.CreateTableString + " " + TableName @@ -526,7 +497,6 @@ public virtual string[] SqlCreateStrings(Dialect.Dialect dialect) return new string[] { createString }; } - public virtual string[] SqlDropString(Dialect.Dialect dialect) { return new[] { dialect.GetDropTableString(TableName) }; diff --git a/src/NHibernate/Id/IIdentifierGenerator.cs b/src/NHibernate/Id/IIdentifierGenerator.cs index ae6ab894a89..105648953f9 100644 --- a/src/NHibernate/Id/IIdentifierGenerator.cs +++ b/src/NHibernate/Id/IIdentifierGenerator.cs @@ -8,7 +8,6 @@ public struct IdGeneratorParmsNames public readonly static string EntityName = "entity_name"; } - /// /// The general contract between a class that generates unique /// identifiers and the . @@ -40,4 +39,4 @@ public partial interface IIdentifierGenerator /// The new identifier object Generate(ISessionImplementor session, object obj); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Id/IPostInsertIdentityPersister.cs b/src/NHibernate/Id/IPostInsertIdentityPersister.cs index 67eb51e16cc..eeba73abcd1 100644 --- a/src/NHibernate/Id/IPostInsertIdentityPersister.cs +++ b/src/NHibernate/Id/IPostInsertIdentityPersister.cs @@ -90,11 +90,11 @@ public interface IPostInsertIdentityPersister /// Get the database-specific SQL command to retrieve the last /// generated IDENTITY value. /// - string IdentitySelectString { get;} + string IdentitySelectString { get; } /// The names of the primary key columns in the root table. /// The primary key column names. - string[] RootTableKeyColumnNames { get;} + string[] RootTableKeyColumnNames { get; } /// /// Get a SQL select string that performs a select based on a unique diff --git a/src/NHibernate/Id/IdentityGenerator.cs b/src/NHibernate/Id/IdentityGenerator.cs index 22d736b81d2..6971a7dbdca 100644 --- a/src/NHibernate/Id/IdentityGenerator.cs +++ b/src/NHibernate/Id/IdentityGenerator.cs @@ -95,7 +95,6 @@ public object DetermineGeneratedIdentifier(ISessionImplementor session, object e /// public partial class BasicDelegate : AbstractSelectingDelegate, IInsertGeneratedIdentifierDelegate { - private readonly IPostInsertIdentityPersister persister; private readonly ISessionFactoryImplementor factory; @@ -124,4 +123,4 @@ protected internal override object GetResult(ISessionImplementor session, DbData } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Id/Insert/IBinder.cs b/src/NHibernate/Id/Insert/IBinder.cs index 9e7271f74e9..d97d3fd1c06 100644 --- a/src/NHibernate/Id/Insert/IBinder.cs +++ b/src/NHibernate/Id/Insert/IBinder.cs @@ -4,7 +4,7 @@ namespace NHibernate.Id.Insert { public partial interface IBinder { - object Entity { get;} + object Entity { get; } void BindValues(DbCommand cm); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Impl/AbstractDetachedQuery.cs b/src/NHibernate/Impl/AbstractDetachedQuery.cs index d236cc9be59..b41e705ee6a 100644 --- a/src/NHibernate/Impl/AbstractDetachedQuery.cs +++ b/src/NHibernate/Impl/AbstractDetachedQuery.cs @@ -619,6 +619,5 @@ public IDetachedQuery CopyParametersFrom(IDetachedQueryImplementor origin) (this as IDetachedQueryImplementor).OverrideParametersFrom(origin); return this; } - } } diff --git a/src/NHibernate/Impl/AbstractQueryImpl.cs b/src/NHibernate/Impl/AbstractQueryImpl.cs index 5106a7d33e3..ba1e1402854 100644 --- a/src/NHibernate/Impl/AbstractQueryImpl.cs +++ b/src/NHibernate/Impl/AbstractQueryImpl.cs @@ -916,7 +916,6 @@ public IQuery SetCacheMode(CacheMode cacheMode) { this.cacheMode = cacheMode; return this; - } public IQuery SetIgnoreUknownNamedParameters(bool ignoredUnknownNamedParameters) @@ -925,7 +924,7 @@ public IQuery SetIgnoreUknownNamedParameters(bool ignoredUnknownNamedParameters) return this; } - protected internal abstract IDictionary LockModes { get;} + protected internal abstract IDictionary LockModes { get; } #endregion diff --git a/src/NHibernate/Impl/ExpressionProcessor.cs b/src/NHibernate/Impl/ExpressionProcessor.cs index 96fb06800eb..874d1c6e063 100644 --- a/src/NHibernate/Impl/ExpressionProcessor.cs +++ b/src/NHibernate/Impl/ExpressionProcessor.cs @@ -1,4 +1,3 @@ - using System; using System.Collections.Generic; using System.Linq.Expressions; @@ -11,7 +10,6 @@ namespace NHibernate.Impl { - /// /// Subquery type enumeration /// @@ -84,7 +82,6 @@ public Order CreateOrder(Func orderStringDelegate, Func /// Retrieve the property name from a supplied PropertyProjection /// Note: throws if the supplied IProjection is not a PropertyProjection @@ -437,7 +434,7 @@ private static bool IsMemberExpression(Expression expression) if (memberExpression != null) { if (memberExpression.Expression == null) - return false; // it's a member of a static class + return false; // it's a member of a static class if (IsMemberExpression(memberExpression.Expression)) return true; @@ -856,4 +853,3 @@ public static void RegisterCustomProjection(Expression> function, Fun } } } - diff --git a/src/NHibernate/Impl/FutureValue.cs b/src/NHibernate/Impl/FutureValue.cs index 3788550ef50..639a053f1c2 100644 --- a/src/NHibernate/Impl/FutureValue.cs +++ b/src/NHibernate/Impl/FutureValue.cs @@ -40,7 +40,6 @@ public IList TransformList(IList collection) if (ExecuteOnEval == null) return collection; - // When not null on a future value, ExecuteOnEval is fetched with PostExecuteTransformer from // IntermediateHqlTree through ExpressionToHqlTranslationResults, which requires a IQueryable // as input and directly yields the scalar result when the query is scalar. diff --git a/src/NHibernate/Impl/MessageHelper.cs b/src/NHibernate/Impl/MessageHelper.cs index 04b3f828c2f..04ca98fc67e 100644 --- a/src/NHibernate/Impl/MessageHelper.cs +++ b/src/NHibernate/Impl/MessageHelper.cs @@ -281,7 +281,6 @@ public static string InfoString(string entityName, string propertyName, object k /// An info string, in the form [Foo.bars#1] internal static String CollectionInfoString(ICollectionPersister persister, IPersistentCollection collection, object collectionKey, ISessionImplementor session) { - StringBuilder s = new StringBuilder(); s.Append("["); if (persister == null) diff --git a/src/NHibernate/Impl/SessionFactoryObjectFactory.cs b/src/NHibernate/Impl/SessionFactoryObjectFactory.cs index 9c2ae03f6d5..2936f5c2405 100644 --- a/src/NHibernate/Impl/SessionFactoryObjectFactory.cs +++ b/src/NHibernate/Impl/SessionFactoryObjectFactory.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; - namespace NHibernate.Impl { /// diff --git a/src/NHibernate/Impl/SessionImpl.cs b/src/NHibernate/Impl/SessionImpl.cs index eb6205bd1e8..95bf4473137 100644 --- a/src/NHibernate/Impl/SessionImpl.cs +++ b/src/NHibernate/Impl/SessionImpl.cs @@ -1266,7 +1266,6 @@ public override object ImmediateLoad(string entityName, object id) } } - /// /// Return the object with the specified id or throw exception if no row with that id exists. Defer the load, /// return a new proxy or return an existing proxy if possible. Do not check if the object was deleted. diff --git a/src/NHibernate/Impl/SqlQueryImpl.cs b/src/NHibernate/Impl/SqlQueryImpl.cs index 0cc008d2173..079c390cde1 100644 --- a/src/NHibernate/Impl/SqlQueryImpl.cs +++ b/src/NHibernate/Impl/SqlQueryImpl.cs @@ -296,7 +296,6 @@ protected internal override void VerifyParameters() } } } - } public override IQuery SetLockMode(string alias, LockMode lockMode) diff --git a/src/NHibernate/Intercept/IFieldInterceptor.cs b/src/NHibernate/Intercept/IFieldInterceptor.cs index 111e257dc60..1242ce27c95 100644 --- a/src/NHibernate/Intercept/IFieldInterceptor.cs +++ b/src/NHibernate/Intercept/IFieldInterceptor.cs @@ -10,7 +10,7 @@ public interface IFieldInterceptor { /// Is the entity considered dirty? /// True if the entity is dirty; otherwise false. - bool IsDirty { get;} + bool IsDirty { get; } /// Use to associate the entity to which we are bound to the given session. ISessionImplementor Session { get; set; } @@ -18,7 +18,7 @@ public interface IFieldInterceptor /// Is the entity to which we are bound completely initialized? // Since 5.3 [Obsolete("This property is not used and will be removed in a future version.")] - bool IsInitialized { get;} + bool IsInitialized { get; } /// The the given field initialized for the entity to which we are bound? /// The name of the field to check diff --git a/src/NHibernate/LazyInitializationException.cs b/src/NHibernate/LazyInitializationException.cs index 967e11ee653..83cf6123541 100644 --- a/src/NHibernate/LazyInitializationException.cs +++ b/src/NHibernate/LazyInitializationException.cs @@ -2,7 +2,6 @@ using System.Runtime.Serialization; using System.Security; - namespace NHibernate { /// diff --git a/src/NHibernate/Linq/ExpressionTransformers/SimplifyCompareTransformer.cs b/src/NHibernate/Linq/ExpressionTransformers/SimplifyCompareTransformer.cs index 7ec34bc5a96..0696db750db 100644 --- a/src/NHibernate/Linq/ExpressionTransformers/SimplifyCompareTransformer.cs +++ b/src/NHibernate/Linq/ExpressionTransformers/SimplifyCompareTransformer.cs @@ -23,7 +23,6 @@ internal class SimplifyCompareTransformer : IExpressionTransformer a < b // a.CompareTo(b) op 0 => a op b - private static readonly Dictionary ActingOperators = new Dictionary { @@ -35,13 +34,11 @@ internal class SimplifyCompareTransformer : IExpressionTransformer dummies = new Dictionary { // Corresponds to string.Compare(a, b). @@ -115,7 +108,6 @@ private Expression Build(ExpressionType et, Expression expression) {typeof (Guid?), ReflectHelper.GetMethod(() => DummyComparison(null, null))}, }; - private static bool DummyComparison(T lhs, T rhs) { throw new NotSupportedException("This method is not intended to be called."); diff --git a/src/NHibernate/Linq/Functions/CompareGenerator.cs b/src/NHibernate/Linq/Functions/CompareGenerator.cs index 23ef7f8a592..a819bcd8151 100644 --- a/src/NHibernate/Linq/Functions/CompareGenerator.cs +++ b/src/NHibernate/Linq/Functions/CompareGenerator.cs @@ -51,7 +51,6 @@ internal static bool IsCompareMethod(MethodInfo methodInfo) methodInfo.DeclaringType.FullName == "System.Data.Services.Providers.DataServiceProviderMethods"; } - public CompareGenerator() { SupportedMethods = ActingMethods.ToArray(); @@ -81,7 +80,6 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, treeBuilder.Constant(-1)); } - #region IRuntimeMethodHqlGenerator methods public bool SupportsMethod(MethodInfo method) @@ -94,7 +92,6 @@ public bool SupportsMethod(MethodInfo method) return IsCompareMethod(method); } - public IHqlGeneratorForMethod GetMethodGenerator(MethodInfo method) { return this; @@ -102,4 +99,4 @@ public IHqlGeneratorForMethod GetMethodGenerator(MethodInfo method) #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/Functions/ConvertGenerator.cs b/src/NHibernate/Linq/Functions/ConvertGenerator.cs index 2b1812048e0..a82b15cab63 100644 --- a/src/NHibernate/Linq/Functions/ConvertGenerator.cs +++ b/src/NHibernate/Linq/Functions/ConvertGenerator.cs @@ -44,7 +44,6 @@ public ConvertToBooleanGenerator() } } - public class ConvertToInt32Generator : ConvertToGenerator { public ConvertToInt32Generator() diff --git a/src/NHibernate/Linq/Functions/StringGenerator.cs b/src/NHibernate/Linq/Functions/StringGenerator.cs index 2d93f6c85bf..7ec127b1f17 100644 --- a/src/NHibernate/Linq/Functions/StringGenerator.cs +++ b/src/NHibernate/Linq/Functions/StringGenerator.cs @@ -35,7 +35,6 @@ public HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnly treeBuilder.Constant(escapeCharExpression.Value)); } throw new ArgumentException("The escape character must be specified as literal value or a string variable"); - } public bool SupportsMethod(MethodInfo method) @@ -60,7 +59,6 @@ public IHqlGeneratorForMethod GetMethodGenerator(MethodInfo method) } } - public class LengthGenerator : BaseHqlGeneratorForProperty { public LengthGenerator() diff --git a/src/NHibernate/Linq/GroupBy/GroupBySelectClauseRewriter.cs b/src/NHibernate/Linq/GroupBy/GroupBySelectClauseRewriter.cs index c031d305396..0e569fa6895 100644 --- a/src/NHibernate/Linq/GroupBy/GroupBySelectClauseRewriter.cs +++ b/src/NHibernate/Linq/GroupBy/GroupBySelectClauseRewriter.cs @@ -151,11 +151,10 @@ expression.QueryModel.SelectClause.Selector is NhCountExpression countExpression return base.VisitSubQuery(expression); } - // TODO - is this safe? All we are extracting is the select clause from the sub-query. Assumes that everything // else in the subquery has been removed. If there were two subqueries, one aggregating & one not, this may not be a // valid assumption. Should probably be passed a list of aggregating subqueries that we are flattening so that we can check... return ReWrite(expression.QueryModel.SelectClause.Selector, _groupBy, _model); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/GroupJoin/GroupJoinSelectClauseRewriter.cs b/src/NHibernate/Linq/GroupJoin/GroupJoinSelectClauseRewriter.cs index 546e7cd514e..6009f756648 100644 --- a/src/NHibernate/Linq/GroupJoin/GroupJoinSelectClauseRewriter.cs +++ b/src/NHibernate/Linq/GroupJoin/GroupJoinSelectClauseRewriter.cs @@ -33,7 +33,6 @@ protected override Expression VisitSubQuery(SubQueryExpression expression) expression.QueryModel.MainFromClause.FromExpression = groupJoin.JoinClause.InnerSequence; - // TODO - this only works if the key selectors are not composite. Needs improvement... expression.QueryModel.BodyClauses.Add(new WhereClause(Expression.Equal(innerSelector, groupJoin.JoinClause.OuterKeySelector))); } @@ -50,4 +49,4 @@ private GroupJoinClause LocateGroupJoinQuerySource(QueryModel model) return new LocateGroupJoinQuerySource(_results).Detect(model.MainFromClause.FromExpression); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/GroupJoin/NonAggregatingGroupJoinRewriter.cs b/src/NHibernate/Linq/GroupJoin/NonAggregatingGroupJoinRewriter.cs index 94da56879db..ae1f8f79273 100644 --- a/src/NHibernate/Linq/GroupJoin/NonAggregatingGroupJoinRewriter.cs +++ b/src/NHibernate/Linq/GroupJoin/NonAggregatingGroupJoinRewriter.cs @@ -83,7 +83,6 @@ private void ReWrite() } else if (IsOuterJoin(nonAggregatingJoin)) { - } else { @@ -151,7 +150,6 @@ private IsAggregatingResults GetGroupJoinInformation(IEnumerable ToFutureValue(this IQuerya #pragma warning restore CS0618 // Type or member is obsolete } - /// /// Allows to set NHibernate query options. /// diff --git a/src/NHibernate/Linq/LinqLogging.cs b/src/NHibernate/Linq/LinqLogging.cs index c6d121cf6eb..be589d9db49 100644 --- a/src/NHibernate/Linq/LinqLogging.cs +++ b/src/NHibernate/Linq/LinqLogging.cs @@ -28,7 +28,6 @@ internal static void LogExpression(string msg, Expression expression) } } - /// /// Replace all occurrences of ConstantExpression where the value is an NHibernate /// proxy with a ParameterExpression. The name of the parameter will be a string @@ -48,4 +47,4 @@ protected override Expression VisitConstant(ConstantExpression expression) } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/NhQueryable.cs b/src/NHibernate/Linq/NhQueryable.cs index f1ef60f137a..d9db57de377 100644 --- a/src/NHibernate/Linq/NhQueryable.cs +++ b/src/NHibernate/Linq/NhQueryable.cs @@ -32,7 +32,6 @@ public NhQueryable(ISessionImplementor session, string entityName) EntityName = entityName; } - // This constructor is called indirectly by LINQ's query methods, just pass to base. public NhQueryable(IQueryProvider provider, Expression expression) : this(provider, expression, typeof(T).FullName) diff --git a/src/NHibernate/Linq/ReWriters/ResultOperatorRemover.cs b/src/NHibernate/Linq/ReWriters/ResultOperatorRemover.cs index 987bb3cef9b..8992847221c 100644 --- a/src/NHibernate/Linq/ReWriters/ResultOperatorRemover.cs +++ b/src/NHibernate/Linq/ReWriters/ResultOperatorRemover.cs @@ -47,6 +47,5 @@ public override void VisitMainFromClause(MainFromClause fromClause, QueryModel q VisitQueryModel(subQueryExpression.QueryModel); base.VisitMainFromClause(fromClause, queryModel); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/ReWriters/SubQueryConditionalExpander.cs b/src/NHibernate/Linq/ReWriters/SubQueryConditionalExpander.cs index 5319018b021..86ce3072eab 100644 --- a/src/NHibernate/Linq/ReWriters/SubQueryConditionalExpander.cs +++ b/src/NHibernate/Linq/ReWriters/SubQueryConditionalExpander.cs @@ -103,7 +103,6 @@ protected override Expression VisitConditional(ConditionalExpression node) var newTest = Visit(node.Test); _nominate.Pop(); - _nominate.Push(false); var newTrue = Visit(node.IfTrue); if (_nominate.Pop() && _subQueryCollectionType.IsAssignableFrom(newTrue.Type)) diff --git a/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs b/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs index a2c81765476..3d2e9be5f47 100644 --- a/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs +++ b/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs @@ -30,10 +30,8 @@ public HqlGeneratorExpressionVisitor(VisitorParameters parameters) _parameters = parameters; } - public ISessionFactory SessionFactory { get { return _parameters.SessionFactory; } } - public HqlTreeNode Visit(Expression expression) { return VisitExpression(expression); diff --git a/src/NHibernate/Linq/Visitors/PossibleValueSet.cs b/src/NHibernate/Linq/Visitors/PossibleValueSet.cs index 6a262d6a998..8bbdbee70a0 100644 --- a/src/NHibernate/Linq/Visitors/PossibleValueSet.cs +++ b/src/NHibernate/Linq/Visitors/PossibleValueSet.cs @@ -314,7 +314,6 @@ public PossibleValueSet MemberAccess(System.Type resultType) #endregion - /// /// Verify that ExpressionType of both this and the other set is bool or nullable bool, /// and return the negotiated type (nullable bool if either side is nullable). @@ -331,7 +330,6 @@ private System.Type DetermineBoolType(PossibleValueSet otherSet) return typeof(bool); } - /// /// Verify that ExpressionType is bool or nullable bool. /// diff --git a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs index ee0a7969d4c..ca5fd8c4384 100644 --- a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs +++ b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Linq.Visitors.ResultOperatorProcessors +namespace NHibernate.Linq.Visitors.ResultOperatorProcessors { internal class ProcessFetchLazyProperties : IResultOperatorProcessor { diff --git a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessResultOperatorReturn.cs b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessResultOperatorReturn.cs index f621e9a8461..8a7a769dd38 100644 --- a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessResultOperatorReturn.cs +++ b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessResultOperatorReturn.cs @@ -8,12 +8,12 @@ namespace NHibernate.Linq.Visitors.ResultOperatorProcessors { public class ProcessResultOperatorReturn { - public HqlTreeNode TreeNode { get; set;} + public HqlTreeNode TreeNode { get; set; } public Action>> AdditionalCriteria { get; set; } - public LambdaExpression ListTransformer { get; set;} - public LambdaExpression PostExecuteTransformer { get; set;} - public HqlBooleanExpression WhereClause { get; set;} - public HqlGroupBy GroupBy { get; set;} + public LambdaExpression ListTransformer { get; set; } + public LambdaExpression PostExecuteTransformer { get; set; } + public HqlBooleanExpression WhereClause { get; set; } + public HqlGroupBy GroupBy { get; set; } public HqlTreeNode AdditionalFrom { get; set; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/Visitors/SelectClauseNominator.cs b/src/NHibernate/Linq/Visitors/SelectClauseNominator.cs index 2db121b9316..085d6681926 100644 --- a/src/NHibernate/Linq/Visitors/SelectClauseNominator.cs +++ b/src/NHibernate/Linq/Visitors/SelectClauseNominator.cs @@ -130,7 +130,6 @@ expression is NhMaxExpression || return true; } return false; - } private bool CanBeEvaluatedInHqlSelectStatement(Expression expression, bool projectConstantsInHql) @@ -175,4 +174,4 @@ private static bool CanBeEvaluatedInHqlStatementShortcut(Expression expression) return expression is NhCountExpression; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/Visitors/SimplifyConditionalVisitor.cs b/src/NHibernate/Linq/Visitors/SimplifyConditionalVisitor.cs index 20047942e40..528bb3ce916 100644 --- a/src/NHibernate/Linq/Visitors/SimplifyConditionalVisitor.cs +++ b/src/NHibernate/Linq/Visitors/SimplifyConditionalVisitor.cs @@ -25,7 +25,6 @@ protected override Expression VisitConditional(ConditionalExpression expression) return base.VisitConditional(expression); } - protected override Expression VisitBinary(BinaryExpression expression) { // See NH-3423. Conditional expression where the test expression is a comparison @@ -45,13 +44,11 @@ protected override Expression VisitBinary(BinaryExpression expression) return base.VisitBinary(expression); } - private static bool IsConstruction(Expression expression) { return expression is NewExpression || expression is MemberInitExpression; } - private static bool IsConstructionToNullComparison(Expression expression) { var testExpression = expression as BinaryExpression; @@ -68,4 +65,4 @@ private static bool IsConstructionToNullComparison(Expression expression) return false; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Linq/Visitors/VisitorUtil.cs b/src/NHibernate/Linq/Visitors/VisitorUtil.cs index c4fa337d572..22ac89dd0aa 100644 --- a/src/NHibernate/Linq/Visitors/VisitorUtil.cs +++ b/src/NHibernate/Linq/Visitors/VisitorUtil.cs @@ -81,7 +81,6 @@ public static bool IsDynamicComponentDictionaryGetter(MethodCallExpression expre return IsDynamicComponentDictionaryGetter(expression, sessionFactory, out memberName); } - public static bool IsNullConstant(Expression expression) { var constantExpression = expression as ConstantExpression; @@ -91,7 +90,6 @@ public static bool IsNullConstant(Expression expression) constantExpression.Value == null; } - public static bool IsBooleanConstant(Expression expression, out bool value) { var constantExpr = expression as ConstantExpression; diff --git a/src/NHibernate/Loader/AbstractEntityJoinWalker.cs b/src/NHibernate/Loader/AbstractEntityJoinWalker.cs index 0767d041f1f..36f48103ed1 100644 --- a/src/NHibernate/Loader/AbstractEntityJoinWalker.cs +++ b/src/NHibernate/Loader/AbstractEntityJoinWalker.cs @@ -105,7 +105,6 @@ private OuterJoinableAssociation CreateAssociation(EntityType entityType, string CollectionHelper.EmptyDictionary()); } - private void InitStatementString(OuterJoinableAssociation rootAssociation, SqlString projection, SqlString condition, SqlString orderBy, SqlString groupBy, SqlString having, LockMode lockMode) { SqlString selectClause = projection; diff --git a/src/NHibernate/Loader/Collection/BasicCollectionJoinWalker.cs b/src/NHibernate/Loader/Collection/BasicCollectionJoinWalker.cs index b00e32c5e98..04605581112 100644 --- a/src/NHibernate/Loader/Collection/BasicCollectionJoinWalker.cs +++ b/src/NHibernate/Loader/Collection/BasicCollectionJoinWalker.cs @@ -85,10 +85,9 @@ private void InitStatementString(string alias, int batchSize, SqlString subquery SqlString = select.ToSqlString(); } - public override string ToString() { return GetType().FullName + '(' + collectionPersister.Role + ')'; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Loader/Criteria/CriteriaLoader.cs b/src/NHibernate/Loader/Criteria/CriteriaLoader.cs index 8f4b99e58c0..206dd43166c 100644 --- a/src/NHibernate/Loader/Criteria/CriteriaLoader.cs +++ b/src/NHibernate/Loader/Criteria/CriteriaLoader.cs @@ -117,7 +117,6 @@ protected override object GetResultColumnOrRow(object[] row, IResultTransformer .TransformTuple(GetResultRow(row, rs, session), ResultRowAliases); } - protected override object[] GetResultRow(object[] row, DbDataReader rs, ISessionImplementor session) { object[] result; diff --git a/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs b/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs index bb8899af71f..682dc73e084 100644 --- a/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs +++ b/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs @@ -237,7 +237,6 @@ internal IType ResultType(ICriteria criteria) //return Factory.getTypeResolver().getTypeFactory().manyToOne(getEntityName(criteria)); } - public IType[] ProjectedTypes { get { return rootCriteria.Projection.GetTypes(rootCriteria, this); } @@ -507,7 +506,6 @@ private void CreateCriteriaEntityNameMap() criteriaInfoMap.Add(rootCriteria, rootProvider); nameCriteriaInfoMap.Add(rootProvider.Name, rootProvider); - foreach (var me in associationPathCriteriaMap) { var info = GetPathInfo(me.Key.Path, rootProvider); @@ -846,8 +844,8 @@ public TypedValue GetTypedValue(ICriteria subcriteria, string propertyName, obje private Persister.Entity.IPropertyMapping GetPropertyMapping(string entityName) { - ICriteriaInfoProvider info ; - if (nameCriteriaInfoMap.TryGetValue(entityName, out info)==false) + ICriteriaInfoProvider info; + if (nameCriteriaInfoMap.TryGetValue(entityName, out info) == false) throw new InvalidOperationException("Could not find criteria info provider for: " + entityName); return info.PropertyMapping; } @@ -1033,7 +1031,6 @@ public string[] GetColumnAliasesUsingProjection(ICriteria subcriteria, string pr private void CreateSubQuerySpaces() { - var subQueries = rootCriteria.IterateExpressionEntries() .Select(x => x.Criterion) @@ -1047,8 +1044,7 @@ private void CreateSubQuerySpaces() var translator = new CriteriaQueryTranslator(sessionFactory, criteriaImpl, criteriaImpl.EntityOrClassName, RootSqlAlias); subQuerySpaces.UnionWith(translator.GetQuerySpaces()); } - - } + } private IQueryable GetQueryablePersister(string entityName) { @@ -1075,4 +1071,3 @@ private bool TryParseCriteriaPath(ICriteria subcriteria, string path, out string } } } - diff --git a/src/NHibernate/Loader/Criteria/ScalarCollectionCriteriaInfoProvider.cs b/src/NHibernate/Loader/Criteria/ScalarCollectionCriteriaInfoProvider.cs index c6b8e19eb8b..108e4ace1b3 100644 --- a/src/NHibernate/Loader/Criteria/ScalarCollectionCriteriaInfoProvider.cs +++ b/src/NHibernate/Loader/Criteria/ScalarCollectionCriteriaInfoProvider.cs @@ -47,6 +47,5 @@ public IType GetType(String relativePath) //not sure what things are going to be passed here, how about 'id', maybe 'index' or 'key' or 'elements' ??? return PropertyMapping.ToType(relativePath); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Loader/Loader.cs b/src/NHibernate/Loader/Loader.cs index 5f9fe52fd77..574cdd63e9d 100644 --- a/src/NHibernate/Loader/Loader.cs +++ b/src/NHibernate/Loader/Loader.cs @@ -263,7 +263,6 @@ private IList DoQueryAndInitializeNonLazyCollections(ISessionImplementor session return DoQueryAndInitializeNonLazyCollections(session, queryParameters, returnProxies, null, null); } - private IList DoQueryAndInitializeNonLazyCollections(ISessionImplementor session, QueryParameters queryParameters, bool returnProxies, IResultTransformer forcedResultTransformer, QueryCacheResultBuilder queryCacheResultBuilder) @@ -737,7 +736,6 @@ protected virtual IResultTransformer ResolveResultTransformer(IResultTransformer return resultTransformer; } - /// /// Are rows transformed immediately after being read from the ResultSet? /// @@ -747,13 +745,11 @@ protected virtual bool AreResultSetRowsTransformedImmediately() return false; } - public virtual IList GetResultList(IList results, IResultTransformer resultTransformer) { return results; } - /// /// Returns the aliases that correspond to a result row. /// @@ -763,7 +759,6 @@ protected virtual string[] ResultRowAliases get { return null; } } - /// /// Get the actual object that is returned in the user-visible result list. /// diff --git a/src/NHibernate/Logging.extensions.cs b/src/NHibernate/Logging.extensions.cs index 357fb4bff80..6fe3af50c00 100644 --- a/src/NHibernate/Logging.extensions.cs +++ b/src/NHibernate/Logging.extensions.cs @@ -113,7 +113,6 @@ public static void Debug(this INHibernateLogger logger, string message) logger.Log(NHibernateLogLevel.Debug, new NHibernateLogValues(message, null), null); } - // catch any method calls with an Exception argument second as they would otherwise silently be consumed by `params object[] args`. /// diff --git a/src/NHibernate/Logging.obsolete.cs b/src/NHibernate/Logging.obsolete.cs index fa70325e399..5fb79302892 100644 --- a/src/NHibernate/Logging.obsolete.cs +++ b/src/NHibernate/Logging.obsolete.cs @@ -78,7 +78,6 @@ public interface ILoggerFactory IInternalLogger LoggerFor(System.Type type); } - [Obsolete("Use NHibernateLogger instead.")] public class LoggerProvider { @@ -346,7 +345,7 @@ public class NoLoggingInternalLogger: IInternalLogger { public bool IsErrorEnabled { - get { return false;} + get { return false; } } public bool IsFatalEnabled diff --git a/src/NHibernate/Mapping/AbstractAuxiliaryDatabaseObject.cs b/src/NHibernate/Mapping/AbstractAuxiliaryDatabaseObject.cs index 96349fcd47b..7d13f64bd94 100644 --- a/src/NHibernate/Mapping/AbstractAuxiliaryDatabaseObject.cs +++ b/src/NHibernate/Mapping/AbstractAuxiliaryDatabaseObject.cs @@ -56,6 +56,5 @@ public void SetParameterValues(IDictionary parameters) { this.parameters = parameters; } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/ByCode/IAnyMapper.cs b/src/NHibernate/Mapping/ByCode/IAnyMapper.cs index 0a7e49c5d7a..d418455629d 100644 --- a/src/NHibernate/Mapping/ByCode/IAnyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/IAnyMapper.cs @@ -22,11 +22,10 @@ public interface IAnyMapper : IEntityPropertyMapper /// The class associated to the specific . void MetaValue(object value, System.Type entityType); - void Cascade(Cascade cascadeStyle); void Index(string indexName); void Lazy(bool isLazy); void Update(bool consideredInUpdateQuery); void Insert(bool consideredInInsertQuery); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/ByCode/ICompositeIdMapper.cs b/src/NHibernate/Mapping/ByCode/ICompositeIdMapper.cs index 72029634360..d0fbab78eac 100644 --- a/src/NHibernate/Mapping/ByCode/ICompositeIdMapper.cs +++ b/src/NHibernate/Mapping/ByCode/ICompositeIdMapper.cs @@ -29,5 +29,4 @@ public interface IComponentAsIdAttributesMapper : IAccessorPropertyM public interface IComponentAsIdMapper : IComponentAsIdAttributesMapper, IMinimalPlainPropertyContainerMapper { } - -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs b/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs index d580b5cc1e7..2b9ea1879ae 100644 --- a/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs +++ b/src/NHibernate/Mapping/ByCode/IDynamicComponentAttributesMapper.cs @@ -18,5 +18,4 @@ public interface IDynamicComponentAttributesMapper : IEntityProperty public interface IDynamicComponentMapper : IDynamicComponentAttributesMapper, IPropertyContainerMapper { } - -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs index cc6f6272f58..7ea3d38f160 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CollectionIdMapper.cs @@ -74,7 +74,6 @@ private void ApplyGenerator(IGeneratorDef generator) return new HbmParam {name = pi.Name, Text = new[] {ReferenceEquals(pvalue, null) ? "null" : pvalue.ToString()}}; }); - } else { diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs index 60c529de125..4a0bf6c2e05 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs @@ -98,7 +98,6 @@ public static MemberInfo GetPropertyOrFieldMatchingNameOrThrow(string memberName return result; } - public void Property(Expression> property, Action mapping) { MemberInfo member = TypeExtensions.DecodeMemberAccessExpression(property); diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs index 8d96c58925b..3dfbfabb19c 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs @@ -76,7 +76,6 @@ public void Persister() where T : IEntityPersister public void Synchronize(params string[] table) { CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.Synchronize(table)); - } #endregion diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs index 41bd43ad3f9..e6a9c4f5e3e 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs @@ -469,7 +469,6 @@ public void Set(string notVisiblePropertyOrFieldName, Action(collectionMapping, mapping, member, memberOf); } - private static void AssertCollectionElementType(string propertyOrFieldName, MemberInfo memberInfo) { System.Type collectionElementType = memberInfo.GetPropertyOrFieldType().DetermineCollectionElementType(); @@ -484,7 +483,6 @@ private static void AssertCollectionElementType(string propertyOrField } } - public void Set(string notVisiblePropertyOrFieldName, Action> collectionMapping) { Set(notVisiblePropertyOrFieldName, collectionMapping, x => { }); diff --git a/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs index d312b6f6489..f594ff87248 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs @@ -55,7 +55,6 @@ public void Column(Action columnMapper) } } - public void Columns(params Action[] columnMapper) { ResetColumnPlainValues(); @@ -150,4 +149,4 @@ private void ResetColumnPlainValues() #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/ByCode/TypeExtensions.cs b/src/NHibernate/Mapping/ByCode/TypeExtensions.cs index 7b18cb19407..fae20ec1af5 100644 --- a/src/NHibernate/Mapping/ByCode/TypeExtensions.cs +++ b/src/NHibernate/Mapping/ByCode/TypeExtensions.cs @@ -212,7 +212,6 @@ public static System.Type DetermineCollectionElementType(this System.Type generi return null; } - public static System.Type DetermineRequiredCollectionElementType(this MemberInfo collectionProperty) { System.Type propertyType = collectionProperty.GetPropertyOrFieldType(); @@ -230,7 +229,6 @@ public static System.Type DetermineRequiredCollectionElementType(this MemberInfo return collectionElementType; } - public static System.Type DetermineCollectionElementOrDictionaryValueType(this System.Type genericCollection) { if (genericCollection.IsGenericType) diff --git a/src/NHibernate/Mapping/Collection.cs b/src/NHibernate/Mapping/Collection.cs index de4c97a58f2..5ebcd301ebc 100644 --- a/src/NHibernate/Mapping/Collection.cs +++ b/src/NHibernate/Mapping/Collection.cs @@ -75,7 +75,6 @@ public abstract class Collection : IFetchable, IValue, IFilterable private readonly HashSet synchronizedTables = new HashSet(); private IDictionary typeParameters; - protected Collection(PersistentClass owner) { this.owner = owner; diff --git a/src/NHibernate/Mapping/Column.cs b/src/NHibernate/Mapping/Column.cs index f129174b732..4425ba98be1 100644 --- a/src/NHibernate/Mapping/Column.cs +++ b/src/NHibernate/Mapping/Column.cs @@ -181,7 +181,6 @@ public string GetAlias(Dialect.Dialect dialect, Table table) return GetAlias(maxAliasLength) + suffix; } - /// /// Gets or sets if the column can have null values in it. /// diff --git a/src/NHibernate/Mapping/IMetaAttributable.cs b/src/NHibernate/Mapping/IMetaAttributable.cs index f0026a3da19..b2400681dc2 100644 --- a/src/NHibernate/Mapping/IMetaAttributable.cs +++ b/src/NHibernate/Mapping/IMetaAttributable.cs @@ -8,7 +8,7 @@ public interface IMetaAttributable /// /// Meta-Attribute collection. /// - IDictionary MetaAttributes { get;set;} + IDictionary MetaAttributes { get; set; } /// /// Retrieve the diff --git a/src/NHibernate/Mapping/IValue.cs b/src/NHibernate/Mapping/IValue.cs index f3991aed143..1941b3dc563 100644 --- a/src/NHibernate/Mapping/IValue.cs +++ b/src/NHibernate/Mapping/IValue.cs @@ -39,7 +39,7 @@ public interface IValue /// /// Gets a indicating if this Value is unique. /// - bool IsAlternateUniqueKey { get;} + bool IsAlternateUniqueKey { get; } /// /// Gets a indicating if this Value can have @@ -82,4 +82,4 @@ public interface IValue object Accept(IValueVisitor visitor); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/IdentifierCollection.cs b/src/NHibernate/Mapping/IdentifierCollection.cs index d5bed3a207f..7d960d0a832 100644 --- a/src/NHibernate/Mapping/IdentifierCollection.cs +++ b/src/NHibernate/Mapping/IdentifierCollection.cs @@ -43,7 +43,7 @@ public override void CreatePrimaryKey() pk.AddColumns(new SafetyEnumerable(Identifier.ColumnIterator)); CollectionTable.PrimaryKey = pk; } - //else // Create an index on the key columns? + //else // Create an index on the key columns? } /// @@ -60,4 +60,4 @@ public override void Validate(IMapping mapping) } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/Join.cs b/src/NHibernate/Mapping/Join.cs index 1656c87eff1..437ad66a3a4 100644 --- a/src/NHibernate/Mapping/Join.cs +++ b/src/NHibernate/Mapping/Join.cs @@ -164,7 +164,6 @@ public bool IsLazy } return isLazy.Value; } - } public virtual bool IsOptional @@ -173,4 +172,4 @@ public virtual bool IsOptional set { isOptional = value; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Mapping/ManyToOne.cs b/src/NHibernate/Mapping/ManyToOne.cs index 72d9a106aba..f37f292115f 100644 --- a/src/NHibernate/Mapping/ManyToOne.cs +++ b/src/NHibernate/Mapping/ManyToOne.cs @@ -77,7 +77,6 @@ public void CreatePropertyRefConstraints(IDictionary pe if (!HasFormula && !"none".Equals(ForeignKeyName, StringComparison.OrdinalIgnoreCase)) { - IEnumerable ce = new SafetyEnumerable(property.ColumnIterator); // NH : Ensure that related columns have same length diff --git a/src/NHibernate/Mapping/PersistentClass.cs b/src/NHibernate/Mapping/PersistentClass.cs index 13fa0a30684..3b23cb5e6dc 100644 --- a/src/NHibernate/Mapping/PersistentClass.cs +++ b/src/NHibernate/Mapping/PersistentClass.cs @@ -236,7 +236,6 @@ public virtual IEnumerable SubclassClosureIterator return new JoinedEnumerable(iters); } - } public virtual Table IdentityTable @@ -1104,7 +1103,6 @@ protected internal void CheckPropertyColumnDuplication(ISet distinctColu CheckColumnDuplication(distinctColumns, prop.ColumnIterator); } } - } protected internal virtual void CheckColumnDuplication() @@ -1186,6 +1184,5 @@ public bool HasNaturalId() } public abstract bool IsLazyPropertiesCacheable { get; } - } } diff --git a/src/NHibernate/Mapping/RootClass.cs b/src/NHibernate/Mapping/RootClass.cs index 59210b16467..f35c00d913e 100644 --- a/src/NHibernate/Mapping/RootClass.cs +++ b/src/NHibernate/Mapping/RootClass.cs @@ -170,7 +170,6 @@ public virtual ISet IdentityTables } return tables; } - } internal override int NextSubclassId() diff --git a/src/NHibernate/Mapping/Table.cs b/src/NHibernate/Mapping/Table.cs index 625b4aa056e..3082a9c02b0 100644 --- a/src/NHibernate/Mapping/Table.cs +++ b/src/NHibernate/Mapping/Table.cs @@ -1052,7 +1052,6 @@ public IEnumerable ValidateColumns(Dialect.Dialect dialect, IMapping map return validationErrors; } - #region Nested type: ForeignKeyKey [Serializable] internal class ForeignKeyKey : IEqualityComparer diff --git a/src/NHibernate/Mapping/ToOne.cs b/src/NHibernate/Mapping/ToOne.cs index d327bbc4b7a..c959216d4b4 100644 --- a/src/NHibernate/Mapping/ToOne.cs +++ b/src/NHibernate/Mapping/ToOne.cs @@ -72,7 +72,7 @@ public override bool IsValid(Engine.IMapping mapping) return base.IsValid(mapping); } - public override abstract IType Type { get;} + public override abstract IType Type { get; } public override bool IsTypeSpecified { diff --git a/src/NHibernate/Metadata/IClassMetadata.cs b/src/NHibernate/Metadata/IClassMetadata.cs index 32367ce3ae2..7a06f433eb7 100644 --- a/src/NHibernate/Metadata/IClassMetadata.cs +++ b/src/NHibernate/Metadata/IClassMetadata.cs @@ -56,13 +56,13 @@ public interface IClassMetadata bool[] PropertyNullability { get; } /// Get the "laziness" of the properties of this class - bool[] PropertyLaziness { get;} + bool[] PropertyLaziness { get; } /// Which properties hold the natural id? - int[] NaturalIdentifierProperties { get;} + int[] NaturalIdentifierProperties { get; } /// Does this entity extend a mapped superclass? - bool IsInherited { get;} + bool IsInherited { get; } #region stuff that is persister-centric and/or EntityInfo-centric @@ -146,4 +146,4 @@ public interface IClassMetadata #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Multi/QueryBatchItemBase.cs b/src/NHibernate/Multi/QueryBatchItemBase.cs index 5fcf2b558e3..a3b404bb544 100644 --- a/src/NHibernate/Multi/QueryBatchItemBase.cs +++ b/src/NHibernate/Multi/QueryBatchItemBase.cs @@ -48,7 +48,7 @@ protected class QueryInfo : ICachingInformation, ICachingInformationWithFetches public bool IsCacheable { get; } /// - public QueryKey CacheKey { get;} + public QueryKey CacheKey { get; } /// public bool CanGetFromCache { get; } diff --git a/src/NHibernate/NHibernateUtil.cs b/src/NHibernate/NHibernateUtil.cs index fcc7a894e94..e781db52bef 100644 --- a/src/NHibernate/NHibernateUtil.cs +++ b/src/NHibernate/NHibernateUtil.cs @@ -287,7 +287,6 @@ public static IType GuessType(System.Type type) /// public static readonly AnyType Object = new AnyType(); - // /// // /// NHibernate blob type // /// @@ -383,7 +382,6 @@ public static IType Custom(System.Type userTypeClass) } } - /// /// Force initialization of a proxy or persistent collection. /// @@ -408,7 +406,6 @@ public static void Initialize(object proxy) { persistent.ForceInitialization(); } - } /// @@ -557,7 +554,6 @@ public static void Close(IEnumerable enumerable) hibernateEnumerable.Dispose(); } - /// /// Check if the property is initialized. If the named property does not exist /// or is not persistent, this method always returns true. diff --git a/src/NHibernate/NonUniqueResultException.cs b/src/NHibernate/NonUniqueResultException.cs index 1dfb262a3d9..82ff46f6de5 100644 --- a/src/NHibernate/NonUniqueResultException.cs +++ b/src/NHibernate/NonUniqueResultException.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.Serialization; - namespace NHibernate { /// diff --git a/src/NHibernate/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs b/src/NHibernate/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs index 1b8f0dd14aa..67c8d550bd9 100644 --- a/src/NHibernate/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs +++ b/src/NHibernate/Param/AggregatedIndexCollectionSelectorParameterSpecifications.cs @@ -26,7 +26,6 @@ public AggregatedIndexCollectionSelectorParameterSpecifications(IList sqlQueryParametersList, QueryParameters queryParameters, ISessionImplementor session) { throw new NotImplementedException(); @@ -43,10 +42,9 @@ public IType ExpectedType set { } } - public string RenderDisplayInfo() - + public string RenderDisplayInfo() { - return "index-selector [" + CollectDisplayInfo() + "]" ; + return "index-selector [" + CollectDisplayInfo() + "]"; } public IEnumerable GetIdsForBackTrack(IMapping sessionFactory) @@ -66,4 +64,4 @@ private string CollectDisplayInfo() return buffer.ToString(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Persister/Collection/ICollectionPersister.cs b/src/NHibernate/Persister/Collection/ICollectionPersister.cs index 88d2401ae2d..49ce869c33a 100644 --- a/src/NHibernate/Persister/Collection/ICollectionPersister.cs +++ b/src/NHibernate/Persister/Collection/ICollectionPersister.cs @@ -36,7 +36,7 @@ public partial interface ICollectionPersister ICacheConcurrencyStrategy Cache { get; } /// Get the cache structure - ICacheEntryStructure CacheEntryStructure { get;} + ICacheEntryStructure CacheEntryStructure { get; } /// /// Get the associated IType @@ -74,7 +74,7 @@ public partial interface ICollectionPersister bool IsArray { get; } /// Is this a one-to-many association? - bool IsOneToMany { get;} + bool IsOneToMany { get; } /// /// Is this a many-to-many association? Note that this is mainly @@ -82,7 +82,7 @@ public partial interface ICollectionPersister /// contain all the information needed to handle a many-to-many /// itself, as internally it is looked at as two many-to-ones. /// - bool IsManyToMany { get;} + bool IsManyToMany { get; } /// /// Is this collection lazily initialized? @@ -100,7 +100,7 @@ public partial interface ICollectionPersister string Role { get; } /// Get the persister of the entity that "owns" this collection - IEntityPersister OwnerEntityPersister { get;} + IEntityPersister OwnerEntityPersister { get; } /// /// Get the surrogate key generation strategy (optional operation) @@ -121,7 +121,7 @@ public partial interface ICollectionPersister /// Is cascade delete handled by the database-level /// foreign key constraint definition? /// - bool CascadeDeleteEnabled { get;} + bool CascadeDeleteEnabled { get; } /// /// Does this collection cause version increment of the owning entity? @@ -129,10 +129,10 @@ public partial interface ICollectionPersister bool IsVersioned { get; } /// Can the elements of this collection change? - bool IsMutable { get;} + bool IsMutable { get; } ISessionFactoryImplementor Factory { get; } - bool IsExtraLazy { get;} + bool IsExtraLazy { get; } /// /// Initialize the given collection with the given key @@ -268,7 +268,7 @@ public partial interface ICollectionPersister int GetSize(object key, ISessionImplementor session); bool IndexExists(object key, object index, ISessionImplementor session); bool ElementExists(object key, object element, ISessionImplementor session); - + /// /// Try to find an element by a given index. /// @@ -278,7 +278,7 @@ public partial interface ICollectionPersister /// The owner of the collection. /// The value of the element where available; otherwise . object GetElementByIndex(object key, object index, ISessionImplementor session, object owner); - + /// /// A place-holder to inform that the data-reader was empty. /// diff --git a/src/NHibernate/Persister/Collection/IQueryableCollection.cs b/src/NHibernate/Persister/Collection/IQueryableCollection.cs index 6004fe907f9..ba24382c62b 100644 --- a/src/NHibernate/Persister/Collection/IQueryableCollection.cs +++ b/src/NHibernate/Persister/Collection/IQueryableCollection.cs @@ -12,7 +12,7 @@ public interface IQueryableCollection : IPropertyMapping, IJoinable, ICollection /// Get the index formulas if this is an indexed collection /// (optional operation) /// - string[] IndexFormulas { get;} + string[] IndexFormulas { get; } /// /// Get the persister of the element class, if this is a diff --git a/src/NHibernate/Persister/Collection/NamedQueryCollectionInitializer.cs b/src/NHibernate/Persister/Collection/NamedQueryCollectionInitializer.cs index 710ef996369..70f32337b04 100644 --- a/src/NHibernate/Persister/Collection/NamedQueryCollectionInitializer.cs +++ b/src/NHibernate/Persister/Collection/NamedQueryCollectionInitializer.cs @@ -1,4 +1,3 @@ - using NHibernate.Engine; using NHibernate.Impl; using NHibernate.Loader.Collection; diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs index 31d85e9c88d..843cc2b0cb6 100644 --- a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs +++ b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs @@ -552,8 +552,8 @@ protected AbstractEntityPersister(PersistentClass persistentClass, ICacheConcurr protected abstract int[] SubclassColumnTableNumberClosure { get; } protected abstract int[] SubclassFormulaTableNumberClosure { get; } - protected internal abstract int[] PropertyTableNumbersInSelect { get;} - protected internal abstract int[] PropertyTableNumbers { get;} + protected internal abstract int[] PropertyTableNumbersInSelect { get; } + protected internal abstract int[] PropertyTableNumbers { get; } public virtual string DiscriminatorColumnName { @@ -1052,13 +1052,13 @@ public int[] NaturalIdentifierProperties get { return entityMetamodel.NaturalIdentifierProperties; } } - public abstract string[][] ConstraintOrderedTableKeyColumnClosure { get;} - public abstract IType DiscriminatorType { get;} - public abstract string[] ConstraintOrderedTableNameClosure { get;} - public abstract string DiscriminatorSQLValue { get;} - public abstract object DiscriminatorValue { get;} + public abstract string[][] ConstraintOrderedTableKeyColumnClosure { get; } + public abstract IType DiscriminatorType { get; } + public abstract string[] ConstraintOrderedTableNameClosure { get; } + public abstract string DiscriminatorSQLValue { get; } + public abstract object DiscriminatorValue { get; } public abstract string[] SubclassClosure { get; } - public abstract string[] PropertySpaces { get;} + public abstract string[] PropertySpaces { get; } protected virtual void AddDiscriminatorToInsert(SqlInsertBuilder insert) { } @@ -1859,7 +1859,6 @@ protected string ConcretePropertySelectFragment(string alias, IInclusionChecker return frag.ToFragmentString(); } - protected virtual SqlString GenerateSnapshotSelectString() { //TODO: should we use SELECT .. FOR UPDATE? @@ -4143,7 +4142,6 @@ protected internal IEntityTuplizer GetTuplizer(ISessionImplementor session) return EntityTuplizer; } - public virtual bool HasCache { get { return cache != null; } diff --git a/src/NHibernate/Persister/Entity/ILoadable.cs b/src/NHibernate/Persister/Entity/ILoadable.cs index 3b20e1baf33..66308dc02fb 100644 --- a/src/NHibernate/Persister/Entity/ILoadable.cs +++ b/src/NHibernate/Persister/Entity/ILoadable.cs @@ -65,7 +65,7 @@ public partial interface ILoadable : IEntityPersister string GetDiscriminatorAlias(string suffix); /// Does the result set contain rowids? - bool HasRowId { get;} + bool HasRowId { get; } /// /// Retrieve property values from one row of a result set diff --git a/src/NHibernate/Persister/Entity/ILockable.cs b/src/NHibernate/Persister/Entity/ILockable.cs index 370ef5d0011..0daed44a868 100644 --- a/src/NHibernate/Persister/Entity/ILockable.cs +++ b/src/NHibernate/Persister/Entity/ILockable.cs @@ -15,18 +15,18 @@ public interface ILockable : IEntityPersister /// /// Locks are always applied to the "root table". /// - string RootTableName { get;} + string RootTableName { get; } /// /// Get the names of columns on the root table used to persist the identifier. /// - string[] RootTableIdentifierColumnNames { get;} + string[] RootTableIdentifierColumnNames { get; } /// /// For versioned entities, get the name of the column (again, expected on the /// root table) used to store the version values. /// - string VersionColumnName { get;} + string VersionColumnName { get; } /// /// Get the SQL alias this persister would use for the root table @@ -42,8 +42,8 @@ public interface ILockable : IEntityPersister /// /// To build the SQL command in pessimistic lock /// - SqlType[] IdAndVersionSqlTypes { get;} + SqlType[] IdAndVersionSqlTypes { get; } #endregion } -} \ No newline at end of file +} diff --git a/src/NHibernate/Persister/Entity/IQueryable.cs b/src/NHibernate/Persister/Entity/IQueryable.cs index a0fe5934e8d..2178b43a024 100644 --- a/src/NHibernate/Persister/Entity/IQueryable.cs +++ b/src/NHibernate/Persister/Entity/IQueryable.cs @@ -55,14 +55,14 @@ public interface IQueryable : ILoadable, IPropertyMapping, IJoinable /// multiple tables? /// /// True if the inheritance hierarchy is spread across multiple tables; false otherwise. - bool IsMultiTable { get;} + bool IsMultiTable { get; } /// /// Get the names of all tables used in the hierarchy (up and down) ordered such /// that deletes in the given order would not cause constraint violations. /// /// The ordered array of table names. - string[] ConstraintOrderedTableNameClosure { get;} + string[] ConstraintOrderedTableNameClosure { get; } /// /// For each table specified in , get @@ -75,24 +75,24 @@ public interface IQueryable : ILoadable, IPropertyMapping, IJoinable /// The second dimension should have the same length across all the elements in /// the first dimension. If not, that'd be a problem ;) /// - string[][] ConstraintOrderedTableKeyColumnClosure { get;} + string[][] ConstraintOrderedTableKeyColumnClosure { get; } /// /// Get the name of the temporary table to be used to (potentially) store id values /// when performing bulk update/deletes. /// /// The appropriate temporary table name. - string TemporaryIdTableName { get;} + string TemporaryIdTableName { get; } /// /// Get the appropriate DDL command for generating the temporary table to /// be used to (potentially) store id values when performing bulk update/deletes. /// /// The appropriate temporary table creation command. - string TemporaryIdTableDDL { get;} + string TemporaryIdTableDDL { get; } /// Is the version property included in insert statements? - bool VersionPropertyInsertable { get;} + bool VersionPropertyInsertable { get; } /// /// Given a query alias and an identifying suffix, render the identifier select fragment. diff --git a/src/NHibernate/Persister/Entity/NamedQueryLoader.cs b/src/NHibernate/Persister/Entity/NamedQueryLoader.cs index 8f8e6d44be1..5877ccd742d 100644 --- a/src/NHibernate/Persister/Entity/NamedQueryLoader.cs +++ b/src/NHibernate/Persister/Entity/NamedQueryLoader.cs @@ -1,4 +1,3 @@ - using NHibernate.Engine; using NHibernate.Impl; using NHibernate.Loader.Entity; diff --git a/src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs b/src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs index 346d0dfad2a..c8d2c834cac 100644 --- a/src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs +++ b/src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs @@ -180,7 +180,7 @@ public override Type.IType DiscriminatorType public override string DiscriminatorSQLValue { - get { return discriminatorSQLValue;} + get { return discriminatorSQLValue; } } public override object DiscriminatorValue @@ -393,4 +393,4 @@ public override string GetPropertyTableName(string propertyName) return TableName; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Properties/BackrefPropertyAccessor.cs b/src/NHibernate/Properties/BackrefPropertyAccessor.cs index 9721657eee2..71c94908536 100644 --- a/src/NHibernate/Properties/BackrefPropertyAccessor.cs +++ b/src/NHibernate/Properties/BackrefPropertyAccessor.cs @@ -66,7 +66,6 @@ public MethodInfo Method #endregion } - /// The Getter implementation for id backrefs. [Serializable] private class BackrefGetter : IGetter diff --git a/src/NHibernate/Properties/EmbeddedPropertyAccessor.cs b/src/NHibernate/Properties/EmbeddedPropertyAccessor.cs index 8e22d653bf4..cf88ef06941 100644 --- a/src/NHibernate/Properties/EmbeddedPropertyAccessor.cs +++ b/src/NHibernate/Properties/EmbeddedPropertyAccessor.cs @@ -105,6 +105,5 @@ public override string ToString() return string.Format("EmbeddedSetter({0})", clazz.FullName); } } - } } diff --git a/src/NHibernate/Properties/IPropertyAccessor.cs b/src/NHibernate/Properties/IPropertyAccessor.cs index 224cb5ad487..b54ff794dd4 100644 --- a/src/NHibernate/Properties/IPropertyAccessor.cs +++ b/src/NHibernate/Properties/IPropertyAccessor.cs @@ -39,7 +39,7 @@ public interface IPropertyAccessor /// /// Allow embedded and custom accessors to define if the ReflectionOptimizer can be used. /// - bool CanAccessThroughReflectionOptimizer { get;} + bool CanAccessThroughReflectionOptimizer { get; } #endregion } } diff --git a/src/NHibernate/Properties/PropertyAccessorFactory.cs b/src/NHibernate/Properties/PropertyAccessorFactory.cs index 4a65b5015bf..b703663ac39 100644 --- a/src/NHibernate/Properties/PropertyAccessorFactory.cs +++ b/src/NHibernate/Properties/PropertyAccessorFactory.cs @@ -275,6 +275,5 @@ public static IPropertyAccessor DynamicMapPropertyAccessor { get { return MapAccessor; } } - } } diff --git a/src/NHibernate/PropertyValueException.cs b/src/NHibernate/PropertyValueException.cs index 77c9a739636..c58d57ed75f 100644 --- a/src/NHibernate/PropertyValueException.cs +++ b/src/NHibernate/PropertyValueException.cs @@ -25,7 +25,6 @@ public PropertyValueException(string message, string entityName, string property this.propertyName = propertyName; } - public PropertyValueException(string message, string entityName, string propertyName, Exception innerException) : base(message, innerException) { @@ -33,7 +32,6 @@ public PropertyValueException(string message, string entityName, string property this.propertyName = propertyName; } - public string EntityName { get { return entityName; } diff --git a/src/NHibernate/Proxy/AbstractLazyInitializer.cs b/src/NHibernate/Proxy/AbstractLazyInitializer.cs index ddc12f5398b..5f16a96fc3c 100644 --- a/src/NHibernate/Proxy/AbstractLazyInitializer.cs +++ b/src/NHibernate/Proxy/AbstractLazyInitializer.cs @@ -123,7 +123,7 @@ public object Identifier set { _id = value; } } - public abstract System.Type PersistentClass { get;} + public abstract System.Type PersistentClass { get; } public bool IsUninitialized { diff --git a/src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs b/src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs index 1562b6f4306..30b5a4d759b 100644 --- a/src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs +++ b/src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs @@ -68,7 +68,7 @@ public void EmitMethodBody(MethodBuilder proxyMethod, MethodBuilder callbackMeth IL.MarkLabel(skipBaseCall); // Push arguments for InvocationInfo constructor. - IL.Emit(OpCodes.Ldarg_0); // 'this' pointer + IL.Emit(OpCodes.Ldarg_0); // 'this' pointer PushTargetMethodInfo(IL, proxyMethod, method); PushTargetMethodInfo(IL, callbackMethod, callbackMethod); PushStackTrace(IL); diff --git a/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs b/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs index ad0a79a60c3..3e9c9fd3bec 100644 --- a/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs +++ b/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs @@ -226,7 +226,6 @@ private static void DefineSerializationConstructor(TypeBuilder typeBuilder, Fiel constructor.SetImplementationFlags(MethodImplAttributes.IL | MethodImplAttributes.Managed); - IL.Emit(OpCodes.Ldtoken, typeof (IInterceptor)); IL.Emit(OpCodes.Call, ReflectionCache.TypeMethods.GetTypeFromHandle); IL.Emit(OpCodes.Stloc, interceptorType); diff --git a/src/NHibernate/Proxy/ILazyInitializer.cs b/src/NHibernate/Proxy/ILazyInitializer.cs index df7f0a5feb8..8174d961aa8 100644 --- a/src/NHibernate/Proxy/ILazyInitializer.cs +++ b/src/NHibernate/Proxy/ILazyInitializer.cs @@ -20,7 +20,7 @@ public partial interface ILazyInitializer /// /// The entity-name of the entity our owning proxy represents. /// - string EntityName { get;} + string EntityName { get; } /// /// Get the actual class of the entity. Generally, should be used instead. @@ -100,4 +100,4 @@ public partial interface ILazyInitializer /// void UnsetSession(); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Proxy/INHibernateProxy.cs b/src/NHibernate/Proxy/INHibernateProxy.cs index e36ac9c25c0..7248d27b9b7 100644 --- a/src/NHibernate/Proxy/INHibernateProxy.cs +++ b/src/NHibernate/Proxy/INHibernateProxy.cs @@ -18,6 +18,6 @@ namespace NHibernate.Proxy public interface INHibernateProxy { /// Get the underlying lazy initialization handler. - ILazyInitializer HibernateLazyInitializer { get;} + ILazyInitializer HibernateLazyInitializer { get; } } } diff --git a/src/NHibernate/Proxy/Map/MapProxy.cs b/src/NHibernate/Proxy/Map/MapProxy.cs index 78135becd38..daec46ac686 100644 --- a/src/NHibernate/Proxy/Map/MapProxy.cs +++ b/src/NHibernate/Proxy/Map/MapProxy.cs @@ -112,7 +112,7 @@ public void Remove(object key) public object this[object key] { get { return li.Map[key]; } - set { li.Map[key] = value;} + set { li.Map[key] = value; } } public ICollection Keys diff --git a/src/NHibernate/Proxy/NHibernateProxyHelper.cs b/src/NHibernate/Proxy/NHibernateProxyHelper.cs index 69ffec283c3..ce1f27f6168 100644 --- a/src/NHibernate/Proxy/NHibernateProxyHelper.cs +++ b/src/NHibernate/Proxy/NHibernateProxyHelper.cs @@ -64,4 +64,3 @@ public static bool IsProxy(this object entity) } } } - diff --git a/src/NHibernate/SqlCommand/Alias.cs b/src/NHibernate/SqlCommand/Alias.cs index 6d1baca4912..ab623967c11 100644 --- a/src/NHibernate/SqlCommand/Alias.cs +++ b/src/NHibernate/SqlCommand/Alias.cs @@ -175,7 +175,6 @@ public string[] ToUnquotedAliasStrings(string[] sqlIdentifiers, Dialect.Dialect return aliases; } - /// /// /// @@ -193,4 +192,4 @@ public string[] ToAliasStrings(string[] sqlIdentifiers, Dialect.Dialect dialect) return aliases; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/SqlCommand/DisjunctionFragment.cs b/src/NHibernate/SqlCommand/DisjunctionFragment.cs index 7372b11500f..55cefa41bbf 100644 --- a/src/NHibernate/SqlCommand/DisjunctionFragment.cs +++ b/src/NHibernate/SqlCommand/DisjunctionFragment.cs @@ -11,14 +11,12 @@ public DisjunctionFragment() { } - public DisjunctionFragment(IEnumerable fragments) { foreach (var conditionalFragment in fragments) AddCondition(conditionalFragment); } - public DisjunctionFragment AddCondition(ConditionalFragment fragment) { if (buffer.Count > 0) @@ -38,4 +36,4 @@ public SqlString ToFragmentString() return buffer.ToSqlString(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/SqlCommand/InsertSelect.cs b/src/NHibernate/SqlCommand/InsertSelect.cs index 1ee65da3185..dc2f6b285f6 100644 --- a/src/NHibernate/SqlCommand/InsertSelect.cs +++ b/src/NHibernate/SqlCommand/InsertSelect.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - namespace NHibernate.SqlCommand { public class InsertSelect : ISqlStringBuilder @@ -74,4 +73,4 @@ public SqlString ToSqlString() return buf.ToSqlString(); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/SqlCommand/Parser/MsSqlSelectParser.cs b/src/NHibernate/SqlCommand/Parser/MsSqlSelectParser.cs index ced57273b9c..a3c15820882 100644 --- a/src/NHibernate/SqlCommand/Parser/MsSqlSelectParser.cs +++ b/src/NHibernate/SqlCommand/Parser/MsSqlSelectParser.cs @@ -55,7 +55,7 @@ public MsSqlSelectParser(SqlString sql) public SqlString Sql { get; } public int SelectIndex { get; } public int FromIndex { get; } - public int OrderByIndex { get;} + public int OrderByIndex { get; } public bool IsDistinct { get; } /// diff --git a/src/NHibernate/SqlCommand/QueryJoinFragment.cs b/src/NHibernate/SqlCommand/QueryJoinFragment.cs index 73eb8d61563..5a29fff4d02 100644 --- a/src/NHibernate/SqlCommand/QueryJoinFragment.cs +++ b/src/NHibernate/SqlCommand/QueryJoinFragment.cs @@ -101,7 +101,6 @@ public override bool AddCondition(string condition) return false; } - public override bool AddCondition(SqlString condition) { //TODO: this seems hackish diff --git a/src/NHibernate/SqlCommand/SqlBaseBuilder.cs b/src/NHibernate/SqlCommand/SqlBaseBuilder.cs index ed43a8f6fb4..5fc68023c49 100644 --- a/src/NHibernate/SqlCommand/SqlBaseBuilder.cs +++ b/src/NHibernate/SqlCommand/SqlBaseBuilder.cs @@ -76,7 +76,7 @@ protected SqlString ToWhereString(string tableAlias, string[] columnNames, strin for (int i = 0; i < columnNames.Length; i++) { - if (string.IsNullOrEmpty(columnNames[i])) continue;// prevent empty column name + if (string.IsNullOrEmpty(columnNames[i])) continue; // prevent empty column name if (andNeeded) { @@ -108,6 +108,5 @@ protected SqlString ToWhereString(string columnName, string op) if (string.IsNullOrEmpty(columnName)) return null; return new SqlString(columnName, op, Parameter.Placeholder); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/SqlCommand/SqlInsertBuilder.cs b/src/NHibernate/SqlCommand/SqlInsertBuilder.cs index f2abf421ac9..5110bc7954b 100644 --- a/src/NHibernate/SqlCommand/SqlInsertBuilder.cs +++ b/src/NHibernate/SqlCommand/SqlInsertBuilder.cs @@ -28,7 +28,7 @@ public SqlInsertBuilder(ISessionFactoryImplementor factory) protected internal Dialect.Dialect Dialect { - get{return factory.Dialect;} + get { return factory.Dialect; } } public virtual SqlInsertBuilder SetComment(string comment) @@ -71,7 +71,6 @@ public SqlInsertBuilder AddColumn(string columnName, object val, ILiteralType li return AddColumn(columnName, literalType.ObjectToSQLString(val, Dialect)); } - /// /// Add a column with a specific value to the INSERT sql /// diff --git a/src/NHibernate/SqlCommand/SqlSelectBuilder.cs b/src/NHibernate/SqlCommand/SqlSelectBuilder.cs index e287fb8b5c4..1859ea28263 100644 --- a/src/NHibernate/SqlCommand/SqlSelectBuilder.cs +++ b/src/NHibernate/SqlCommand/SqlSelectBuilder.cs @@ -1,4 +1,3 @@ - using System; using NHibernate.Engine; using NHibernate.Type; diff --git a/src/NHibernate/SqlCommand/SqlSimpleSelectBuilder.cs b/src/NHibernate/SqlCommand/SqlSimpleSelectBuilder.cs index 96188e65695..ceaf0907a58 100644 --- a/src/NHibernate/SqlCommand/SqlSimpleSelectBuilder.cs +++ b/src/NHibernate/SqlCommand/SqlSimpleSelectBuilder.cs @@ -39,7 +39,6 @@ public SqlSimpleSelectBuilder SetTableName(string tableName) return this; } - /// /// Adds a columnName to the SELECT fragment. /// @@ -230,7 +229,6 @@ public SqlString ToSqlString() commaNeeded = true; } - sqlBuilder.Add(" FROM ") .Add(Dialect.AppendLockHint(lockMode, tableName)); diff --git a/src/NHibernate/SqlCommand/SqlString.cs b/src/NHibernate/SqlCommand/SqlString.cs index dce3f630db9..52682fd3ecd 100644 --- a/src/NHibernate/SqlCommand/SqlString.cs +++ b/src/NHibernate/SqlCommand/SqlString.cs @@ -205,7 +205,7 @@ internal SqlString(IEnumerable parts) _parameters = new SortedList(); var sqlIndex = 0; - var pendingContent = new StringBuilder(); // Collect adjoining string parts (the compaction). + var pendingContent = new StringBuilder(); // Collect adjoining string parts (the compaction). foreach (var part in parts) { Add(part, pendingContent, ref sqlIndex); diff --git a/src/NHibernate/SqlCommand/SqlStringBuilder.cs b/src/NHibernate/SqlCommand/SqlStringBuilder.cs index 6e3319c25ef..1692cf24019 100644 --- a/src/NHibernate/SqlCommand/SqlStringBuilder.cs +++ b/src/NHibernate/SqlCommand/SqlStringBuilder.cs @@ -164,7 +164,6 @@ public SqlStringBuilder Add(SqlString sqlString) return this; } - /// /// Adds an existing SqlString to this SqlStringBuilder /// diff --git a/src/NHibernate/SqlCommand/SqlStringHelper.cs b/src/NHibernate/SqlCommand/SqlStringHelper.cs index ec111f6b1d0..6fcba3382ee 100644 --- a/src/NHibernate/SqlCommand/SqlStringHelper.cs +++ b/src/NHibernate/SqlCommand/SqlStringHelper.cs @@ -11,7 +11,6 @@ namespace NHibernate.SqlCommand /// public static class SqlStringHelper { - public static SqlString Join(SqlString separator, IEnumerable objects) { SqlStringBuilder buf = new SqlStringBuilder(); @@ -31,7 +30,6 @@ public static SqlString Join(SqlString separator, IEnumerable objects) return buf.ToSqlString(); } - public static SqlString[] Add(SqlString[] x, string sep, SqlString[] y) { SqlString[] result = new SqlString[x.Length]; @@ -42,7 +40,6 @@ public static SqlString[] Add(SqlString[] x, string sep, SqlString[] y) return result; } - public static SqlString RemoveAsAliasesFromSql(SqlString sql) { int index = sql.LastIndexOfCaseInsensitive(" as "); @@ -50,13 +47,11 @@ public static SqlString RemoveAsAliasesFromSql(SqlString sql) return sql.Substring(0, index); } - public static bool IsNotEmpty(SqlString str) { return !IsEmpty(str); } - public static bool IsEmpty(SqlString str) { return str == null || str.Count == 0; diff --git a/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs b/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs index 809b22ee0d8..e232e2a210c 100644 --- a/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs +++ b/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs @@ -52,7 +52,6 @@ public SqlUpdateBuilder AddColumn(string columnName, object val, ILiteralType li return AddColumn(columnName, literalType.ObjectToSQLString(val, Dialect)); } - /// /// Add a column with a specific value to the UPDATE sql /// @@ -301,7 +300,6 @@ public SqlString ToSqlString() sqlBuilder.Add(StringHelper.CommaSpace); commaNeeded = true; - sqlBuilder.Add(valuePair.Key) .Add(" = "); @@ -321,7 +319,6 @@ public SqlString ToSqlString() sqlBuilder.Add(assignments); } - sqlBuilder.Add(" WHERE "); bool andNeeded = false; foreach (SqlString whereString in whereStrings) diff --git a/src/NHibernate/Stat/CollectionStatistics.cs b/src/NHibernate/Stat/CollectionStatistics.cs index d46dff86117..df8f7df697d 100644 --- a/src/NHibernate/Stat/CollectionStatistics.cs +++ b/src/NHibernate/Stat/CollectionStatistics.cs @@ -50,7 +50,6 @@ public override string ToString() .Append(",removeCount=").Append(removeCount) .Append(",updateCount=").Append(updateCount) .Append(']').ToString(); - } } } diff --git a/src/NHibernate/Stat/ISessionStatistics.cs b/src/NHibernate/Stat/ISessionStatistics.cs index bf8c28fc2ff..c30065ad0f8 100644 --- a/src/NHibernate/Stat/ISessionStatistics.cs +++ b/src/NHibernate/Stat/ISessionStatistics.cs @@ -9,15 +9,15 @@ namespace NHibernate.Stat public interface ISessionStatistics { /// Get the number of entity instances associated with the session - int EntityCount { get;} + int EntityCount { get; } /// Get the number of collection instances associated with the session - int CollectionCount { get;} + int CollectionCount { get; } /// Get the set of all EntityKeys. - IList EntityKeys { get;} + IList EntityKeys { get; } /// Get the set of all CollectionKeys. - IList CollectionKeys { get;} + IList CollectionKeys { get; } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Stat/IStatistics.cs b/src/NHibernate/Stat/IStatistics.cs index 480afb54fff..c0bb7e870d9 100644 --- a/src/NHibernate/Stat/IStatistics.cs +++ b/src/NHibernate/Stat/IStatistics.cs @@ -10,110 +10,110 @@ namespace NHibernate.Stat public interface IStatistics { /// Global number of entity deletes - long EntityDeleteCount { get;} + long EntityDeleteCount { get; } /// Global number of entity inserts - long EntityInsertCount { get;} + long EntityInsertCount { get; } /// Global number of entity loads - long EntityLoadCount { get;} + long EntityLoadCount { get; } /// Global number of entity fetchs - long EntityFetchCount { get;} + long EntityFetchCount { get; } /// Global number of entity updates - long EntityUpdateCount { get;} + long EntityUpdateCount { get; } /// Global number of executed queries - long QueryExecutionCount { get;} + long QueryExecutionCount { get; } /// The of the slowest query. TimeSpan QueryExecutionMaxTime { get; } /// The query string for the slowest query. - string QueryExecutionMaxTimeQueryString { get;} + string QueryExecutionMaxTimeQueryString { get; } /// The global number of cached queries successfully retrieved from cache - long QueryCacheHitCount { get;} + long QueryCacheHitCount { get; } /// The global number of cached queries *not* found in cache - long QueryCacheMissCount { get;} + long QueryCacheMissCount { get; } /// The global number of cacheable queries put in cache - long QueryCachePutCount { get;} + long QueryCachePutCount { get; } /// Get the global number of flush executed by sessions (either implicit or explicit) - long FlushCount { get;} + long FlushCount { get; } /// /// Get the global number of connections asked by the sessions /// (the actual number of connections used may be much smaller depending /// whether you use a connection pool or not) /// - long ConnectCount { get;} + long ConnectCount { get; } /// Global number of cacheable entities/collections successfully retrieved from the cache - long SecondLevelCacheHitCount { get;} + long SecondLevelCacheHitCount { get; } /// Global number of cacheable entities/collections not found in the cache and loaded from the database. - long SecondLevelCacheMissCount { get;} + long SecondLevelCacheMissCount { get; } /// Global number of cacheable entities/collections put in the cache - long SecondLevelCachePutCount { get;} + long SecondLevelCachePutCount { get; } /// Global number of sessions closed - long SessionCloseCount { get;} + long SessionCloseCount { get; } /// Global number of sessions opened - long SessionOpenCount { get;} + long SessionOpenCount { get; } /// Global number of collections loaded - long CollectionLoadCount { get;} + long CollectionLoadCount { get; } /// Global number of collections fetched - long CollectionFetchCount { get;} + long CollectionFetchCount { get; } /// Global number of collections updated - long CollectionUpdateCount { get;} + long CollectionUpdateCount { get; } /// Global number of collections removed - long CollectionRemoveCount { get;} + long CollectionRemoveCount { get; } /// Global number of collections recreated - long CollectionRecreateCount { get;} + long CollectionRecreateCount { get; } /// Start time - DateTime StartTime { get;} + DateTime StartTime { get; } /// Enable/Disable statistics logs (this is a dynamic parameter) - bool IsStatisticsEnabled { get;set;} + bool IsStatisticsEnabled { get; set; } /// All executed query strings - string[] Queries { get;} + string[] Queries { get; } /// The names of all entities - string[] EntityNames { get;} + string[] EntityNames { get; } /// The names of all collection roles - string[] CollectionRoleNames { get;} + string[] CollectionRoleNames { get; } /// Get all second-level cache region names - string[] SecondLevelCacheRegionNames { get;} + string[] SecondLevelCacheRegionNames { get; } /// The number of transactions we know to have been successful - long SuccessfulTransactionCount { get;} + long SuccessfulTransactionCount { get; } /// The number of transactions we know to have completed - long TransactionCount { get;} + long TransactionCount { get; } /// The number of prepared statements that were acquired - long PrepareStatementCount { get;} + long PrepareStatementCount { get; } /// The number of prepared statements that were released - long CloseStatementCount { get;} + long CloseStatementCount { get; } /// The number of StaleObjectStateExceptions that occurred - long OptimisticFailureCount { get;} + long OptimisticFailureCount { get; } /// Reset all statistics void Clear(); diff --git a/src/NHibernate/Stat/QueryStatistics.cs b/src/NHibernate/Stat/QueryStatistics.cs index e6335f13be1..5943747a66f 100644 --- a/src/NHibernate/Stat/QueryStatistics.cs +++ b/src/NHibernate/Stat/QueryStatistics.cs @@ -86,7 +86,6 @@ public override string ToString() .Append(",executionMaxTime=").Append(executionMaxTime) .Append(",executionMinTime=").Append(executionMinTime) .Append(']').ToString(); - } } } diff --git a/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs b/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs index 6052d02f0c2..aa747dd1302 100644 --- a/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs +++ b/src/NHibernate/Tool/hbm2ddl/DatabaseMetadata.cs @@ -27,7 +27,6 @@ public DatabaseMetadata(DbConnection connection, Dialect.Dialect dialect) { } - public DatabaseMetadata(DbConnection connection, Dialect.Dialect dialect, bool extras) { meta = dialect.GetDataBaseSchema(connection); @@ -73,7 +72,6 @@ public ITableMetadata GetTableMetadata(string name, string schema, string catalo metaInfo = meta.GetTables(catalog, schema, name, Types); } } - } DataRowCollection rows = metaInfo.Rows; diff --git a/src/NHibernate/Tool/hbm2ddl/IConnectionHelper.cs b/src/NHibernate/Tool/hbm2ddl/IConnectionHelper.cs index a6555525f84..b25081a09c0 100644 --- a/src/NHibernate/Tool/hbm2ddl/IConnectionHelper.cs +++ b/src/NHibernate/Tool/hbm2ddl/IConnectionHelper.cs @@ -15,12 +15,11 @@ public partial interface IConnectionHelper /// /// Get a reference to the connection we are using. /// - DbConnection Connection { get;} + DbConnection Connection { get; } /// /// Release any resources held by this helper. /// void Release(); } - } diff --git a/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs b/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs index a7af2bf813a..2fe8c652109 100644 --- a/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs +++ b/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs @@ -325,13 +325,11 @@ public void Execute(bool useStdOut, bool execute, bool justDrop) } } - public void Execute(Action scriptAction, bool execute, bool justDrop) { Execute(scriptAction, execute, justDrop, null); } - public void Execute(Action scriptAction, bool execute, bool justDrop, TextWriter exportOutput) { Initialize(); diff --git a/src/NHibernate/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs b/src/NHibernate/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs index 6814531f9e7..d463da73cbb 100644 --- a/src/NHibernate/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs +++ b/src/NHibernate/Tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.cs @@ -3,7 +3,6 @@ namespace NHibernate.Tool.hbm2ddl { - /// /// A implementation based on a provided /// . Essentially, ensures that the connection diff --git a/src/NHibernate/Transform/AliasToEntityMapResultTransformer.cs b/src/NHibernate/Transform/AliasToEntityMapResultTransformer.cs index 0497d292a51..e6a7c07baad 100644 --- a/src/NHibernate/Transform/AliasToEntityMapResultTransformer.cs +++ b/src/NHibernate/Transform/AliasToEntityMapResultTransformer.cs @@ -29,7 +29,6 @@ public override IList TransformList(IList collection) return collection; } - public override bool IsTransformedValueATupleElement(string[] aliases, int tupleLength) { return false; diff --git a/src/NHibernate/Transform/AliasedTupleSubsetResultTransformer.cs b/src/NHibernate/Transform/AliasedTupleSubsetResultTransformer.cs index e4e320546db..90fc3d6ad93 100644 --- a/src/NHibernate/Transform/AliasedTupleSubsetResultTransformer.cs +++ b/src/NHibernate/Transform/AliasedTupleSubsetResultTransformer.cs @@ -11,7 +11,6 @@ namespace NHibernate.Transform [Serializable] public abstract class AliasedTupleSubsetResultTransformer : ITupleSubsetResultTransformer { - public abstract bool IsTransformedValueATupleElement(string[] aliases, int tupleLength); public bool[] IncludeInTransform(string[] aliases, int tupleLength) diff --git a/src/NHibernate/Transform/CacheableResultTransformer.cs b/src/NHibernate/Transform/CacheableResultTransformer.cs index 1174f5d9478..97d64f459ff 100644 --- a/src/NHibernate/Transform/CacheableResultTransformer.cs +++ b/src/NHibernate/Transform/CacheableResultTransformer.cs @@ -245,7 +245,6 @@ public IList RetransformResults(IList transformedResults, return transformedResults; } - /// /// Untransforms, if necessary, a List of values previously /// transformed by this (or an equivalent) CacheableResultTransformer. @@ -283,13 +282,11 @@ public IList UntransformToTuples(IList results) results[i], _tupleSubsetLength == 1); results[i] = Unindex(tuple); } - } return results; } - /// /// Returns the result types for the transformed value. /// @@ -302,13 +299,11 @@ public IType[] GetCachedResultTypes(IType[] tupleResultTypes) : tupleResultTypes; } - public IList TransformList(IList list) { return list; } - /// /// "Compact" the given array by picking only the elements identified by /// the _includeInTransformIndex array. The picked elements are returned @@ -330,7 +325,6 @@ private T[] Index(T[] objects) return objectsIndexed; } - /// /// Expand the given array by putting each of its elements at the /// position identified by the _includeInTransformIndex array. The diff --git a/src/NHibernate/Transform/DistinctRootEntityResultTransformer.cs b/src/NHibernate/Transform/DistinctRootEntityResultTransformer.cs index a6d3e014c82..8336ddac073 100644 --- a/src/NHibernate/Transform/DistinctRootEntityResultTransformer.cs +++ b/src/NHibernate/Transform/DistinctRootEntityResultTransformer.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Runtime.CompilerServices; - namespace NHibernate.Transform { [Serializable] diff --git a/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs b/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs index 71f07d689df..a2a1f2c58cd 100644 --- a/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs +++ b/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs @@ -1,5 +1,4 @@ - -namespace NHibernate.Transform +namespace NHibernate.Transform { /// /// A ResultTransformer that operates on "well-defined" and consistent @@ -48,7 +47,6 @@ public interface ITupleSubsetResultTransformer : IResultTransformer /// false, otherwise. bool IsTransformedValueATupleElement(string[] aliases, int tupleLength); - /// /// Returns an array with the i-th element indicating whether the i-th /// element of the tuple is included in the transformed value. diff --git a/src/NHibernate/Transform/PassThroughResultTransformer.cs b/src/NHibernate/Transform/PassThroughResultTransformer.cs index 72454e2883a..0ed0be9e710 100644 --- a/src/NHibernate/Transform/PassThroughResultTransformer.cs +++ b/src/NHibernate/Transform/PassThroughResultTransformer.cs @@ -23,13 +23,11 @@ public IList TransformList(IList collection) #endregion - public bool IsTransformedValueATupleElement(string[] aliases, int tupleLength) { return tupleLength == 1; } - public bool[] IncludeInTransform(string[] aliases, int tupleLength) { bool[] includeInTransformedResult = new bool[tupleLength]; @@ -37,7 +35,6 @@ public bool[] IncludeInTransform(string[] aliases, int tupleLength) return includeInTransformedResult; } - internal IList UntransformToTuples(IList results, bool isSingleResult) { // untransform only if necessary; if transformed, do it in place; @@ -52,7 +49,6 @@ internal IList UntransformToTuples(IList results, bool isSingleResult) return results; } - internal object[] UntransformToTuple(object transformed, bool isSingleResult) { return isSingleResult ? new[] {transformed} : (object[]) transformed; diff --git a/src/NHibernate/Tuple/Component/AbstractComponentTuplizer.cs b/src/NHibernate/Tuple/Component/AbstractComponentTuplizer.cs index 8152da34511..2f8bd7c8d2b 100644 --- a/src/NHibernate/Tuple/Component/AbstractComponentTuplizer.cs +++ b/src/NHibernate/Tuple/Component/AbstractComponentTuplizer.cs @@ -121,6 +121,5 @@ public virtual bool IsInstance(object obj) protected internal abstract IInstantiator BuildInstantiator(Mapping.Component component); protected internal abstract IGetter BuildGetter(Mapping.Component component, Mapping.Property prop); protected internal abstract ISetter BuildSetter(Mapping.Component component, Mapping.Property prop); - } } diff --git a/src/NHibernate/Tuple/Component/IComponentTuplizer.cs b/src/NHibernate/Tuple/Component/IComponentTuplizer.cs index 8936c61fd93..eb6ac529956 100644 --- a/src/NHibernate/Tuple/Component/IComponentTuplizer.cs +++ b/src/NHibernate/Tuple/Component/IComponentTuplizer.cs @@ -27,6 +27,6 @@ public interface IComponentTuplizer : ITuplizer /// Does the component managed by this tuuplizer contain a parent property? /// True if the component does contain a parent property; false otherwise. - bool HasParentProperty { get;} + bool HasParentProperty { get; } } } diff --git a/src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs b/src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs index c7b93ca21a1..88fd793bc35 100644 --- a/src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs +++ b/src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs @@ -22,7 +22,6 @@ public class PocoComponentTuplizer : AbstractComponentTuplizer [NonSerialized] private bool isBytecodeProviderImpl; // 6.0 TODO: remove - [OnDeserialized] internal void OnDeserialized(StreamingContext context) { diff --git a/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs b/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs index d6af0c552e0..120db5ae19a 100644 --- a/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs +++ b/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs @@ -324,7 +324,7 @@ protected virtual void SetIdentifierPropertyValue(object entity, object value) } /// Return the entity-mode handled by this tuplizer instance. - public abstract EntityMode EntityMode { get;} + public abstract EntityMode EntityMode { get; } protected virtual IInstantiator Instantiator { get; set; } @@ -420,6 +420,5 @@ protected EntityMetamodel EntityMetamodel { get { return entityMetamodel; } } - } } diff --git a/src/NHibernate/Tuple/Entity/EntityMetamodel.cs b/src/NHibernate/Tuple/Entity/EntityMetamodel.cs index 172b2e83ac1..b12c49975c4 100644 --- a/src/NHibernate/Tuple/Entity/EntityMetamodel.cs +++ b/src/NHibernate/Tuple/Entity/EntityMetamodel.cs @@ -54,7 +54,6 @@ public class EntityMetamodel private readonly bool hasMutableProperties; private readonly bool hasLazyProperties; - private readonly int[] naturalIdPropertyNumbers; private bool lazy; @@ -83,7 +82,6 @@ public EntityMetamodel(PersistentClass persistentClass, ISessionFactoryImplement { this.sessionFactory = sessionFactory; - name = persistentClass.EntityName; rootName = persistentClass.RootClazz.EntityName; entityType = TypeFactory.ManyToOne(name); diff --git a/src/NHibernate/Tuple/Entity/IEntityTuplizer.cs b/src/NHibernate/Tuple/Entity/IEntityTuplizer.cs index 75ba17dbc0c..f3ee8e7e28a 100644 --- a/src/NHibernate/Tuple/Entity/IEntityTuplizer.cs +++ b/src/NHibernate/Tuple/Entity/IEntityTuplizer.cs @@ -108,7 +108,7 @@ public interface IEntityTuplizer : ITuplizer /// Does this entity, for this mode, present a possibility for proxying? /// True if this tuplizer can generate proxies for this entity. - bool HasProxy { get;} + bool HasProxy { get; } /// /// Generates an appropriate proxy representation of this entity for this entity-mode. diff --git a/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs b/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs index aaf9140290e..3913d678032 100644 --- a/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs +++ b/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs @@ -15,7 +15,6 @@ namespace NHibernate.Tuple.Entity { - /// An specific to the POCO entity mode. public class PocoEntityTuplizer : AbstractEntityTuplizer { diff --git a/src/NHibernate/Tuple/ITuplizer.cs b/src/NHibernate/Tuple/ITuplizer.cs index f337dff99e5..153ea7eaa26 100644 --- a/src/NHibernate/Tuple/ITuplizer.cs +++ b/src/NHibernate/Tuple/ITuplizer.cs @@ -43,7 +43,7 @@ public interface ITuplizer /// Need to determine how to best handle this for the Tuplizers for EntityModes /// other than POCO. /// - System.Type MappedClass { get;} + System.Type MappedClass { get; } /// /// Extract the current values contained on the given entity. @@ -76,4 +76,4 @@ public interface ITuplizer /// True if the object is considered as an instance of this entity within the given mode. bool IsInstance(object obj); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Tuple/IdentifierProperty.cs b/src/NHibernate/Tuple/IdentifierProperty.cs index 345ed50551f..b932e33b455 100644 --- a/src/NHibernate/Tuple/IdentifierProperty.cs +++ b/src/NHibernate/Tuple/IdentifierProperty.cs @@ -22,7 +22,6 @@ public class IdentifierProperty : Property private readonly bool identifierAssignedByInsert; private readonly bool hasIdentifierMapper; - /// /// Construct a non-virtual identifier property. /// @@ -99,4 +98,4 @@ public bool HasIdentifierMapper get { return hasIdentifierMapper; } } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Tuple/PocoInstantiator.cs b/src/NHibernate/Tuple/PocoInstantiator.cs index 94429acea44..6af0682e6c6 100644 --- a/src/NHibernate/Tuple/PocoInstantiator.cs +++ b/src/NHibernate/Tuple/PocoInstantiator.cs @@ -20,7 +20,7 @@ public class PocoInstantiator : IInstantiator, IDeserializationCallback [NonSerialized] private IInstantiationOptimizer optimizer; - private readonly IProxyFactory proxyFactory; // 6.0 TODO: remove + private readonly IProxyFactory proxyFactory; // 6.0 TODO: remove private readonly bool generateFieldInterceptionProxy; // 6.0 TODO: remove diff --git a/src/NHibernate/Type/AbstractEnumType.cs b/src/NHibernate/Type/AbstractEnumType.cs index 5454b680884..e37ab923d15 100644 --- a/src/NHibernate/Type/AbstractEnumType.cs +++ b/src/NHibernate/Type/AbstractEnumType.cs @@ -3,7 +3,6 @@ namespace NHibernate.Type { - /// /// Base class for enum types. /// diff --git a/src/NHibernate/Type/AnyType.cs b/src/NHibernate/Type/AnyType.cs index 9390c91d1fa..d32ac2ff2e3 100644 --- a/src/NHibernate/Type/AnyType.cs +++ b/src/NHibernate/Type/AnyType.cs @@ -412,6 +412,5 @@ public override bool[] ToColumnNullness(object value, IMapping mapping) ArrayHelper.Fill(result, true); return result; } - } } diff --git a/src/NHibernate/Type/ByteType.cs b/src/NHibernate/Type/ByteType.cs index 6c77d87325a..7c90bd6738a 100644 --- a/src/NHibernate/Type/ByteType.cs +++ b/src/NHibernate/Type/ByteType.cs @@ -45,8 +45,8 @@ public override void Set(DbCommand cmd, object value, int index, ISessionImpleme { var dp = cmd.Parameters[index]; dp.Value = dp.DbType == DbType.Int16 ? Convert.ToInt16(value) : Convert.ToByte(value); - } + public override string Name { get { return "Byte"; } diff --git a/src/NHibernate/Type/CollectionType.cs b/src/NHibernate/Type/CollectionType.cs index ba76596c512..4ac7c434d53 100644 --- a/src/NHibernate/Type/CollectionType.cs +++ b/src/NHibernate/Type/CollectionType.cs @@ -433,7 +433,6 @@ public override string ToString() return GetType().FullName + '(' + Role + ')'; } - #region Methods added in NH protected virtual void Clear(object collection) @@ -662,12 +661,12 @@ public virtual IEnumerable GetElementsIterator(object collection) public virtual bool HasHolder() { - return false;// entityMode == EntityMode.DOM4J; + return false; // entityMode == EntityMode.DOM4J; } protected internal virtual bool InitializeImmediately() { - return false;// entityMode == EntityMode.DOM4J; + return false; // entityMode == EntityMode.DOM4J; } public virtual object IndexOf(object collection, object element) diff --git a/src/NHibernate/Type/CompositeCustomType.cs b/src/NHibernate/Type/CompositeCustomType.cs index c3560016815..583f35abc5f 100644 --- a/src/NHibernate/Type/CompositeCustomType.cs +++ b/src/NHibernate/Type/CompositeCustomType.cs @@ -261,6 +261,5 @@ public override bool[] ToColumnNullness(object value, IMapping mapping) } return result; } - } } diff --git a/src/NHibernate/Type/EnumCharType.cs b/src/NHibernate/Type/EnumCharType.cs index 0fd8d3cf23c..ece3684ff6f 100644 --- a/src/NHibernate/Type/EnumCharType.cs +++ b/src/NHibernate/Type/EnumCharType.cs @@ -8,7 +8,6 @@ namespace NHibernate.Type [Serializable] public partial class EnumCharType : AbstractEnumType { - public EnumCharType() : base(new StringFixedLengthSqlType(1),typeof(T)) { } @@ -94,7 +93,6 @@ public virtual object GetValue(object instance) } } - public override void Set(DbCommand cmd, object value, int index, ISessionImplementor session) { var par = cmd.Parameters[index]; diff --git a/src/NHibernate/Type/GenericIdentifierBagType.cs b/src/NHibernate/Type/GenericIdentifierBagType.cs index 0d9938e4711..85888c268ed 100644 --- a/src/NHibernate/Type/GenericIdentifierBagType.cs +++ b/src/NHibernate/Type/GenericIdentifierBagType.cs @@ -75,7 +75,6 @@ public override object Instantiate(int anticipatedSize) return anticipatedSize <= 0 ? new List() : new List(anticipatedSize + 1); } - protected override void Clear(object collection) { ((IList)collection).Clear(); diff --git a/src/NHibernate/Type/GenericMapType.cs b/src/NHibernate/Type/GenericMapType.cs index d7cda3f36b3..b7c4114906c 100644 --- a/src/NHibernate/Type/GenericMapType.cs +++ b/src/NHibernate/Type/GenericMapType.cs @@ -46,7 +46,6 @@ public override System.Type ReturnedClass get { return typeof(IDictionary); } } - public override IEnumerable GetElementsIterator(object collection) { return ((IDictionary) collection).Values; diff --git a/src/NHibernate/Type/IAbstractComponentType.cs b/src/NHibernate/Type/IAbstractComponentType.cs index ee1721093c3..1c8f0f1138a 100644 --- a/src/NHibernate/Type/IAbstractComponentType.cs +++ b/src/NHibernate/Type/IAbstractComponentType.cs @@ -42,8 +42,8 @@ public partial interface IAbstractComponentType : IType FetchMode GetFetchMode(int i); - bool IsEmbedded { get;} + bool IsEmbedded { get; } bool IsMethodOf(MethodBase method); } -} \ No newline at end of file +} diff --git a/src/NHibernate/Type/ImmutableType.cs b/src/NHibernate/Type/ImmutableType.cs index 18f047a68de..a2f0d5bf5bf 100644 --- a/src/NHibernate/Type/ImmutableType.cs +++ b/src/NHibernate/Type/ImmutableType.cs @@ -43,6 +43,5 @@ public override object DeepCopy(object value, ISessionFactoryImplementor factory { return value; } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Type/ManyToOneType.cs b/src/NHibernate/Type/ManyToOneType.cs index 40782ddc5c9..b38fb35eba8 100644 --- a/src/NHibernate/Type/ManyToOneType.cs +++ b/src/NHibernate/Type/ManyToOneType.cs @@ -34,10 +34,8 @@ public ManyToOneType(string className, bool lazy) public ManyToOneType(string entityName, string uniqueKeyPropertyName, bool lazy, bool unwrapProxy, bool ignoreNotFound, bool isLogicalOneToOne) : this(entityName, uniqueKeyPropertyName, lazy, unwrapProxy, ignoreNotFound, isLogicalOneToOne, null) { - } - public ManyToOneType(string entityName, string uniqueKeyPropertyName, bool lazy, bool unwrapProxy, bool ignoreNotFound, bool isLogicalOneToOne, string propertyName) : base(entityName, uniqueKeyPropertyName, !lazy, unwrapProxy) { diff --git a/src/NHibernate/Type/MutableType.cs b/src/NHibernate/Type/MutableType.cs index 2322eb1dc81..862871f4cf7 100644 --- a/src/NHibernate/Type/MutableType.cs +++ b/src/NHibernate/Type/MutableType.cs @@ -47,6 +47,5 @@ public override object DeepCopy(object value, ISessionFactoryImplementor factory { return (value == null) ? null : DeepCopyNotNull(value); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Type/PersistentEnumType.cs b/src/NHibernate/Type/PersistentEnumType.cs index 9fca2648cc8..51c10a4313f 100644 --- a/src/NHibernate/Type/PersistentEnumType.cs +++ b/src/NHibernate/Type/PersistentEnumType.cs @@ -221,7 +221,6 @@ public virtual object GetValue(object code) return converter.ToEnumValue(code); } - public override void Set(DbCommand cmd, object value, int index, ISessionImplementor session) { cmd.Parameters[index].Value = value != null ? GetValue(value) : DBNull.Value; diff --git a/src/NHibernate/Type/PrimitiveType.cs b/src/NHibernate/Type/PrimitiveType.cs index 879d6b39715..7b452db3481 100644 --- a/src/NHibernate/Type/PrimitiveType.cs +++ b/src/NHibernate/Type/PrimitiveType.cs @@ -17,9 +17,9 @@ public abstract class PrimitiveType : ImmutableType, ILiteralType protected PrimitiveType(SqlType sqlType) : base(sqlType) {} - public abstract System.Type PrimitiveClass { get;} + public abstract System.Type PrimitiveClass { get; } - public abstract object DefaultValue { get;} + public abstract object DefaultValue { get; } #region ILiteralType Members diff --git a/src/NHibernate/Type/TypeFactory.cs b/src/NHibernate/Type/TypeFactory.cs index c75cc18f45f..271b85ff4ea 100644 --- a/src/NHibernate/Type/TypeFactory.cs +++ b/src/NHibernate/Type/TypeFactory.cs @@ -529,7 +529,6 @@ public static IType Basic(string name, IDictionary parameters) returnType = BuiltInType(typeName, length); } - else { // it is not in the basicNameMap and typeByTypeOfName @@ -977,7 +976,6 @@ public static CollectionType Array(string role, string propertyRef, System.Type return CollectionTypeFactory.Array(role, propertyRef, elementClass); } - public static CollectionType GenericBag(string role, string propertyRef, System.Type elementClass) { MethodInfo mi = BagDefinition.MakeGenericMethod(elementClass); diff --git a/src/NHibernate/Util/ADOExceptionReporter.cs b/src/NHibernate/Util/ADOExceptionReporter.cs index 3e2b787c6b2..61eca2c9caf 100644 --- a/src/NHibernate/Util/ADOExceptionReporter.cs +++ b/src/NHibernate/Util/ADOExceptionReporter.cs @@ -1,6 +1,5 @@ using System; - namespace NHibernate.Util { public class ADOExceptionReporter diff --git a/src/NHibernate/Util/ArrayHelper.cs b/src/NHibernate/Util/ArrayHelper.cs index 00da5847f46..52d24942bc9 100644 --- a/src/NHibernate/Util/ArrayHelper.cs +++ b/src/NHibernate/Util/ArrayHelper.cs @@ -97,7 +97,6 @@ public static string ToString(object[] array) return sb.ToString(); } - /// /// Append all elements in the 'from' list to the 'to' list. /// @@ -204,7 +203,6 @@ public static int ArrayGetHashCode(T[] array) return ArrayComparer.Default.GetHashCode(array); } - /// /// Append a value to an array. /// diff --git a/src/NHibernate/Util/CollectionPrinter.cs b/src/NHibernate/Util/CollectionPrinter.cs index 7e82d222a3f..b845d503062 100644 --- a/src/NHibernate/Util/CollectionPrinter.cs +++ b/src/NHibernate/Util/CollectionPrinter.cs @@ -92,6 +92,5 @@ public static string ToString(IEnumerable elements) result.Append("]"); return result.ToString(); } - } -} \ No newline at end of file +} diff --git a/src/NHibernate/Util/IdentityMap.cs b/src/NHibernate/Util/IdentityMap.cs index 3b6667a2ea3..b6fccd61446 100644 --- a/src/NHibernate/Util/IdentityMap.cs +++ b/src/NHibernate/Util/IdentityMap.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Runtime.Serialization; - namespace NHibernate.Util { /// @@ -204,7 +203,6 @@ public ICollection Values get { return map.Values; } } - /// /// /// @@ -276,4 +274,4 @@ public void OnDeserialization(object sender) ((IDeserializationCallback)map).OnDeserialization(sender); } } -} \ No newline at end of file +} diff --git a/src/NHibernate/Util/IdentitySet.cs b/src/NHibernate/Util/IdentitySet.cs index 8d32568746a..8f7843071ca 100644 --- a/src/NHibernate/Util/IdentitySet.cs +++ b/src/NHibernate/Util/IdentitySet.cs @@ -25,7 +25,6 @@ public IdentitySet(IEnumerable members) Add(member); } - #region Implementation of ICollection void ICollection.Add(object item) @@ -35,7 +34,6 @@ void ICollection.Add(object item) #endregion - public bool Add(object o) { object tempObject = map[o]; @@ -43,7 +41,6 @@ public bool Add(object o) return tempObject == null; } - public void Clear() { map.Clear(); @@ -86,7 +83,6 @@ public bool IsReadOnly get { return false; } } - #region Implementation of ISet public void UnionWith(IEnumerable other) @@ -154,6 +150,5 @@ public bool SetEquals(IEnumerable other) } #endregion - } } diff --git a/src/NHibernate/Util/JoinedEnumerable.cs b/src/NHibernate/Util/JoinedEnumerable.cs index 2fa049cc6ea..df7c268efed 100644 --- a/src/NHibernate/Util/JoinedEnumerable.cs +++ b/src/NHibernate/Util/JoinedEnumerable.cs @@ -34,7 +34,6 @@ public JoinedEnumerable(IEnumerable first, IEnumerable second) { } - #region System.Collections.IEnumerable Members /// @@ -46,8 +45,6 @@ public IEnumerator GetEnumerator() #endregion - - #region Nested class JoinedEnumerator private class JoinedEnumerator : IEnumerator, IDisposable @@ -61,7 +58,6 @@ public JoinedEnumerator(IEnumerable enumerators) _current = 0; } - #region System.Collections.IEnumerator Members public bool MoveNext() @@ -86,7 +82,6 @@ public bool MoveNext() return false; } - public void Reset() { foreach (var enumerator in _enumerators) @@ -94,7 +89,6 @@ public void Reset() _current = 0; } - public object Current { get { return _enumerators[_current].Current; } @@ -127,7 +121,6 @@ public void Dispose() Dispose(true); } - /// /// Takes care of freeing the managed and unmanaged resources that /// this class is responsible for. @@ -174,9 +167,6 @@ private void Dispose(bool isDisposing) #endregion } - - - public class JoinedEnumerable : IEnumerable { private readonly IEnumerable[] enumerables; diff --git a/src/NHibernate/Util/LRUMap.cs b/src/NHibernate/Util/LRUMap.cs index a0c5f947148..fb278c4769d 100644 --- a/src/NHibernate/Util/LRUMap.cs +++ b/src/NHibernate/Util/LRUMap.cs @@ -105,6 +105,5 @@ public int MaximumSize RemoveLRU(); } } - } } diff --git a/src/NHibernate/Util/LinkedHashMap.cs b/src/NHibernate/Util/LinkedHashMap.cs index 772a8819960..a1f96952e9a 100644 --- a/src/NHibernate/Util/LinkedHashMap.cs +++ b/src/NHibernate/Util/LinkedHashMap.cs @@ -691,6 +691,5 @@ object IEnumerator.Current #endregion } - } } diff --git a/src/NHibernate/Util/ObjectHelpers.cs b/src/NHibernate/Util/ObjectHelpers.cs index 79ccbe0cc1d..95c292f6c0e 100644 --- a/src/NHibernate/Util/ObjectHelpers.cs +++ b/src/NHibernate/Util/ObjectHelpers.cs @@ -1,4 +1,3 @@ - namespace NHibernate.Util { /// diff --git a/src/NHibernate/Util/SequencedHashMap.cs b/src/NHibernate/Util/SequencedHashMap.cs index 1f9a539c0ac..3ab0d612bb9 100644 --- a/src/NHibernate/Util/SequencedHashMap.cs +++ b/src/NHibernate/Util/SequencedHashMap.cs @@ -144,7 +144,6 @@ public override string ToString() #endregion } - /// /// Construct an empty sentinel used to hold the head (sentinel.next) and the tail (sentinal.prev) /// of the list. The sentinal has a key and value @@ -447,7 +446,6 @@ public virtual bool ContainsValue(object value) return false; } - private Entry First { get { return (IsEmpty) ? null : _sentinel.Next; } @@ -577,7 +575,6 @@ public bool Contains(object o) } } - private class ValuesCollection : ICollection { private SequencedHashMap _parent; @@ -629,7 +626,6 @@ public bool Contains(object o) } } - private enum ReturnType { /// @@ -648,7 +644,6 @@ private enum ReturnType ReturnEntry } - private class OrderedEnumerator : IDictionaryEnumerator { private SequencedHashMap _parent; @@ -675,7 +670,6 @@ public object Current throw new InvalidOperationException("Enumerator was modified"); } - switch (_returnType) { case ReturnType.ReturnKey: diff --git a/src/NHibernate/Util/StringHelper.cs b/src/NHibernate/Util/StringHelper.cs index 34fce731762..a07c13fdb87 100644 --- a/src/NHibernate/Util/StringHelper.cs +++ b/src/NHibernate/Util/StringHelper.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text; - namespace NHibernate.Util { /// @@ -529,7 +528,6 @@ public static bool IsNotEmpty(string str) return !IsEmpty(str); } - /// /// /// @@ -810,7 +808,6 @@ public static string[] ParseFilterParameterName(string filterParameterName) return new[] { filterName, parameterName }; } - /// /// Return the index of the next line separator, starting at startIndex. If will match /// the first CRLF or LF line separator. If there is no match, -1 will be returned. When @@ -833,7 +830,6 @@ public static int IndexOfAnyNewLine(this string str, int startIndex, out int new return matchStartIdx; } - /// /// Check if the given index points to a line separator in the string. Both CRLF and LF /// line separators are handled. When returning, newLineLength will be set to the number diff --git a/src/NHibernate/Util/StringTokenizer.cs b/src/NHibernate/Util/StringTokenizer.cs index 105e659bcf5..a53c6ab2d38 100644 --- a/src/NHibernate/Util/StringTokenizer.cs +++ b/src/NHibernate/Util/StringTokenizer.cs @@ -67,7 +67,6 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() #endregion - private class StringTokenizerEnumerator : IEnumerator { private StringTokenizer _stokenizer; @@ -149,4 +148,4 @@ private string GetNext() } } } -} \ No newline at end of file +}