Merge remote-tracking branch 'origin/release/v6' into relations

angularsen · Feb 4, 2024 · 70a4eb7 · 70a4eb7
2 parents f4231c1 + fb828d1
commit 70a4eb7
Show file tree

Hide file tree

Showing 277 changed files with 3,595 additions and 2,378 deletions.
diff --git a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
@@ -211,10 +211,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;
@@ -236,10 +233,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));

diff --git a/CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs b/CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs
@@ -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($@"
 
@@ -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($@"
 

diff --git a/Common/UnitDefinitions/Density.json b/Common/UnitDefinitions/Density.json
@@ -197,7 +197,7 @@
  },
  {
  "SingularName": "GramPerDeciliter",
- "PluralName": "GramsPerDeciLiter",
+ "PluralName": "GramsPerDeciliter",
  "FromUnitToBaseFunc": "{x} / 1e-1",
  "FromBaseToUnitFunc": "{x} * 1e-1",
  "Prefixes": [ "Femto", "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ],

diff --git a/Common/UnitDefinitions/ElectricPotentialChangeRate.json b/Common/UnitDefinitions/ElectricPotentialChangeRate.json
@@ -11,7 +11,7 @@
  "Units": [
  {
  "SingularName": "VoltPerSecond",
- "PluralName": "VoltsPerSeconds",
+ "PluralName": "VoltsPerSecond",
  "BaseUnits": {
  "L": "Meter",
  "M": "Kilogram",
@@ -30,7 +30,7 @@
  },
  {
  "SingularName": "VoltPerMicrosecond",
- "PluralName": "VoltsPerMicroseconds",
+ "PluralName": "VoltsPerMicrosecond",
  "BaseUnits": {
  "L": "Meter",
  "M": "Kilogram",
@@ -49,7 +49,7 @@
  },
  {
  "SingularName": "VoltPerMinute",
- "PluralName": "VoltsPerMinutes",
+ "PluralName": "VoltsPerMinute",
  "BaseUnits": {
  "L": "Meter",
  "M": "Kilogram",
@@ -68,7 +68,7 @@
  },
  {
  "SingularName": "VoltPerHour",
- "PluralName": "VoltsPerHours",
+ "PluralName": "VoltsPerHour",
  "BaseUnits": {
  "L": "Meter",
  "M": "Kilogram",

diff --git a/Common/UnitDefinitions/FuelEfficiency.json b/Common/UnitDefinitions/FuelEfficiency.json
@@ -41,7 +41,7 @@
  },
  {
  "SingularName": "KilometerPerLiter",
- "PluralName": "KilometersPerLiters",
+ "PluralName": "KilometersPerLiter",
  "FromUnitToBaseFunc": "100 / {x}",
  "FromBaseToUnitFunc": "100 / {x}",
  "Localization": [{

diff --git a/Common/UnitDefinitions/Speed.json b/Common/UnitDefinitions/Speed.json
@@ -30,7 +30,7 @@
  },
  {
  "SingularName": "MeterPerMinute",
- "PluralName": "MetersPerMinutes",
+ "PluralName": "MetersPerMinute",
  "BaseUnits": {
  "L": "Meter",
  "T": "Minute"

diff --git a/Common/UnitDefinitions/TemperatureGradient.json b/Common/UnitDefinitions/TemperatureGradient.json
@@ -25,7 +25,7 @@
  },
  {
  "SingularName": "DegreeCelsiusPerMeter",
- "PluralName": "DegreesCelciusPerMeter",
+ "PluralName": "DegreesCelsiusPerMeter",
  "BaseUnits": {
  "L": "Meter",
  "Θ": "DegreeCelsius"
@@ -57,7 +57,7 @@
  },
  {
  "SingularName": "DegreeCelsiusPerKilometer",
- "PluralName": "DegreesCelciusPerKilometer",
+ "PluralName": "DegreesCelsiusPerKilometer",
  "BaseUnits": {
  "L": "Kilometer",
  "Θ": "DegreeCelsius"

diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Density.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Density.g.cs