Skip to content
Merged
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
10 changes: 2 additions & 8 deletions CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,7 @@ private void GenerateInstanceConstructors()
/// <exception cref=""ArgumentException"">If value is NaN or Infinity.</exception>
public {_quantity.Name}({_quantity.ValueType} value, {_unitEnumName} unit)
{{");
Writer.WL(_quantity.ValueType == "double"
? @"
_value = Guard.EnsureValidNumber(value, nameof(value));"
: @"
Writer.WL(@"
_value = value;");
Writer.WL($@"
_unit = unit;
Expand All @@ -202,10 +199,7 @@ private void GenerateInstanceConstructors()
var firstUnitInfo = unitInfos.FirstOrDefault();
");

Writer.WL(_quantity.ValueType == "double"
? @"
_value = Guard.EnsureValidNumber(value, nameof(value));"
: @"
Writer.WL(@"
_value = value;");
Writer.WL($@"
_unit = firstUnitInfo?.Value ?? throw new ArgumentException(""No units were found for the given UnitSystem."", nameof(unitSystem));
Expand Down
30 changes: 20 additions & 10 deletions CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,21 @@ public void DefaultCtor_ReturnsQuantityWithZeroValueAndBaseUnit()
");
if (_quantity.ValueType == "double") Writer.WL($@"
[Fact]
public void Ctor_WithInfinityValue_ThrowsArgumentException()
public void Ctor_WithInfinityValue_DoNotThrowsArgumentException()
{{
Assert.Throws<ArgumentException>(() => new {_quantity.Name}(double.PositiveInfinity, {_baseUnitFullName}));
Assert.Throws<ArgumentException>(() => new {_quantity.Name}(double.NegativeInfinity, {_baseUnitFullName}));
var exception1 = Record.Exception(() => new {_quantity.Name}(double.PositiveInfinity, {_baseUnitFullName}));
var exception2 = Record.Exception(() => new {_quantity.Name}(double.NegativeInfinity, {_baseUnitFullName}));

Assert.Null(exception1);
Assert.Null(exception2);
}}

[Fact]
public void Ctor_WithNaNValue_ThrowsArgumentException()
public void Ctor_WithNaNValue_DoNotThrowsArgumentException()
{{
Assert.Throws<ArgumentException>(() => new {_quantity.Name}(double.NaN, {_baseUnitFullName}));
var exception = Record.Exception(() => new {_quantity.Name}(double.NaN, {_baseUnitFullName}));

Assert.Null(exception);
}}
"); Writer.WL($@"

Expand Down Expand Up @@ -248,16 +253,21 @@ public void From_ValueAndUnit_ReturnsQuantityWithSameValueAndUnit()
");
if (_quantity.ValueType == "double") Writer.WL($@"
[Fact]
public void From{_baseUnit.PluralName}_WithInfinityValue_ThrowsArgumentException()
public void From{_baseUnit.PluralName}_WithInfinityValue_DoNotThrowsArgumentException()
{{
Assert.Throws<ArgumentException>(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.PositiveInfinity));
Assert.Throws<ArgumentException>(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NegativeInfinity));
var exception1 = Record.Exception(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.PositiveInfinity));
var exception2 = Record.Exception(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NegativeInfinity));

Assert.Null(exception1);
Assert.Null(exception2);
}}

[Fact]
public void From{_baseUnit.PluralName}_WithNanValue_ThrowsArgumentException()
public void From{_baseUnit.PluralName}_WithNanValue_DoNotThrowsArgumentException()
{{
Assert.Throws<ArgumentException>(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NaN));
var exception = Record.Exception(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NaN));

Assert.Null(exception);
}}
"); Writer.WL($@"

Expand Down

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

30 changes: 20 additions & 10 deletions UnitsNet.Tests/GeneratedCode/TestsBase/AccelerationTestsBase.g.cs

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

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

30 changes: 20 additions & 10 deletions UnitsNet.Tests/GeneratedCode/TestsBase/AmplitudeRatioTestsBase.g.cs

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

30 changes: 20 additions & 10 deletions UnitsNet.Tests/GeneratedCode/TestsBase/AngleTestsBase.g.cs

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

Loading