Merge branch 'master' into GH948New

Author: fredericDelaporte

src/NHibernate.DomainModel/Foo.cs

@@ -322,7 +322,7 @@ public FooComponent Component
 		public FooComponent NullComponent
 		{
 			get { return null; }
-			set { if (value != null) throw new Exception("Null component"); }
+			set { if (value != null) throw new ArgumentException("Null component"); }
 		}
 
 		#endregion
@@ -432,4 +432,4 @@ public bool EqualsFoo(Foo other)
 
 		private static int count = 0;
 	}
-}
+}

src/NHibernate.DomainModel/FooComponent.cs

@@ -110,7 +110,7 @@ private String NullString
 			set
 			{
 				if (value != null)
-					throw new Exception("null component property");
+					throw new ArgumentException("null component property");
 			}
 		}
 
@@ -179,4 +179,4 @@ public override string ToString()
 
 		#endregion
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH2583/Domain.cs

@@ -78,7 +78,7 @@ public partial class MyBO
                     set(await (bo.GetOrCreateBO1Async(s, cancellationToken)), 1);
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -114,7 +114,7 @@ public partial class MyBO
                     set(await (bo.GetOrCreateBO2Async(s, cancellationToken)), 1);
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -153,7 +153,7 @@ public partial class MyBO
                     set(await ((await (bo.GetOrCreateBO1Async(s, cancellationToken))).GetOrCreateBO2Async(s, cancellationToken)), 1);
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -187,7 +187,7 @@ public partial class MyBO
                     (await ((await (bo.GetOrCreateBO1Async(s, cancellationToken))).GetOrCreateBO3Async(s, cancellationToken))).L1 = 1;
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
     }

src/NHibernate.Test/Async/QueryTest/DetachedQueryFixture.cs

@@ -260,7 +260,7 @@ public Dictionary<string, TypedValue> NamedListParams
 
 			public override IQuery GetExecutableQuery(ISession session)
 			{
-				throw new Exception("The method or operation is not implemented.");
+				throw new NotImplementedException("The method or operation is not implemented.");
 			}
 
 			public new void CopyTo(IDetachedQuery destination)

src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs

@@ -47,7 +47,7 @@ public void SimpleCriterion_NoAlias()
 		public static int CompareString(string left, string right, bool textCompare)
 		{
 			// could consider calling Microsoft.VisualBasic.CompilerServices.Operators.CompareString
-			throw new Exception("This is just here to allow us to simulate the VB.Net LINQ expression tree");
+			throw new InvalidOperationException("This is just here to allow us to simulate the VB.Net LINQ expression tree");
 		}
 
 		[Test]

src/NHibernate.Test/DynamicProxyTests/PeVerifier.cs

@@ -26,7 +26,7 @@ public PeVerifier(string assemblyFileName)
 			while (!Directory.Exists(Path.Combine(dir, "Tools", "PEVerify")))
 			{
 				if (Directory.GetParent(dir) == null)
-					throw new Exception(string.Format("Could not find Tools/PEVerify directory in ancestor of {0}", _assemlyLocation));
+					throw new DirectoryNotFoundException(string.Format("Could not find Tools/PEVerify directory in ancestor of {0}", _assemlyLocation));
 
 				dir = Directory.GetParent(dir).FullName;
 			}
@@ -38,7 +38,7 @@ public PeVerifier(string assemblyFileName)
 			_peVerifyPath = Path.Combine(dir, "Tools", "PEVerify", versionFolder, "PEVerify.exe");
 
 			if (!File.Exists(_peVerifyPath))
-				throw new Exception(string.Format("Could not find PEVerify.exe at {0}", _peVerifyPath));
+				throw new FileNotFoundException(string.Format("Could not find PEVerify.exe at {0}", _peVerifyPath));
 		}
 
 		public void AssertIsValid()

src/NHibernate.Test/LogSpy.cs

@@ -19,7 +19,7 @@ public LogSpy(ILog log, Level level)
 			logger = log.Logger as Logger;
 			if (logger == null)
 			{
-				throw new Exception("Unable to get the logger");
+				throw new InvalidOperationException("Unable to get the logger");
 			}
 
 			// Change the log level to DEBUG and temporarily save the previous log level

src/NHibernate.Test/NHSpecificTest/NH2583/Domain.cs

@@ -153,7 +153,7 @@ public static void SetK1(MyBO bo, ISession s, TK value)
                     bo.K1 = 1;
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -184,7 +184,7 @@ private static void SetBO1_I(MyBO bo, ISession s, TBO1_I value, Action<MyRef1, i
                     set(bo.GetOrCreateBO1(s), 1);
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -220,7 +220,7 @@ private static void SetBO2_J(MyBO bo, ISession s, TBO2_J value, Action<MyRef2, i
                     set(bo.GetOrCreateBO2(s), 1);
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -259,7 +259,7 @@ private static void SetBO1_BO2_J(MyBO bo, ISession s, TBO1_BO2_J value, Action<M
                     set(bo.GetOrCreateBO1(s).GetOrCreateBO2(s), 1);
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
 
@@ -293,7 +293,7 @@ public static void SetBO1_BO3_L1(MyBO bo, ISession s, TBO1_BO3_L value)
                     bo.GetOrCreateBO1(s).GetOrCreateBO3(s).L1 = 1;
                     break;
                 default:
-                    throw new Exception("Value " + value + " not handled in code");
+                    throw new NotImplementedException("Value " + value + " not handled in code");
             }
         }
     }

src/NHibernate.Test/QueryTest/DetachedQueryFixture.cs

@@ -544,7 +544,7 @@ public Dictionary<string, TypedValue> NamedListParams
 
 			public override IQuery GetExecutableQuery(ISession session)
 			{
-				throw new Exception("The method or operation is not implemented.");
+				throw new NotImplementedException("The method or operation is not implemented.");
 			}
 
 			public new void CopyTo(IDetachedQuery destination)

src/NHibernate/Criterion/Projections.cs

@@ -494,7 +494,7 @@ public static AggregateProjection Sum(Expression<Func<object>> expression)
 		/// </summary>
 		public static string Concat(params string[] strings)
 		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
+			throw QueryOver.GetDirectUsageException();
 		}
 
 		internal static IProjection ProcessConcat(MethodCallExpression methodCallExpression)