Merge branch 'develop' into feature/core-refactoring

src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests/DoubleMaxAttributeTests.cs

@@ -0,0 +1,54 @@
+using NUnit.Framework;
+using Simplify.Web.Model.Validation.Attributes;
+using System;
+
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MaxAttributeTests;
+
+[TestFixture]
+public class DoubleMaxAttributeTests : AttributesTestBase
+{
+	public const double MaxValue = 12d;
+
+	[OneTimeSetUp]
+	public void SetupAttribute() => Attr = new MaxAttribute(MaxValue);
+
+	[Test]
+	public void Validate_BelowMaxValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(10d);
+	}
+
+	[Test]
+	public void Validate_MaxValueEqualsValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(12d);
+	}
+
+	[Test]
+	public void Validate_AboveMaxValue_ExceptionThrown()
+	{
+		// Assign
+
+		var value = 15d;
+		var defaultMessage = $"Property '{nameof(TestEntityWithProperty.Prop1)}' required maximum value is {MaxValue}, actual value: {value}";
+
+		// Act & Assert
+		TestAttribute(value, defaultMessage);
+	}
+
+	[Test]
+	public void Validate_NullValue_NoExceptions()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(null);
+	}
+
+	[Test]
+	public void Validate_DifferentTypes_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue((long)15.2));
+	}
+}

src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests.cs → src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests/IntegerMaxAttributeTests.cs

@@ -1,11 +1,10 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using Simplify.Web.Model.Validation.Attributes;
+using System;
 
-namespace Simplify.Web.Tests.Model.Validation.Attributes;
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MaxAttributeTests;
 
-[TestFixture]
-public class MaxAttributeTests : AttributesTestBase
+public class IntegerMaxAttributeTests : AttributesTestBase
 {
 	public const int MaxValue = 12;
 
@@ -42,10 +41,5 @@ public void Validate_NullValue_NoExceptions() =>
 	[Test]
 	public void Validate_DifferentTypes_ExceptionThrown() =>
 		// Act & Assert
-		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(15.2));
-
-	[Test]
-	public void Validate_ValueTypeNotInheritIComparable_ExceptionThrown() =>
-		// Act & Assert
-		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(new object()));
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue((long)15.2));
 }

src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests/LongMaxAttributeTests.cs

@@ -0,0 +1,53 @@
+using NUnit.Framework;
+using Simplify.Web.Model.Validation.Attributes;
+using System;
+
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MaxAttributeTests;
+
+public class LongMaxAttributeTests : AttributesTestBase
+{
+	public const long MaxValue = 12;
+
+	[OneTimeSetUp]
+	public void SetupAttribute() => Attr = new MaxAttribute(MaxValue);
+
+	[Test]
+	public void Validate_BelowMaxValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue((long)10);
+	}
+
+	[Test]
+	public void Validate_MaxValueEqualsValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue((long)12);
+	}
+
+	[Test]
+	public void Validate_AboveMaxValue_ExceptionThrown()
+	{
+		// Assign
+
+		var value = (long)15;
+		var defaultMessage = $"Property '{nameof(TestEntityWithProperty.Prop1)}' required maximum value is {MaxValue}, actual value: {value}";
+
+		// Act & Assert
+		TestAttribute(value, defaultMessage);
+	}
+
+	[Test]
+	public void Validate_NullValue_NoExceptions()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(null);
+	}
+
+	[Test]
+	public void Validate_DifferentTypes_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(15.2d));
+	}
+}

src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests/MaxAttributeTestViewModel.cs

@@ -0,0 +1,18 @@
+using Simplify.Web.Model.Validation.Attributes;
+
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MaxAttributeTests;
+
+public class MaxAttributeTestViewModel
+{
+	[Max(1)]
+	public int IntParam { get; set; }
+
+	[Max((long)1)]
+	public long LongParam { get; set; }
+
+	[Max(1d)]
+	public double DoubleParam { get; set; }
+
+	[Max(typeof(decimal), "12.5")]
+	public decimal DecimalParam { get; set; }
+}

src/Simplify.Web.Tests/Model/Validation/Attributes/MaxAttributeTests/TypeMaxAttributeTests.cs

