Enable implicit usings in test project (#266)

* use global usings
* cleanup usings

test/Directory.Build.props

@@ -23,10 +23,18 @@
 
     <IsPackable>false</IsPackable>
 
-    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>	
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
+
+    <ImplicitUsings>enable</ImplicitUsings>
 
   </PropertyGroup>
 
+  <ItemGroup>
+    <Using Include="Common.Logging" />
+    <Using Include="Common.Logging.ILog" Alias="ILog" />
+    <Using Include="Common.Logging.LogManager" Alias="LogManager" />
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugType>Full</DebugType>
     <DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>

test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using AopAlliance.Intercept;
 
 namespace Spring.Aop.Advice

test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System.Collections.Generic;
-
 using NUnit.Framework;
 
 using Spring.Aop.Framework;

test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Collections;
 using System.Globalization;
 using System.Reflection;

test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System;
-
 using AopAlliance.Intercept;
 using FakeItEasy;
 using NUnit.Framework;

test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Reflection;
 using System.Runtime.Remoting;
 using System.Web;

test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-using System.Threading;
 using AopAlliance.Aop;
 using NUnit.Framework;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreatorTests.cs

@@ -18,9 +18,7 @@
 
 #endregion
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using AopAlliance.Aop;
 using NUnit.Framework;
 using Spring.Objects.Factory.Config;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAutoProxyCreatorTests.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 using System.Runtime.Remoting.Proxies;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,7 @@
 
 #region Imports
 
-using System;
-using System.Collections.Generic;
 using System.Reflection;
-
-using Common.Logging;
-
 using NUnit.Framework;
 
 using Spring.Aop.Support;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 
 using Spring.Objects;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using Spring.Objects;
 using Spring.Objects.Factory;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/InfrastructureAdvisorAutoProxyCreator.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System;
-using System.Collections.Generic;
 using AopAlliance.Aop;
 using NUnit.Framework;
 using Spring.Objects.Factory.Config;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 using Spring.Aop.Support;
 using Spring.Objects.Factory;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Aop.Support;
 using Spring.Objects;

test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Objects;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #endregion
 
 #region Imports
-using System;
+
 using System.Reflection;
 
 #endregion

test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #endregion
 
 #region Imports
-using System;
+
 using System.Reflection;
 
 #endregion

test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 
 #endregion

test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 #endregion
 
 namespace Spring.Aop.Framework

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 using System.Collections;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs

@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-using System;
-using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.Threading;
 using System.Reflection;
 
 using AopAlliance.Aop;

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Collections;
 using System.Reflection;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 using Spring.Objects;
 using Spring.Aop.Support;

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Objects;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 using NUnit.Framework;
 using Spring.Aop.Interceptor;

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 using Spring.Objects;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 
 using Spring.Objects;

test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 #endregion
 
 namespace Spring.Aop.Framework.DynamicProxy

test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs

@@ -16,7 +16,7 @@
  */
 #endregion
 #region Imports
-using System;
+
 #endregion
 
 namespace Spring.Aop.Framework

test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs

@@ -16,7 +16,7 @@
  */
 #endregion
 #region Imports
-using System;
+
 using System.Collections;
 using System.Reflection;
 #endregion

test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Diagnostics;
 using NUnit.Framework;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs

@@ -18,13 +18,9 @@
 
 #endregion
 
-using System;
-using System.IO;
 using System.Collections;
 using System.Reflection;
 using System.Text;
-using System.Threading;
-
 using AopAlliance.Aop;
 using AopAlliance.Intercept;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Runtime.Serialization;
 using AopAlliance.Aop;
 using AopAlliance.Intercept;

test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 using System.Collections;
 

test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs

@@ -16,7 +16,6 @@
  */
 #endregion
 #region Imports
-using System;
 
 using AopAlliance.Aop;
 using AopAlliance.Intercept;

test/Spring/Spring.Aop.Tests/Aop/Framework/UnsupportedInterceptor.cs

@@ -1,4 +1,3 @@
-using System;
 using AopAlliance.Intercept;
 
 namespace Spring.Aop.Framework

test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 
 #endregion

test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs

@@ -17,7 +17,7 @@
 #endregion
 
 #region Imports
-using System;
+
 using System.Runtime.Serialization;
 #endregion
 

test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs

@@ -17,7 +17,6 @@
 #endregion
 
 #region Imports
-using System;
 
 using AopAlliance.Aop;
 using AopAlliance.Intercept;

test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs

@@ -17,7 +17,7 @@
 #endregion
 
 #region Imports
-using System;
+
 using System.Reflection;
 
 using Spring.Util;

test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using System.Reflection;
 
@@ -258,4 +257,4 @@ namespace Spring.Aop.Support
 
         #endregion
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using NUnit.Framework;
@@ -225,4 +224,4 @@ namespace Spring.Aop.Support
 
 		#endregion
 	}
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Support/DefaultIntroductionAdvisorTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using AopAlliance.Aop;
 using NUnit.Framework;
 
