CheckThat now contains Check.That!

drunkcod · Jul 11, 2020 · 7e8d8a2 · 7e8d8a2
1 parent 171b8d9
commit 7e8d8a2
Show file tree

Hide file tree

Showing 61 changed files with 138 additions and 111 deletions.
diff --git a/Source/Check.That/Check.cs b/Source/Check.That/Check.cs
@@ -4,10 +4,11 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using Cone;
 using Cone.Core;
 using Cone.Expectations;
 
-namespace Cone
+namespace CheckThat
 {
 	/*
 	 * This file contains more repitition than any sane man would normally agree with.
@@ -38,42 +39,19 @@ public static bool IncludeGuide
 		static bool ReferencesExtensionPoints(Assembly assembly) => 
 			assembly.GetReferencedAssemblies().Any(a => a.FullName == ExtensionsAssembly.FullName);
 
-		public static void Initialize() {
-			DoMakeFail = DefaultFail;
-			That(() => Expect != null);
-		}
+		internal static void Initialize() => That(() => Expect != null);
 
-		internal static Exception MakeFail(FailedExpectation fail, Exception innerException) => 
-			DoMakeFail(string.Empty, new [] { fail }, innerException);
-
-		internal delegate Exception NewFailedExpectationException(string context, FailedExpectation[] fails, Exception inner); 
-
-		static NewFailedExpectationException DoMakeFail = (context, fail, inner) =>
-			(DoMakeFail = LateBindFailureException())(context, fail, inner);
-
-		static NewFailedExpectationException LateBindFailureException() {
-			var nunit = Type.GetType("NUnit.Framework.AssertionException, NUnit.Framework");
-			if (nunit == null)
-				return DefaultFail;
-
-			var fails = Expression.Parameter(typeof (IEnumerable<FailedExpectation>), "fails");
-			var innerException = Expression.Parameter(typeof (Exception), "innerException");
-
-			return Expression.Lambda<NewFailedExpectationException>(
-				Expression.New(nunit.GetConstructor(new [] {typeof (string), typeof (Exception)}),
-					Expression.Call(typeof (Check).GetMethod("FormatFailMessage", BindingFlags.Static | BindingFlags.NonPublic), fails),
-					innerException),
-				fails, innerException).Compile();
-		}
+		internal static Exception MakeFail(FailedExpectation fail, Exception innerException) =>
+			new CheckFailed(string.Empty, fail, innerException);
 
-		static Exception DefaultFail(string context, FailedExpectation[] fail, Exception innerException) =>
-			new CheckFailed(context, fail, innerException);
+		internal static Exception MakeFail(FailedExpectation[] fails, Exception innerException) =>
+			new CheckFailed(string.Empty, fails, innerException);
 
 		public static object That(Expression<Func<bool>> expr) {
 			var result = CheckExpect(expr.Body, ExpressionEvaluatorParameters.Empty);
 			if (result.IsSuccess)
 				return result.Value;
-			throw DoMakeFail(string.Empty, new [] { result.Error }, null);
+			throw MakeFail(result.Error, null);
 		}
 
 		public static void That(Expression<Func<bool>> expr, params Expression<Func<bool>>[] extras) {
@@ -91,7 +69,7 @@ public static bool IncludeGuide
 		internal static Exception Eval(IEnumerable<Expression<Func<bool>>> exprs) {
 			var failed = GetFailed(exprs, x => CheckExpect(x.Body, ExpressionEvaluatorParameters.Empty));
 			return failed.Length > 0 
-			? DoMakeFail(string.Empty, failed, null) 
+			? MakeFail(failed, null) 
 			: null;
 		}
 
@@ -213,7 +191,7 @@ internal class CheckWith
 				CheckExpect(x.Body, ExpressionEvaluatorParameters.Create(x.Parameters, args));
 
 			Exception MakeFail(FailedExpectation[] failed) =>
-				DoMakeFail(formatContext(), failed, null);
+				new CheckFailed(formatContext(), failed, null);
 		}
 
 		public class CheckWith<T>
@@ -248,20 +226,9 @@ public static class Check<TException> where TException : Exception
 		}
 	}
 
-	class NotExpectedExpect : IExpect
+	//For those wanting to pre-warm their expectations.
+	public static class Batteries
 	{
-		readonly Expression expression;
-		readonly ConeMessage message;
-
-		public NotExpectedExpect(Expression expression, ConeMessage message) {
-			this.expression = expression;
-			this.message = message;
-		}
-
-		public CheckResult Check() => new CheckResult(false, Maybe<object>.None, Maybe<object>.None);
-
-		public string FormatExpression(IFormatter<Expression> formatter) => formatter.Format(expression);
-		public ConeMessage FormatMessage(IFormatter<object> formatter) => message;
+		public static void Included() => Check.Initialize();
 	}
-
 }
diff --git a/Source/Check.That/Maybe.cs → Source/Check.That/Core/Maybe.cs b/Source/Check.That/Maybe.cs → Source/Check.That/Core/Maybe.cs
diff --git a/...atform/Reflection/MemberInfoExtensions.cs → ...e/Check.That/Core/MemberInfoExtensions.cs b/...atform/Reflection/MemberInfoExtensions.cs → ...e/Check.That/Core/MemberInfoExtensions.cs
diff --git a/Source/Check.That/Expectations/ExpectFactory.cs b/Source/Check.That/Expectations/ExpectFactory.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using CheckThat;
 using Cone.Core;
 
 namespace Cone.Expectations

diff --git a/Source/Check.That/IExpect.cs → Source/Check.That/Expectations/IExpect.cs b/Source/Check.That/IExpect.cs → Source/Check.That/Expectations/IExpect.cs
diff --git a/Source/Check.That/Helpers/MethodSpy.cs b/Source/Check.That/Helpers/MethodSpy.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using static Cone.Check;
+using static CheckThat.Check;
 
 namespace Cone.Helpers
 {

diff --git a/Source/Check.That/NotExpectedExpect.cs b/Source/Check.That/NotExpectedExpect.cs
@@ -0,0 +1,22 @@
+using System.Linq.Expressions;
+using Cone.Core;
+using Cone.Expectations;
+
+namespace CheckThat
+{
+	class NotExpectedExpect : IExpect
+	{
+		readonly Expression expression;
+		readonly ConeMessage message;
+
+		public NotExpectedExpect(Expression expression, ConeMessage message) {
+			this.expression = expression;
+			this.message = message;
+		}
+
+		public CheckResult Check() => new CheckResult(false, Maybe<object>.None, Maybe<object>.None);
+
+		public string FormatExpression(IFormatter<Expression> formatter) => formatter.Format(expression);
+		public ConeMessage FormatMessage(IFormatter<object> formatter) => message;
+	}
+}
diff --git a/Source/Cone.TestAdapter/ConeTestAdapterProxy.cs b/Source/Cone.TestAdapter/ConeTestAdapterProxy.cs
@@ -7,6 +7,8 @@
 using Cone.Core;
 using Cone.Runners;
 using Newtonsoft.Json;
+using CheckThat;
+
 
 namespace Cone.TestAdapter
 {

diff --git a/Source/Cone/Assume.cs b/Source/Cone/Assume.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Linq;
 using System.Linq.Expressions;
+using CheckThat;
 using Cone.Expectations;
 
 namespace Cone

diff --git a/Source/Cone/ConePad.cs b/Source/Cone/ConePad.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using Cone.Core;
 using Cone.Runners;
+using CheckThat;
 
 namespace Cone
 {

diff --git a/Source/Cone/Core/ConeTestFailure.cs b/Source/Cone/Core/ConeTestFailure.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using Cone.Runners;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Source/Cone/Runners/SimpleConeRunner.cs b/Source/Cone/Runners/SimpleConeRunner.cs
@@ -41,7 +41,7 @@ public SimpleConeRunner(ITestNamer testNamer): this(testNamer, new DefaultFixtur
 		public int Workers = 1;
 
 		public void RunTests(ICollection<string> runList, TestSession results, IEnumerable<Assembly> assemblies) {
-			Check.Initialize();
+			CheckThat.Batteries.Included();
 			results.RunTests(CreateTestRun(
 				runList, 
 				BuildFlatSuites(assemblies.SelectMany(AssemblyMethods.GetExportedTypes))
@@ -75,7 +75,7 @@ public SimpleConeRunner(ITestNamer testNamer): this(testNamer, new DefaultFixtur
 			RunTests(results, assemblies.SelectMany(AssemblyMethods.GetExportedTypes));
 
 		public void RunTests(TestSession results, IEnumerable<Type> suiteTypes) {
-			Check.Initialize();
+			CheckThat.Batteries.Included();
 			var toRun = BuildFlatSuites(suiteTypes)
 				.Where(x => results.IncludeSuite(x))
 				.ToList();

diff --git a/Specs/Cone.Specs/BinaryExpectSpec.cs b/Specs/Cone.Specs/BinaryExpectSpec.cs
@@ -1,12 +1,13 @@
-using System;
+using System;
 using System.Linq.Expressions;
+using CheckThat;
 using Cone.Core;
 using Cone.Expectations;
 using Moq;
 
 namespace Cone
 {
-    [Describe(typeof(EqualExpect))]
+	[Describe(typeof(EqualExpect))]
     public class BinaryExpectSpec
     {
 		class WithOverloadedOperators<T>

diff --git a/Specs/Cone.Specs/BooleanExpectSpec.cs b/Specs/Cone.Specs/BooleanExpectSpec.cs
@@ -1,5 +1,6 @@
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 using Cone.Expectations;
+using CheckThat;
 
 namespace Cone
 {

diff --git a/Specs/Cone.Specs/CheckSpec.cs b/Specs/Cone.Specs/CheckSpec.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using CheckThat;
 
 namespace Cone
 {

diff --git a/Specs/Cone.Specs/CheckWithSpec.cs b/Specs/Cone.Specs/CheckWithSpec.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using CheckThat;
 
 namespace Cone
 {

diff --git a/Specs/Cone.Specs/ConeFixtureSetupSpec.cs b/Specs/Cone.Specs/ConeFixtureSetupSpec.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using System.Reflection;
+using CheckThat;
 using Cone.Core;
 using Moq;
 
+
 namespace Cone
 {
 	class ConeFixtureMethods : IConeFixtureMethodSink

diff --git a/Specs/Cone.Specs/ConeTestNamerSpec.cs b/Specs/Cone.Specs/ConeTestNamerSpec.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using System.Reflection;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Conesole/ConesoleConfigurationSpec.cs b/Specs/Cone.Specs/Conesole/ConesoleConfigurationSpec.cs
@@ -1,7 +1,7 @@
+using System;
+using CheckThat;
 using Cone.Stubs;
 using Cone.Worker;
-using System;
-using System.Configuration;
 
 namespace Cone.Conesole
 {

diff --git a/Specs/Cone.Specs/Core/CircularQueueSpec.cs b/Specs/Cone.Specs/Core/CircularQueueSpec.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/ConeAttributeProviderSpec.cs b/Specs/Cone.Specs/Core/ConeAttributeProviderSpec.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/ConeFixtureMethodCollectionSpec.cs b/Specs/Cone.Specs/Core/ConeFixtureMethodCollectionSpec.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq.Expressions;
-using System.Reflection;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/ConeFixtureSpec.cs b/Specs/Cone.Specs/Core/ConeFixtureSpec.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Cone.Runners;
+using CheckThat;
 using Moq;
 
 namespace Cone.Core

diff --git a/Specs/Cone.Specs/Core/ConeTestFailureSpec.cs b/Specs/Cone.Specs/Core/ConeTestFailureSpec.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Reflection;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/ConeTestNameSpec.cs b/Specs/Cone.Specs/Core/ConeTestNameSpec.cs
@@ -1,4 +1,5 @@
-
+using CheckThat;
+
 namespace Cone.Core
 {
 	[Describe(typeof(ConeTestName))]

diff --git a/Specs/Cone.Specs/Core/InvokableSpec.cs b/Specs/Cone.Specs/Core/InvokableSpec.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/MaybeSpec.cs b/Specs/Cone.Specs/Core/MaybeSpec.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/MethodExpectProviderLookupSpec.cs b/Specs/Cone.Specs/Core/MethodExpectProviderLookupSpec.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Cone.Expectations;
 using System.Linq.Expressions;
 using System.Reflection;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/MissingLinqSpec.cs b/Specs/Cone.Specs/Core/MissingLinqSpec.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using CheckThat;
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/Core/TestContextContextSpec.cs b/Specs/Cone.Specs/Core/TestContextContextSpec.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Linq;
+using CheckThat;
 using Moq;
 
 namespace Cone.Core
 {
-    [Describe(typeof(TestExecutionContext))]
+	[Describe(typeof(TestExecutionContext))]
     public class TestContextContextSpec
     {
         class Fixture {

diff --git a/Specs/Cone.Specs/Core/TypeFormatterSpec.cs b/Specs/Cone.Specs/Core/TypeFormatterSpec.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
+using CheckThat;
+
 
 namespace Cone.Core
 {

diff --git a/Specs/Cone.Specs/CustomMethodExpectFeature.cs b/Specs/Cone.Specs/CustomMethodExpectFeature.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using Cone.Core;
 using Cone.Expectations;
+using CheckThat;
 
 namespace Cone
 {