Skip to content

Commit 70a4eb7

Browse files
angularsenangularsen
committed
Merge remote-tracking branch 'origin/release/v6' into relations
2 parents f4231c1 + fb828d1 commit 70a4eb7

File tree

277 files changed

+3595
-2378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+3595
-2378
lines changed

‎CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,7 @@ private void GenerateInstanceConstructors()
211211
/// <exception cref=""ArgumentException"">If value is NaN or Infinity.</exception>
212212
public {_quantity.Name}({_quantity.ValueType} value, {_unitEnumName} unit)
213213
{{");
214-
Writer.WL(_quantity.ValueType == "double"
215-
? @"
216-
_value = Guard.EnsureValidNumber(value, nameof(value));"
217-
: @"
214+
Writer.WL(@"
218215
_value = value;");
219216
Writer.WL($@"
220217
_unit = unit;
@@ -236,10 +233,7 @@ private void GenerateInstanceConstructors()
236233
var firstUnitInfo = unitInfos.FirstOrDefault();
237234
");
238235

239-
Writer.WL(_quantity.ValueType == "double"
240-
? @"
241-
_value = Guard.EnsureValidNumber(value, nameof(value));"
242-
: @"
236+
Writer.WL(@"
243237
_value = value;");
244238
Writer.WL($@"
245239
_unit = firstUnitInfo?.Value ?? throw new ArgumentException(""No units were found for the given UnitSystem."", nameof(unitSystem));

‎CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs

+20-10
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,21 @@ public void DefaultCtor_ReturnsQuantityWithZeroValueAndBaseUnit()
171171
");
172172
if (_quantity.ValueType == "double") Writer.WL($@"
173173
[Fact]
174-
public void Ctor_WithInfinityValue_ThrowsArgumentException()
174+
public void Ctor_WithInfinityValue_DoNotThrowsArgumentException()
175175
{{
176-
Assert.Throws<ArgumentException>(() => new {_quantity.Name}(double.PositiveInfinity, {_baseUnitFullName}));
177-
Assert.Throws<ArgumentException>(() => new {_quantity.Name}(double.NegativeInfinity, {_baseUnitFullName}));
176+
var exception1 = Record.Exception(() => new {_quantity.Name}(double.PositiveInfinity, {_baseUnitFullName}));
177+
var exception2 = Record.Exception(() => new {_quantity.Name}(double.NegativeInfinity, {_baseUnitFullName}));
178+
179+
Assert.Null(exception1);
180+
Assert.Null(exception2);
178181
}}
179182
180183
[Fact]
181-
public void Ctor_WithNaNValue_ThrowsArgumentException()
184+
public void Ctor_WithNaNValue_DoNotThrowsArgumentException()
182185
{{
183-
Assert.Throws<ArgumentException>(() => new {_quantity.Name}(double.NaN, {_baseUnitFullName}));
186+
var exception = Record.Exception(() => new {_quantity.Name}(double.NaN, {_baseUnitFullName}));
187+
188+
Assert.Null(exception);
184189
}}
185190
"); Writer.WL($@"
186191
@@ -248,16 +253,21 @@ public void From_ValueAndUnit_ReturnsQuantityWithSameValueAndUnit()
248253
");
249254
if (_quantity.ValueType == "double") Writer.WL($@"
250255
[Fact]
251-
public void From{_baseUnit.PluralName}_WithInfinityValue_ThrowsArgumentException()
256+
public void From{_baseUnit.PluralName}_WithInfinityValue_DoNotThrowsArgumentException()
252257
{{
253-
Assert.Throws<ArgumentException>(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.PositiveInfinity));
254-
Assert.Throws<ArgumentException>(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NegativeInfinity));
258+
var exception1 = Record.Exception(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.PositiveInfinity));
259+
var exception2 = Record.Exception(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NegativeInfinity));
260+
261+
Assert.Null(exception1);
262+
Assert.Null(exception2);
255263
}}
256264
257265
[Fact]
258-
public void From{_baseUnit.PluralName}_WithNanValue_ThrowsArgumentException()
266+
public void From{_baseUnit.PluralName}_WithNanValue_DoNotThrowsArgumentException()
259267
{{
260-
Assert.Throws<ArgumentException>(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NaN));
268+
var exception = Record.Exception(() => {_quantity.Name}.From{_baseUnit.PluralName}(double.NaN));
269+
270+
Assert.Null(exception);
261271
}}
262272
"); Writer.WL($@"
263273

‎Common/UnitDefinitions/Density.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
},
198198
{
199199
"SingularName": "GramPerDeciliter",
200-
"PluralName": "GramsPerDeciLiter",
200+
"PluralName": "GramsPerDeciliter",
201201
"FromUnitToBaseFunc": "{x} / 1e-1",
202202
"FromBaseToUnitFunc": "{x} * 1e-1",
203203
"Prefixes": [ "Femto", "Pico", "Nano", "Micro", "Milli", "Centi", "Deci" ],

‎Common/UnitDefinitions/ElectricPotentialChangeRate.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Units": [
1212
{
1313
"SingularName": "VoltPerSecond",
14-
"PluralName": "VoltsPerSeconds",
14+
"PluralName": "VoltsPerSecond",
1515
"BaseUnits": {
1616
"L": "Meter",
1717
"M": "Kilogram",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"SingularName": "VoltPerMicrosecond",
33-
"PluralName": "VoltsPerMicroseconds",
33+
"PluralName": "VoltsPerMicrosecond",
3434
"BaseUnits": {
3535
"L": "Meter",
3636
"M": "Kilogram",
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"SingularName": "VoltPerMinute",
52-
"PluralName": "VoltsPerMinutes",
52+
"PluralName": "VoltsPerMinute",
5353
"BaseUnits": {
5454
"L": "Meter",
5555
"M": "Kilogram",
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"SingularName": "VoltPerHour",
71-
"PluralName": "VoltsPerHours",
71+
"PluralName": "VoltsPerHour",
7272
"BaseUnits": {
7373
"L": "Meter",
7474
"M": "Kilogram",

‎Common/UnitDefinitions/FuelEfficiency.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"SingularName": "KilometerPerLiter",
44-
"PluralName": "KilometersPerLiters",
44+
"PluralName": "KilometersPerLiter",
4545
"FromUnitToBaseFunc": "100 / {x}",
4646
"FromBaseToUnitFunc": "100 / {x}",
4747
"Localization": [{

‎Common/UnitDefinitions/Speed.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"SingularName": "MeterPerMinute",
33-
"PluralName": "MetersPerMinutes",
33+
"PluralName": "MetersPerMinute",
3434
"BaseUnits": {
3535
"L": "Meter",
3636
"T": "Minute"

‎Common/UnitDefinitions/TemperatureGradient.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"SingularName": "DegreeCelsiusPerMeter",
28-
"PluralName": "DegreesCelciusPerMeter",
28+
"PluralName": "DegreesCelsiusPerMeter",
2929
"BaseUnits": {
3030
"L": "Meter",
3131
"Θ": "DegreeCelsius"
@@ -57,7 +57,7 @@
5757
},
5858
{
5959
"SingularName": "DegreeCelsiusPerKilometer",
60-
"PluralName": "DegreesCelciusPerKilometer",
60+
"PluralName": "DegreesCelsiusPerKilometer",
6161
"BaseUnits": {
6262
"L": "Kilometer",
6363
"Θ": "DegreeCelsius"

‎UnitsNet.NanoFramework/GeneratedCode/Quantities/Density.g.cs

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)