@@ -0,0 +1,60 @@
+using NUnit.Framework;
+using Simplify.Web.Model.Validation.Attributes;
+using System;
+
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MaxAttributeTests;
+
+public class TypeMaxAttributeTests : AttributesTestBase
+{
+	public const string MaxValue = "12.5";
+
+	[OneTimeSetUp]
+	public void SetupAttribute() => Attr = new MaxAttribute(typeof(decimal), MaxValue);
+
+	[Test]
+	public void Validate_BelowMaxValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue((decimal)10);
+	}
+
+	[Test]
+	public void Validate_MaxValueEqualsValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue((decimal)12.5);
+	}
+
+	[Test]
+	public void Validate_AboveMaxValue_ExceptionThrown()
+	{
+		// Assign
+
+		var value = (decimal)15;
+		var defaultMessage = $"Property '{nameof(TestEntityWithProperty.Prop1)}' required maximum value is {MaxValue}, actual value: {value}";
+
+		// Act & Assert
+		TestAttribute(value, defaultMessage);
+	}
+
+	[Test]
+	public void Validate_NullValue_NoExceptions()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(null);
+	}
+
+	[Test]
+	public void Validate_DifferentTypes_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(15.2d));
+	}
+
+	[Test]
+	public void Validate_ObjectValueIsNotIComparable_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(new object()));
+	}
+}

src/Simplify.Web.Tests/Model/Validation/Attributes/MinAttributeTests/DoubleMinAttributeTests.cs

@@ -0,0 +1,53 @@
+using NUnit.Framework;
+using Simplify.Web.Model.Validation.Attributes;
+using System;
+
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MinAttributeTests;
+
+public class DoubleMinAttributeTests : AttributesTestBase
+{
+	public const double MinValue = 12d;
+
+	[OneTimeSetUp]
+	public void SetupAttribute() => Attr = new MinAttribute(MinValue);
+
+	[Test]
+	public void Validate_AboveMinValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(15d);
+	}
+
+	[Test]
+	public void Validate_MinValueEqualsValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(12d);
+	}
+
+	[Test]
+	public void Validate_BelowMinValue_ExceptionThrown()
+	{
+		// Assign
+
+		var value = 8d;
+		var defaultMessage = $"Property '{nameof(TestEntityWithProperty.Prop1)}' required minimum value is {MinValue}, actual value: {value}";
+
+		// Act & Assert
+		TestAttribute(value, defaultMessage);
+	}
+
+	[Test]
+	public void Validate_NullValue_NoExceptions()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(null);
+	}
+
+	[Test]
+	public void Validate_DifferentTypes_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue((long)12));
+	}
+}

src/Simplify.Web.Tests/Model/Validation/Attributes/MinAttributeTests.cs → src/Simplify.Web.Tests/Model/Validation/Attributes/MinAttributeTests/IntegerMinAttributeTests.cs

@@ -1,11 +1,11 @@
-using System;
 using NUnit.Framework;
 using Simplify.Web.Model.Validation.Attributes;
+using System;
 
-namespace Simplify.Web.Tests.Model.Validation.Attributes;
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MinAttributeTests;
 
 [TestFixture]
-public class MinAttributeTests : AttributesTestBase
+public class IntegerMinAttributeTests : AttributesTestBase
 {
 	public const int MinValue = 12;
 
@@ -43,9 +43,4 @@ public void Validate_NullValue_NoExceptions() =>
 	public void Validate_DifferentTypes_ExceptionThrown() =>
 		// Act & Assert
 		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(12.5));
-
-	[Test]
-	public void Validate_ValueTypeNotInheritIComparable_ExceptionThrown() =>
-		// Act & Assert
-		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(new object()));
 }

src/Simplify.Web.Tests/Model/Validation/Attributes/MinAttributeTests/LongMinAttributeTests.cs

@@ -0,0 +1,53 @@
+using NUnit.Framework;
+using Simplify.Web.Model.Validation.Attributes;
+using System;
+
+namespace Simplify.Web.Tests.Model.Validation.Attributes.MinAttributeTests;
+
+public class LongMinAttributeTests : AttributesTestBase
+{
+	public const long MinValue = 12;
+
+	[OneTimeSetUp]
+	public void SetupAttribute() => Attr = new MinAttribute(MinValue);
+
+	[Test]
+	public void Validate_AboveMinValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue((long)15);
+	}
+
+	[Test]
+	public void Validate_MinValueEqualsValue_Ok()
+	{
+		// Act & Assert
+		TestAttributeForValidValue((long)12);
+	}
+
+	[Test]
+	public void Validate_BelowMinValue_ExceptionThrown()
+	{
+		// Assign
+
+		var value = (long)8;
+		var defaultMessage = $"Property '{nameof(TestEntityWithProperty.Prop1)}' required minimum value is {MinValue}, actual value: {value}";
+
+		// Act & Assert
+		TestAttribute(value, defaultMessage);
+	}
+
+	[Test]
+	public void Validate_NullValue_NoExceptions()
+	{
+		// Act & Assert
+		TestAttributeForValidValue(null);
+	}
+
+	[Test]
+	public void Validate_DifferentTypes_ExceptionThrown()
+	{
+		// Act & Assert
+		Assert.Throws<ArgumentException>(() => TestAttributeForValidValue(12));
+	}
+}