Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions csharp/Platform.Ranges.Tests/EnsureExtensionsTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using Xunit;
using Platform.Exceptions;
using Platform.Ranges.Resources;

namespace Platform.Ranges.Tests
{
Expand All @@ -11,5 +12,27 @@ public static class EnsureExtensionsTests

[Fact]
public static void ArgumentInRangeExceptionTest() => Assert.Throws<ArgumentOutOfRangeException>(() => Ensure.Always.ArgumentInRange(5, (6, 7)));

[Fact]
public static void MaximumArgumentIsGreaterOrEqualToMinimumMessageTest()
{
var exception = Assert.Throws<ArgumentException>(() => Ensure.Always.MaximumArgumentIsGreaterOrEqualToMinimum(5, 3));
Assert.Contains(ExceptionMessages.MaximumShouldBeGreaterOrEqualToMinimum, exception.Message);
}

[Fact]
public static void ArgumentInRangeMessageTest()
{
var exception = Assert.Throws<ArgumentOutOfRangeException>(() => Ensure.Always.ArgumentInRange(10, (1, 5), "testArgument"));
var expectedMessage = string.Format(ExceptionMessages.ArgumentOutOfRange, 10, new Range<int>(1, 5));
Assert.Contains(expectedMessage, exception.Message);
}

[Fact]
public static void ExceptionMessagesResourcesTest()
{
Assert.Equal("Maximum should be greater or equal to minimum.", ExceptionMessages.MaximumShouldBeGreaterOrEqualToMinimum);
Assert.Equal("Argument value [{0}] is out of range {1}.", ExceptionMessages.ArgumentOutOfRange);
}
}
}
5 changes: 3 additions & 2 deletions csharp/Platform.Ranges/EnsureExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Runtime.CompilerServices;
using Platform.Exceptions;
using Platform.Exceptions.ExtensionRoots;
using Platform.Ranges.Resources;

#pragma warning disable IDE0060 // Remove unused parameter

Expand All @@ -15,7 +16,7 @@ namespace Platform.Ranges
/// </summary>
public static class EnsureExtensions
{
private const string DefaultMaximumShouldBeGreaterOrEqualToMinimumMessage = "Maximum should be greater or equal to minimum.";
private static string DefaultMaximumShouldBeGreaterOrEqualToMinimumMessage => ExceptionMessages.MaximumShouldBeGreaterOrEqualToMinimum;

#region Always

Expand Down Expand Up @@ -126,7 +127,7 @@ public static void ArgumentInRange<TArgument>(this EnsureAlwaysExtensionRoot roo
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void ArgumentInRange<TArgument>(this EnsureAlwaysExtensionRoot root, TArgument argumentValue, Range<TArgument> range, string argumentName)
{
string messageBuilder() => $"Argument value [{argumentValue}] is out of range {range}.";
string messageBuilder() => string.Format(ExceptionMessages.ArgumentOutOfRange, argumentValue, range);
ArgumentInRange(root, argumentValue, range, argumentName, messageBuilder);
}

Expand Down
7 changes: 7 additions & 0 deletions csharp/Platform.Ranges/Platform.Ranges.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
<PackageReference Include="Platform.Exceptions" Version="0.5.0" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources\ExceptionMessages.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>ExceptionMessages.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>



</Project>
81 changes: 81 additions & 0 deletions csharp/Platform.Ranges/Resources/ExceptionMessages.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions csharp/Platform.Ranges/Resources/ExceptionMessages.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="MaximumShouldBeGreaterOrEqualToMinimum" xml:space="preserve">
<value>Maximum should be greater or equal to minimum.</value>
<comment>Error message when maximum value is less than minimum value in a range</comment>
</data>
<data name="ArgumentOutOfRange" xml:space="preserve">
<value>Argument value [{0}] is out of range {1}.</value>
<comment>Error message when an argument value is outside the allowed range. {0} is the value, {1} is the range</comment>
</data>
</root>
Loading