Skip to content

Commit

Permalink
Renamed WhenTrue() and WhenFalse() overloads that return collections …
Browse files Browse the repository at this point in the history 
…to avoid incorrect method resolution. Added -Yield suffix.

Removed redundant signatures as part of this.
  • Loading branch information
@karlssberg
karlssberg committed May 4, 2024
1 parent 0bf5737 commit f2630a7
Show file tree
Hide file tree
Showing 24 changed files with 122 additions and 274 deletions.
24 changes: 12 additions & 12 deletions Motiv.Tests/AsAllSatisfiedSpecTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ public class AsAllSatisfiedSpecTests
var spec = Spec
.Build(underlyingSpec)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("all are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -164,8 +164,8 @@ public void
var spec = Spec
.Build(underlyingSpec)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("all are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -233,8 +233,8 @@ is true
var spec = Spec
.Build(underlyingSpec)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("all are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -338,8 +338,8 @@ is true
var sut = Spec
.Build(left & right)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("all are true");

var result = sut.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -382,8 +382,8 @@ is true
var sut = Spec
.Build(underlyingSpecLeft & underlyingSpecRight)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("all are true");

var result = sut.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -426,8 +426,8 @@ is true
var sut = Spec
.Build(underlyingSpecLeft & underlyingSpecRight)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("all are true");

var result = sut.IsSatisfiedBy([first, second, third]);
Expand Down
24 changes: 12 additions & 12 deletions Motiv.Tests/AsNoneSatisfiedSpecTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ public class AsNoneSatisfiedSpecTests
var spec =
Spec.Build(underlyingSpec)
.AsNoneSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("none are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -164,8 +164,8 @@ public void
var spec = Spec
.Build(underlyingSpec)
.AsNoneSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("none are true");


Expand Down Expand Up @@ -234,8 +234,8 @@ is true
var spec = Spec
.Build(underlyingSpec)
.AsNoneSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("none are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -339,8 +339,8 @@ is true
var spec = Spec
.Build(underlyingSpecLeft & underlyingSpecRight)
.AsNoneSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("none are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -383,8 +383,8 @@ is true
var spec =
Spec.Build(underlyingSpecLeft & underlyingSpecRight)
.AsNoneSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("none are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down Expand Up @@ -427,8 +427,8 @@ is true
var spec =
Spec.Build(underlyingSpecLeft & underlyingSpecRight)
.AsNoneSatisfied()
.WhenTrue(evaluation => evaluation.Metadata)
.WhenFalse(evaluation => evaluation.Metadata)
.WhenTrueYield(evaluation => evaluation.Metadata)
.WhenFalseYield(evaluation => evaluation.Metadata)
.Create("none are true");

var result = spec.IsSatisfiedBy([first, second, third]);
Expand Down
12 changes: 6 additions & 6 deletions Motiv.Tests/BooleanResultPredicateExplanationPropositionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public class BooleanResultPredicateExplanationPropositionTests
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => "true assertion")
.WhenFalse((_, _) => ["false assertion"])
.WhenFalseYield((_, _) => ["false assertion"])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -382,26 +382,26 @@ public class BooleanResultPredicateExplanationPropositionTests

var withFalseAsScalar =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => ["true assertion"])
.WhenTrueYield((_, _) => ["true assertion"])
.WhenFalse("false assertion")
.Create("propositional statement");

var withFalseAsParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => ["true assertion"])
.WhenTrueYield((_, _) => ["true assertion"])
.WhenFalse(_ => "false assertion")
.Create("propositional statement");

var withFalseAsTwoParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => ["true assertion"])
.WhenTrueYield((_, _) => ["true assertion"])
.WhenFalse((_, _) => "false assertion")
.Create("propositional statement");

var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => ["true assertion"])
.WhenFalse((_, _) => ["false assertion"])
.WhenTrueYield((_, _) => ["true assertion"])
.WhenFalseYield((_, _) => ["false assertion"])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down
48 changes: 24 additions & 24 deletions Motiv.Tests/BooleanResultPredicateMetadataPropositionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue(Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -199,7 +199,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue(_ => Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -251,7 +251,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -284,26 +284,26 @@ public enum Metadata

var withFalseAsScalar =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse(Metadata.False)
.Create("propositional statement");

var withFalseAsParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse(_ => Metadata.False)
.Create("propositional statement");

var withFalseAsTwoParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse((_, _) => Metadata.False)
.Create("propositional statement");

var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenFalse((_, _) => [Metadata.False])
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -353,7 +353,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue(Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -403,7 +403,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue(Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -453,7 +453,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue(_ => Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -503,7 +503,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue(_ => Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -553,7 +553,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -603,7 +603,7 @@ public enum Metadata
var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True)
.WhenFalse((_, _) => [Metadata.False])
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -634,26 +634,26 @@ public enum Metadata

var withFalseAsScalar =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse(Metadata.False)
.Create("propositional statement");

var withFalseAsParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse(_ => Metadata.False)
.Create("propositional statement");

var withFalseAsTwoParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse((_, _) => Metadata.False)
.Create("propositional statement");

var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenFalse((_, _) => [Metadata.False])
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down Expand Up @@ -684,26 +684,26 @@ public enum Metadata

var withFalseAsScalar =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse(Metadata.False)
.Create("propositional statement");

var withFalseAsParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse(_ => Metadata.False)
.Create("propositional statement");

var withFalseAsTwoParameterCallback =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalse((_, _) => Metadata.False)
.Create("propositional statement");

var withFalseAsTwoParameterCallbackThatReturnsACollection =
Spec.Build((bool b) => underlying.IsSatisfiedBy(b))
.WhenTrue((_, _) => Metadata.True.ToEnumerable())
.WhenFalse((_, _) => [Metadata.False])
.WhenTrueYield((_, _) => Metadata.True.ToEnumerable())
.WhenFalseYield((_, _) => [Metadata.False])
.Create("propositional statement");

var spec = withFalseAsScalar &
Expand Down
8 changes: 4 additions & 4 deletions Motiv.Tests/ChangeModelTypeSpecTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ public void Should_identify_non_letters(string model, params string[] expected)
var isAllLetters = Spec
.Build(isLetter)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Assertions)
.WhenFalse(evaluation => evaluation.Assertions)
.WhenTrueYield(evaluation => evaluation.Assertions)
.WhenFalseYield(evaluation => evaluation.Assertions)
.Create("has all letters")
.ChangeModelTo<string>(m => m.ToCharArray());

Expand All @@ -124,8 +124,8 @@ public void Should_delegate_toString_method_to_underlying_spec()
var isAllLettersAsCharArray = Spec
.Build(isLetter)
.AsAllSatisfied()
.WhenTrue(evaluation => evaluation.Assertions)
.WhenFalse(evaluation => evaluation.Assertions)
.WhenTrueYield(evaluation => evaluation.Assertions)
.WhenFalseYield(evaluation => evaluation.Assertions)
.Create("has all letters");

var isAllLetters = isAllLettersAsCharArray
Expand Down
Loading

0 comments on commit f2630a7

Please sign in to comment.