@@ -88,4 +87,4 @@ namespace Spring.Aop.Support
             advisor.ValidateInterfaces();
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs

@@ -16,7 +16,6 @@
  */
 #endregion
 
-using System;
 using NUnit.Framework;
 using AopAlliance.Aop;
 

test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 
 #endregion

test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs

@@ -19,9 +19,8 @@
 #endregion
 
 #region Imports
-using System;
+
 using System.Text.RegularExpressions;
-using Common.Logging;
 using Common.Logging.Simple;
 using NUnit.Framework;
 using Spring.Util;

test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs

@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Objects;
 
@@ -64,4 +63,4 @@ namespace Spring.Aop.Support
 			Assert.IsTrue(intersection.Matches(typeof (StackOverflowException)));
 		}
 	}
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 using Spring.Util;
 

test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Objects.Factory;
 using Spring.Objects.Factory.Xml;
@@ -119,4 +118,4 @@ namespace Spring.Aop.Target
 				"Ctor is not storing the supplied target.");
 		}
 	}
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs

@@ -18,9 +18,6 @@
 
 #endregion
 
-using System;
-
-using Common.Logging;
 using Common.Logging.Simple;
 
 using FakeItEasy;
@@ -134,4 +131,4 @@ namespace Spring.Aop.Target
             Assert.Throws<ArgumentNullException>(() => source.AfterPropertiesSet());
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 
 #endregion
@@ -77,4 +76,4 @@ namespace Spring.Aop.Target
 			Assert.IsFalse(lhs.Equals(null), "Equals() not correct for null instance comparison.");
 		}
 	}
-}
+}

test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs

@@ -13,11 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-using System;
+
 using System.Reflection;
-using System.Threading;
 using System.Collections;
-using Common.Logging;
 using NUnit.Framework;
 using Spring.Objects;
 using Spring.Objects.Factory;
@@ -226,4 +224,4 @@ namespace Spring.Aop.Target
 
         #endregion
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Reflection;
 using NUnit.Framework;
 using Spring.Util;

test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 using Spring.Util;
 

test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Util;
 
@@ -71,4 +70,4 @@ namespace Spring.Aop
 			Assert.AreEqual("TrueTypeFilter.True", TrueTypeFilter.True.ToString() );
 		}
 	}
-}
+}

test/Spring/Spring.Aop.Tests/AopSerializationTests.cs

@@ -18,9 +18,7 @@
 
 #endregion
 
-using System;
 using System.Collections;
-using System.IO;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;

test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using System.Collections.Specialized;
 using NUnit.Framework;
@@ -237,4 +236,4 @@ namespace Spring.Aspects.Cache
     }
 
     #endregion
-}
+}

test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Reflection;
 
 using FakeItEasy;
@@ -144,4 +143,4 @@ namespace Spring.Aspects.Cache
         {
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 #endregion
 
 using System.Collections;
-using System.IO;
 using System.Reflection;
 using System.Runtime.Serialization.Formatters.Binary;
 using AopAlliance.Intercept;

test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 
 #region Imports
 
-using System;
 using System.Collections;
-
-using Common.Logging;
 using Common.Logging.Simple;
 
 using NUnit.Framework;
@@ -495,4 +492,4 @@ namespace Spring.Aspects.Exceptions
                                  + StringUtils.CollectionToCommaDelimitedString(loggerFactoryAdapter.LoggerEvents));
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
 
 #endregion
 
-using System;
 using System.Reflection;
 
 using AopAlliance.Intercept;
-using Common.Logging;
-
 using FakeItEasy;
 
 using NUnit.Framework;
@@ -179,4 +176,4 @@ namespace Spring.Aspects.Logging
             return 4;
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs

@@ -19,7 +19,6 @@
 #endregion
 
 using AopAlliance.Intercept;
-using Common.Logging;
 
 namespace Spring.Aspects.Logging
 {
@@ -67,4 +66,4 @@ namespace Spring.Aspects.Logging
             return IsInterceptorEnabled(invocation, log);
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using NUnit.Framework;
 using Spring.Aop.Framework;
@@ -206,4 +205,4 @@ namespace Spring.Aspects
             throw new ArgumentException("bad argument");
         }
     }
-}
+}

test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Reflection;
 
 using FakeItEasy;
@@ -100,4 +99,4 @@ namespace Spring.Aspects.Validation
     }
 
     #endregion
-}
+}

test/Spring/Spring.Benchmark/Classes/Singleton.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Spring.Benchmark.Classes
+namespace Spring.Benchmark.Classes
 {
     public interface ISingleton1
     {

test/Spring/Spring.Benchmark/Classes/Transient.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Spring.Benchmark.Classes
+namespace Spring.Benchmark.Classes
 {
     public interface ITransient1
     {

test/Spring/Spring.Benchmark/HybridSetBenchmark.cs

@@ -16,7 +16,6 @@
 //  */
 #endregion
 
-using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using Spring.Collections;
 using Spring.Objects.Factory.Support;
@@ -83,4 +82,4 @@ namespace Spring.Benchmark
             }
         }
     }
-}
+}

