diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index d4b0604..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,16 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - -version: 2 -updates: - - package-ecosystem: "nuget" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - open-pull-requests-limit: 1 # Limit the number of open PRs - groups: - dotnet: # Optional: Groups all .NET updates into a single PR - patterns: - - "*" diff --git a/DnDGen.RollGen.Tests.Integration.IoC/DnDGen.RollGen.Tests.Integration.IoC.csproj b/DnDGen.RollGen.Tests.Integration.IoC/DnDGen.RollGen.Tests.Integration.IoC.csproj index 2c3a08d..ea01a17 100644 --- a/DnDGen.RollGen.Tests.Integration.IoC/DnDGen.RollGen.Tests.Integration.IoC.csproj +++ b/DnDGen.RollGen.Tests.Integration.IoC/DnDGen.RollGen.Tests.Integration.IoC.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/DnDGen.RollGen.Tests.Integration.IoC/Modules/CoreModuleTests.cs b/DnDGen.RollGen.Tests.Integration.IoC/Modules/CoreModuleTests.cs index 0d9acb7..d0c0679 100644 --- a/DnDGen.RollGen.Tests.Integration.IoC/Modules/CoreModuleTests.cs +++ b/DnDGen.RollGen.Tests.Integration.IoC/Modules/CoreModuleTests.cs @@ -31,7 +31,7 @@ public void RandomIsCreatedAsSingleton() [Test] public void CannotInjectPartialRoll() { - Assert.That(() => GetNewInstanceOf(), Throws.InstanceOf()); + Assert.That((Func)(() => GetNewInstanceOf()), Throws.InstanceOf()); } [Test] diff --git a/DnDGen.RollGen.Tests.Integration.Stress/DnDGen.RollGen.Tests.Integration.Stress.csproj b/DnDGen.RollGen.Tests.Integration.Stress/DnDGen.RollGen.Tests.Integration.Stress.csproj index a47cfd6..a32fdf4 100644 --- a/DnDGen.RollGen.Tests.Integration.Stress/DnDGen.RollGen.Tests.Integration.Stress.csproj +++ b/DnDGen.RollGen.Tests.Integration.Stress/DnDGen.RollGen.Tests.Integration.Stress.csproj @@ -4,11 +4,11 @@ false - + - - - + + + diff --git a/DnDGen.RollGen.Tests.Integration/DnDGen.RollGen.Tests.Integration.csproj b/DnDGen.RollGen.Tests.Integration/DnDGen.RollGen.Tests.Integration.csproj index d16480d..2acb856 100644 --- a/DnDGen.RollGen.Tests.Integration/DnDGen.RollGen.Tests.Integration.csproj +++ b/DnDGen.RollGen.Tests.Integration/DnDGen.RollGen.Tests.Integration.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/DnDGen.RollGen.Tests.Unit/DnDGen.RollGen.Tests.Unit.csproj b/DnDGen.RollGen.Tests.Unit/DnDGen.RollGen.Tests.Unit.csproj index 6f37a17..d3f20a2 100644 --- a/DnDGen.RollGen.Tests.Unit/DnDGen.RollGen.Tests.Unit.csproj +++ b/DnDGen.RollGen.Tests.Unit/DnDGen.RollGen.Tests.Unit.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/DnDGen.RollGen.Tests.Unit/Expressions/AlbatrossExpressionEvaluatorTests.cs b/DnDGen.RollGen.Tests.Unit/Expressions/AlbatrossExpressionEvaluatorTests.cs index 3b1aa69..d6effad 100644 --- a/DnDGen.RollGen.Tests.Unit/Expressions/AlbatrossExpressionEvaluatorTests.cs +++ b/DnDGen.RollGen.Tests.Unit/Expressions/AlbatrossExpressionEvaluatorTests.cs @@ -69,7 +69,7 @@ public void EvaluateDouble() [Test] public void IfDieRollIsInExpression_ThrowArgumentException() { - Assert.That(() => expressionEvaluator.Evaluate("expression with 3 d 4+2"), + Assert.That((Func)(() => expressionEvaluator.Evaluate("expression with 3 d 4+2")), Throws.ArgumentException.With.Message.EqualTo("Cannot evaluate unrolled die roll 3 d 4")); } @@ -107,7 +107,7 @@ public void EvaluateExpressionThrowsException_WhenAlbatrossFailsToEvaluate() var exception = new Exception("I failed"); mockExpression.Setup(t => t.Eval(null)).Throws(exception); - Assert.That(() => expressionEvaluator.Evaluate(expression), + Assert.That((Func)(() => expressionEvaluator.Evaluate(expression)), Throws.InvalidOperationException .With.Message.EqualTo($"Expression 'wrong expression' is invalid") .And.InnerException.EqualTo(exception)); diff --git a/DnDGen.RollGen.Tests.Unit/PartialRolls/DomainPartialRollTests.cs b/DnDGen.RollGen.Tests.Unit/PartialRolls/DomainPartialRollTests.cs index 4e5ec62..23001e9 100644 --- a/DnDGen.RollGen.Tests.Unit/PartialRolls/DomainPartialRollTests.cs +++ b/DnDGen.RollGen.Tests.Unit/PartialRolls/DomainPartialRollTests.cs @@ -760,7 +760,7 @@ public void ReturnAsIndividualRollsFromQuantityExpression_NoRoll_Int_MultipleRol var rolls = partialRoll.AsIndividualRolls(); Assert.That(rolls.Count(), Is.EqualTo(2)); - Assert.That(rolls, Is.EqualTo(new[] { 3, 2 })); + Assert.That(rolls, Is.EqualTo([3, 2])); } [Test] @@ -2651,7 +2651,7 @@ public void ReturnNumericKeepingWithNumericQuantity() var keptRolls = partialRoll.d(600).Keeping(42).AsIndividualRolls(); var expectedRolls = Enumerable.Range(66 - 41, 42); - Assert.That(keptRolls.Count, Is.EqualTo(42)); + Assert.That(keptRolls.Count(), Is.EqualTo(42)); Assert.That(keptRolls, Is.EquivalentTo(expectedRolls)); } @@ -2677,7 +2677,7 @@ public void ReturnKeepingExpressionWithNumericQuantity() var keptRolls = partialRoll.d(42).Keeping("4d3").AsIndividualRolls(); - Assert.That(keptRolls.Count, Is.EqualTo(1)); + Assert.That(keptRolls.Count(), Is.EqualTo(1)); Assert.That(keptRolls.Single(), Is.EqualTo(42 * 7)); } @@ -2723,7 +2723,7 @@ public void KeepThrowsException_IfInvalidRoll() BuildPartialRoll(1); partialRoll.d(1).Explode(); - Assert.That(() => partialRoll.AsSum(), + Assert.That((Func)(() => partialRoll.AsSum()), Throws.InstanceOf().With.Message.EqualTo("1d1e1 is not a valid roll\n\tExplode: Must have at least 1 non-exploded roll")); } @@ -2804,7 +2804,7 @@ public void ParantheticalExpression(string expression, int expectedSum) public void ParantheticalExpressionThrowsException_WhenParanthesesMismatched() { BuildPartialRoll("5*((1d2) + 1"); - Assert.That(() => partialRoll.AsSum(), + Assert.That((Func)(() => partialRoll.AsSum()), Throws.InvalidOperationException.With.Message.EqualTo($"No closing paranthesis found for expression '5*((1d2) + 1'")); } @@ -3124,7 +3124,7 @@ public void AsSum_ThrowsException_WhenQuantityIsDecimal() BuildPartialRoll(92.66); partialRoll.d2(); - Assert.That(() => partialRoll.AsSum(), + Assert.That((Func)(() => partialRoll.AsSum()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92.66d2")); } @@ -3134,7 +3134,7 @@ public void AsSum_ThrowsException_WhenDieIsDecimal() BuildPartialRoll(92); partialRoll.d("6.6"); - Assert.That(() => partialRoll.AsSum(), + Assert.That((Func)(() => partialRoll.AsSum()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92d6.6")); } @@ -3144,7 +3144,7 @@ public void AsIndividualRolls_ThrowsException_WhenQuantityIsDecimal() BuildPartialRoll(92.66); partialRoll.d2(); - Assert.That(() => partialRoll.AsIndividualRolls(), + Assert.That((Func)(() => partialRoll.AsIndividualRolls()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92.66d2")); } @@ -3154,7 +3154,7 @@ public void AsIndividualRolls_ThrowsException_WhenDieIsDecimal() BuildPartialRoll(92); partialRoll.d("6.6"); - Assert.That(() => partialRoll.AsIndividualRolls(), + Assert.That((Func)(() => partialRoll.AsIndividualRolls()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92d6.6")); } @@ -3164,7 +3164,7 @@ public void AsMinimum_ThrowsException_WhenQuantityIsDecimal() BuildPartialRoll(92.66); partialRoll.d2(); - Assert.That(() => partialRoll.AsPotentialMinimum(), + Assert.That((Func)(() => partialRoll.AsPotentialMinimum()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92.66d2")); } @@ -3174,7 +3174,7 @@ public void AsMinimum_ThrowsException_WhenDieIsDecimal() BuildPartialRoll(92); partialRoll.d("6.6"); - Assert.That(() => partialRoll.AsPotentialMinimum(), + Assert.That((Func)(() => partialRoll.AsPotentialMinimum()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92d6.6")); } @@ -3184,7 +3184,7 @@ public void AsMaximum_ThrowsException_WhenQuantityIsDecimal() BuildPartialRoll(92.66); partialRoll.d2(); - Assert.That(() => partialRoll.AsPotentialMaximum(), + Assert.That((Func)(() => partialRoll.AsPotentialMaximum()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92.66d2")); } @@ -3194,7 +3194,7 @@ public void AsMaximum_ThrowsException_WhenDieIsDecimal() BuildPartialRoll(92); partialRoll.d("6.6"); - Assert.That(() => partialRoll.AsPotentialMaximum(), + Assert.That((Func)(() => partialRoll.AsPotentialMaximum()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92d6.6")); } @@ -3204,7 +3204,7 @@ public void AsAverage_ThrowsException_WhenQuantityIsDecimal() BuildPartialRoll(92.66); partialRoll.d2(); - Assert.That(() => partialRoll.AsPotentialAverage(), + Assert.That((Func)(() => partialRoll.AsPotentialAverage()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92.66d2")); } @@ -3214,7 +3214,7 @@ public void AsAverage_ThrowsException_WhenDieIsDecimal() BuildPartialRoll(92); partialRoll.d("6.6"); - Assert.That(() => partialRoll.AsPotentialAverage(), + Assert.That((Func)(() => partialRoll.AsPotentialAverage()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92d6.6")); } @@ -3224,7 +3224,7 @@ public void AsTrueOrFalse_ThrowsException_WhenQuantityIsDecimal() BuildPartialRoll(92.66); partialRoll.d2(); - Assert.That(() => partialRoll.AsTrueOrFalse(), + Assert.That((Func)(() => partialRoll.AsTrueOrFalse()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92.66d2")); } @@ -3235,7 +3235,7 @@ public void AsTrueOrFalse_ThrowsException_WhenDieIsDecimal() partialRoll.d("6.6"); mockExpressionEvaluator.Setup(e => e.Evaluate("6.6")).Returns((string s) => 6.6); - Assert.That(() => partialRoll.AsTrueOrFalse(), + Assert.That((Func)(() => partialRoll.AsTrueOrFalse()), Throws.ArgumentException.With.Message.EqualTo("Cannot have decimal values for die rolls: 92d6.6")); } diff --git a/DnDGen.RollGen.Tests.Unit/PartialRolls/RollTests.cs b/DnDGen.RollGen.Tests.Unit/PartialRolls/RollTests.cs index c85d599..dd83273 100644 --- a/DnDGen.RollGen.Tests.Unit/PartialRolls/RollTests.cs +++ b/DnDGen.RollGen.Tests.Unit/PartialRolls/RollTests.cs @@ -368,7 +368,8 @@ public void IfGettingRollsAndRollIsNotValid_ThrowInvalidOperationException() roll.Quantity = 46341; roll.Die = 46342; - Assert.That(() => roll.GetRolls(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); + Assert.That((Func)(() => roll.GetRolls(mockRandom.Object)), + Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); } [Test] @@ -377,7 +378,8 @@ public void IfGettingSumAndRollIsNotValid_ThrowInvalidOperationException() roll.Quantity = 46341; roll.Die = 46342; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), + Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); } [Test] @@ -386,7 +388,8 @@ public void IfGettingAverageAndRollIsNotValid_ThrowInvalidOperationException() roll.Quantity = 46341; roll.Die = 46342; - Assert.That(() => roll.GetPotentialAverage(), Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); + Assert.That((Func)(() => roll.GetPotentialAverage()), + Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); } [Test] @@ -395,7 +398,8 @@ public void IfGettingTrueOrFalseAndRollIsNotValid_ThrowInvalidOperationException roll.Quantity = 46341; roll.Die = 46342; - Assert.That(() => roll.GetTrueOrFalse(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); + Assert.That((Func)(() => roll.GetTrueOrFalse(mockRandom.Object)), + Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); } [Test] @@ -404,7 +408,8 @@ public void IfGettingMinimumAndRollIsNotValid_ThrowInvalidOperationException() roll.Quantity = 46341; roll.Die = 46342; - Assert.That(() => roll.GetPotentialMinimum(), Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); + Assert.That((Func)(() => roll.GetPotentialMinimum()), + Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); } [Test] @@ -413,7 +418,8 @@ public void IfGettingMaximumAndRollIsNotValid_ThrowInvalidOperationException() roll.Quantity = 46341; roll.Die = 46342; - Assert.That(() => roll.GetPotentialMaximum(), Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); + Assert.That((Func)(() => roll.GetPotentialMaximum()), + Throws.InstanceOf().With.Message.EqualTo("46341d46342 is not a valid roll\n\tQuantity: 0 < 46341 < 10000\n\tDie: 0 < 46342 < 10000")); } [TestCase(-2)] @@ -428,7 +434,7 @@ public void IfQuantityNotValid_ThrowInvalidOperationException(int invalidQuantit var message = $"{invalidQuantity}d9266 is not a valid roll"; message += $"\n\tQuantity: 0 < {invalidQuantity} < {Limits.Quantity}"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [TestCase(-2)] @@ -443,7 +449,7 @@ public void IfDieNotValid_ThrowInvalidOperationException(int invalidDie) var message = $"9266d{invalidDie} is not a valid roll"; message += $"\n\tDie: 0 < {invalidDie} < {Limits.Die}"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [TestCase(-2)] @@ -458,7 +464,7 @@ public void IfKeepNotValid_ThrowInvalidOperationException(int invalidKeep) var message = $"9266d42k{invalidKeep} is not a valid roll"; message += $"\n\tKeep: 0 <= {invalidKeep} < {Limits.Quantity}"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [Test] @@ -470,7 +476,7 @@ public void IfExplodeNotValid_ThrowInvalidOperationException() var message = $"9266d1e1 is not a valid roll"; message += $"\n\tExplode: Must have at least 1 non-exploded roll"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [TestCase(-2)] @@ -485,7 +491,7 @@ public void IfTransformNotValid_ThrowInvalidOperationException(int transform) var message = $"9266d42t{transform}:42 is not a valid roll"; message += $"\n\tTransform: 0 < [{transform}:42] <= {Limits.Die}"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [TestCase(-2)] @@ -501,7 +507,7 @@ public void IfAnyTransformNotValid_ThrowInvalidOperationException(int transform) var message = $"9266d42t21:42t{transform}:42 is not a valid roll"; message += $"\n\tTransform: 0 < [21:42,{transform}:42] <= {Limits.Die}"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [Test] @@ -519,7 +525,7 @@ public void IfAllNotValid_ThrowInvalidOperationException() message += $"\n\tKeep: 0 <= -1 < {Limits.Quantity}"; message += $"\n\tExplode: Must have at least 1 non-exploded roll"; message += $"\n\tTransform: 0 < [{Limits.Die + 1}:0] <= {Limits.Die}"; - Assert.That(() => roll.GetSum(mockRandom.Object), Throws.InstanceOf().With.Message.EqualTo(message)); + Assert.That((Func)(() => roll.GetSum(mockRandom.Object)), Throws.InstanceOf().With.Message.EqualTo(message)); } [Test] diff --git a/DnDGen.RollGen/DnDGen.RollGen.csproj b/DnDGen.RollGen/DnDGen.RollGen.csproj index 8165263..fb2ac4e 100644 --- a/DnDGen.RollGen/DnDGen.RollGen.csproj +++ b/DnDGen.RollGen/DnDGen.RollGen.csproj @@ -1,6 +1,6 @@  - 16.0.6 + 16.0.7 net8.0 Karl M. Speer DnDGen