test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 
 #endregion
 
-using System;
-using System.Threading;
-
 using FakeItEasy;
 
 using NUnit.Framework;

test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using NUnit.Framework;
 
 #endregion

test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using NUnit.Framework;
 

test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,9 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Globalization;
-using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 using NUnit.Framework;
 

test/Spring/Spring.Core.Tests/Collections/Generic/LinkedHashDictionaryTest.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 
 namespace Spring.Collections.Generic

test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-using System.Collections.Generic;
 using NUnit.Framework;
 //using NUnit.Framework.SyntaxHelpers;
 

test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs

@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-
 using NUnit.Framework;
 
 #endregion

test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 
 using NUnit.Framework;

test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections;
-using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 using NUnit.Framework;
 using Spring.Util;

test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 
 using NUnit.Framework;

test/Spring/Spring.Core.Tests/CommonTypes.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Collections;
 
 namespace Spring

test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Diagnostics;
 using System.Reflection;
 using NUnit.Framework;

test/Spring/Spring.Core.Tests/Context/ApplicationEventArgsTests.cs

@@ -1,4 +1,3 @@
-using System;
 using NUnit.Framework;
 
 namespace Spring.Context

test/Spring/Spring.Core.Tests/Context/Attributes/AbstractConfigurationClassPostProcessorTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using NUnit.Framework;
 using Spring.Context.Support;
 using Spring.Objects.Factory.Support;

test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyObjectDefinitionScannerTests.cs

@@ -18,9 +18,6 @@
 
 #endregion
 
-using System;
-using System.Collections.Generic;
-
 using NUnit.Framework;
 
 using Spring.Objects.Factory.Support;

test/Spring/Spring.Core.Tests/Context/Attributes/AssemblyTypeScannerTests.cs

@@ -18,10 +18,6 @@
 
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 using NUnit.Framework;
 using Spring.Core;
 using Spring.Util;

test/Spring/Spring.Core.Tests/Context/Attributes/ImportResourceAttributeTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using NUnit.Framework;
 using Spring.Objects.Factory.Xml;
 using Spring.Objects.Factory.Support;

test/Spring/Spring.Core.Tests/Context/Attributes/SimpleScanTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2010-2011 the original author or authors.
+ * Copyright <EFBFBD> 2010-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,7 @@
 
 #endregion
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using NUnit.Framework;
 
 using Spring.Context.Support;

test/Spring/Spring.Core.Tests/Context/CommonTypes.cs

@@ -18,9 +18,8 @@
 
 #endregion
 
-#region Imports 
+#region Imports
 
-using System;
 using NUnit.Framework;
 using Spring.Context.Support;
 using Spring.Core.IO;

test/Spring/Spring.Core.Tests/Context/Config/AttributeConfigObjectDefinitionParserTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System.Linq;
 using NUnit.Framework;
 using Spring.Context.Attributes;
 using Spring.Context.Support;

test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System.Linq;
 using NUnit.Framework;
 using Spring.Context.Attributes;
 using Spring.Context.Support;

test/Spring/Spring.Core.Tests/Context/Config/ComponentScanObjectDefinitionParserTypeFilterTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using NUnit.Framework;
 using Spring.Context.Attributes;
 using Spring.Context.Attributes.TypeFilters;

test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using NUnit.Framework;
 
 namespace Spring.Context

test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System;
-
 using FakeItEasy;
 
 using NUnit.Framework;

test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Security.Policy;
 using NUnit.Framework;
 

test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using NUnit.Framework;
 using Spring.Core.IO;

test/Spring/Spring.Core.Tests/Context/Support/CodeConfigApplicationContextTests.cs

@@ -18,9 +18,6 @@
 
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using Spring.Context.Attributes;
 

test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 #region Imports
 
 using System.Configuration;
-using System.IO;
 using System.Xml;
 using NUnit.Framework;
 
 using Spring.Objects.Factory;
 using Spring.Util;
+using ConfigurationException = System.Configuration.ConfigurationException;
 
 #endregion
 
@@ -201,4 +201,4 @@ namespace Spring.Context.Support
             Assert.IsFalse(grandchildCtx.ContainsObjectDefinition("Parent"), "Wrong (parent context) object present in Grandchild context.");
         }
 	}
-}
+}

test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Configuration;
 using System.Reflection;
 using System.Xml;
@@ -31,6 +30,7 @@ using Spring.Objects;
 using Spring.Proxy;
 using Spring.Objects.Factory.Support;
 using Spring.Util;
+using ConfigurationException = System.Configuration.ConfigurationException;
 
 #endregion
 

test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs

@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.Globalization;
 
 using FakeItEasy;

test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs

@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2011 the original author or authors.
+ * Copyright <EFBFBD> 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 #region Imports
 
-using System;
 using System.Configuration;
 using System.Xml;
 using NUnit.Framework;

test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs

@@ -18,8 +18,6 @@
 
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
 using System.Resources;