Skip to content

Commit f2b8aef

Browse files
angularsenangularsen
committed
Add FromValueAndUnit() and In() tests.
1 parent 4ab076e commit f2b8aef

15 files changed

+439
-0
lines changed

‎Tests/GeneratedCode/AngleTestsBase.g.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -49,6 +50,24 @@ public void DegreeToAngleUnits()
4950
Assert.AreEqual(RadiansInOneDegree, degree.Radians, Delta);
5051
}
5152

53+
[Test]
54+
public void FromValueAndUnit()
55+
{
56+
Assert.AreEqual(1, Angle.From(1, AngleUnit.Degree).Degrees, Delta);
57+
Assert.AreEqual(1, Angle.From(1, AngleUnit.Gradian).Gradians, Delta);
58+
Assert.AreEqual(1, Angle.From(1, AngleUnit.Radian).Radians, Delta);
59+
}
60+
61+
62+
[Test]
63+
public void In()
64+
{
65+
var degree = Angle.FromDegrees(1);
66+
Assert.AreEqual(DegreesInOneDegree, degree.Convert(AngleUnit.Degree), Delta);
67+
Assert.AreEqual(GradiansInOneDegree, degree.Convert(AngleUnit.Gradian), Delta);
68+
Assert.AreEqual(RadiansInOneDegree, degree.Convert(AngleUnit.Radian), Delta);
69+
}
70+
5271
[Test]
5372
public void ConversionRoundTrip()
5473
{

‎Tests/GeneratedCode/AreaTestsBase.g.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -61,6 +62,36 @@ public void SquareMeterToAreaUnits()
6162
Assert.AreEqual(SquareYardsInOneSquareMeter, squaremeter.SquareYards, Delta);
6263
}
6364

65+
[Test]
66+
public void FromValueAndUnit()
67+
{
68+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareCentimeter).SquareCentimeters, Delta);
69+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareDecimeter).SquareDecimeters, Delta);
70+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareFoot).SquareFeet, Delta);
71+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareInch).SquareInches, Delta);
72+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareKilometer).SquareKilometers, Delta);
73+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMeter).SquareMeters, Delta);
74+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMile).SquareMiles, Delta);
75+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMillimeter).SquareMillimeters, Delta);
76+
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareYard).SquareYards, Delta);
77+
}
78+
79+
80+
[Test]
81+
public void In()
82+
{
83+
var squaremeter = Area.FromSquareMeters(1);
84+
Assert.AreEqual(SquareCentimetersInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareCentimeter), Delta);
85+
Assert.AreEqual(SquareDecimetersInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareDecimeter), Delta);
86+
Assert.AreEqual(SquareFeetInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareFoot), Delta);
87+
Assert.AreEqual(SquareInchesInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareInch), Delta);
88+
Assert.AreEqual(SquareKilometersInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareKilometer), Delta);
89+
Assert.AreEqual(SquareMetersInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareMeter), Delta);
90+
Assert.AreEqual(SquareMilesInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareMile), Delta);
91+
Assert.AreEqual(SquareMillimetersInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareMillimeter), Delta);
92+
Assert.AreEqual(SquareYardsInOneSquareMeter, squaremeter.Convert(AreaUnit.SquareYard), Delta);
93+
}
94+
6495
[Test]
6596
public void ConversionRoundTrip()
6697
{

‎Tests/GeneratedCode/DurationTestsBase.g.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -63,6 +64,38 @@ public void SecondToDurationUnits()
6364
Assert.AreEqual(Year365DayssInOneSecond, second.Year365Dayss, Delta);
6465
}
6566

67+
[Test]
68+
public void FromValueAndUnit()
69+
{
70+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Day).Days, Delta);
71+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Hour).Hours, Delta);
72+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Microsecond).Microseconds, Delta);
73+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Millisecond).Milliseconds, Delta);
74+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Minute).Minutes, Delta);
75+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Month30Days).Month30Dayss, Delta);
76+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Nanosecond).Nanoseconds, Delta);
77+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Second).Seconds, Delta);
78+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Week).Weeks, Delta);
79+
Assert.AreEqual(1, Duration.From(1, DurationUnit.Year365Days).Year365Dayss, Delta);
80+
}
81+
82+
83+
[Test]
84+
public void In()
85+
{
86+
var second = Duration.FromSeconds(1);
87+
Assert.AreEqual(DaysInOneSecond, second.Convert(DurationUnit.Day), Delta);
88+
Assert.AreEqual(HoursInOneSecond, second.Convert(DurationUnit.Hour), Delta);
89+
Assert.AreEqual(MicrosecondsInOneSecond, second.Convert(DurationUnit.Microsecond), Delta);
90+
Assert.AreEqual(MillisecondsInOneSecond, second.Convert(DurationUnit.Millisecond), Delta);
91+
Assert.AreEqual(MinutesInOneSecond, second.Convert(DurationUnit.Minute), Delta);
92+
Assert.AreEqual(Month30DayssInOneSecond, second.Convert(DurationUnit.Month30Days), Delta);
93+
Assert.AreEqual(NanosecondsInOneSecond, second.Convert(DurationUnit.Nanosecond), Delta);
94+
Assert.AreEqual(SecondsInOneSecond, second.Convert(DurationUnit.Second), Delta);
95+
Assert.AreEqual(WeeksInOneSecond, second.Convert(DurationUnit.Week), Delta);
96+
Assert.AreEqual(Year365DayssInOneSecond, second.Convert(DurationUnit.Year365Days), Delta);
97+
}
98+
6699
[Test]
67100
public void ConversionRoundTrip()
68101
{

‎Tests/GeneratedCode/ElectricPotentialTestsBase.g.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -45,6 +46,20 @@ public void VoltToElectricPotentialUnits()
4546
Assert.AreEqual(VoltsInOneVolt, volt.Volts, Delta);
4647
}
4748

49+
[Test]
50+
public void FromValueAndUnit()
51+
{
52+
Assert.AreEqual(1, ElectricPotential.From(1, ElectricPotentialUnit.Volt).Volts, Delta);
53+
}
54+
55+
56+
[Test]
57+
public void In()
58+
{
59+
var volt = ElectricPotential.FromVolts(1);
60+
Assert.AreEqual(VoltsInOneVolt, volt.Convert(ElectricPotentialUnit.Volt), Delta);
61+
}
62+
4863
[Test]
4964
public void ConversionRoundTrip()
5065
{

‎Tests/GeneratedCode/FlowTestsBase.g.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -47,6 +48,22 @@ public void CubicMeterPerSecondToFlowUnits()
4748
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, Delta);
4849
}
4950

51+
[Test]
52+
public void FromValueAndUnit()
53+
{
54+
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerHour).CubicMetersPerHour, Delta);
55+
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerSecond).CubicMetersPerSecond, Delta);
56+
}
57+
58+
59+
[Test]
60+
public void In()
61+
{
62+
var cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
63+
Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.Convert(FlowUnit.CubicMeterPerHour), Delta);
64+
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.Convert(FlowUnit.CubicMeterPerSecond), Delta);
65+
}
66+
5067
[Test]
5168
public void ConversionRoundTrip()
5269
{

‎Tests/GeneratedCode/ForceTestsBase.g.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -57,6 +58,32 @@ public void NewtonToForceUnits()
5758
Assert.AreEqual(PoundForcesInOneNewton, newton.PoundForces, Delta);
5859
}
5960

61+
[Test]
62+
public void FromValueAndUnit()
63+
{
64+
Assert.AreEqual(1, Force.From(1, ForceUnit.Dyn).Dyne, Delta);
65+
Assert.AreEqual(1, Force.From(1, ForceUnit.KilogramForce).KilogramsForce, Delta);
66+
Assert.AreEqual(1, Force.From(1, ForceUnit.Kilonewton).Kilonewtons, Delta);
67+
Assert.AreEqual(1, Force.From(1, ForceUnit.KiloPond).KiloPonds, Delta);
68+
Assert.AreEqual(1, Force.From(1, ForceUnit.Newton).Newtons, Delta);
69+
Assert.AreEqual(1, Force.From(1, ForceUnit.Poundal).Poundals, Delta);
70+
Assert.AreEqual(1, Force.From(1, ForceUnit.PoundForce).PoundForces, Delta);
71+
}
72+
73+
74+
[Test]
75+
public void In()
76+
{
77+
var newton = Force.FromNewtons(1);
78+
Assert.AreEqual(DyneInOneNewton, newton.Convert(ForceUnit.Dyn), Delta);
79+
Assert.AreEqual(KilogramsForceInOneNewton, newton.Convert(ForceUnit.KilogramForce), Delta);
80+
Assert.AreEqual(KilonewtonsInOneNewton, newton.Convert(ForceUnit.Kilonewton), Delta);
81+
Assert.AreEqual(KiloPondsInOneNewton, newton.Convert(ForceUnit.KiloPond), Delta);
82+
Assert.AreEqual(NewtonsInOneNewton, newton.Convert(ForceUnit.Newton), Delta);
83+
Assert.AreEqual(PoundalsInOneNewton, newton.Convert(ForceUnit.Poundal), Delta);
84+
Assert.AreEqual(PoundForcesInOneNewton, newton.Convert(ForceUnit.PoundForce), Delta);
85+
}
86+
6087
[Test]
6188
public void ConversionRoundTrip()
6289
{

‎Tests/GeneratedCode/Includes/UnitTestClass.ttinclude‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
using System;
3636
using NUnit.Framework;
37+
using UnitsNet.Units;
3738

3839
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
3940
#pragma warning disable 1718
@@ -76,6 +77,50 @@ namespace UnitsNet.Tests
7677
#>
7778
Assert.AreEqual(<#=unitPluralName#>InOne<#=baseUnitName#>, <#=baseUnitVariableName#>.<#=unitPluralName#>, Delta);
7879
<#+ }
80+
#>
81+
}
82+
<#+ /* Example:
83+
[Test]
84+
public void FromByEnum()
85+
{
86+
Assert.AreEqual(1, Volume.From(1, VolumeUnit.Centiliter).Centiliters, Delta);
87+
}
88+
*/
89+
#>
90+
91+
[Test]
92+
public void FromValueAndUnit()
93+
{
94+
<#+
95+
foreach (UnitInfo unit in orderedClassUnits)
96+
{
97+
#>
98+
Assert.AreEqual(1, <#=className#>.From(1, <#=className#>Unit.<#=unit.SingularName#>).<#=unit.PluralName#>, Delta);
99+
<#+ }
100+
#>
101+
}
102+
103+
<#+ /* Example:
104+
[Test]
105+
public void In()
106+
{
107+
var cubicMeter = Volume.FromCubicMeters(1);
108+
Assert.AreEqual(CentilitersInOneCubicMeter, cubicMeter.Convert(VolumeUnit.Centiliter), Delta);
109+
}
110+
*/
111+
#>
112+
113+
[Test]
114+
public void In()
115+
{
116+
var <#=baseUnitVariableName#> = <#=className#>.From<#=baseUnitPluralName#>(1);
117+
<#+
118+
foreach (UnitInfo unit in orderedClassUnits)
119+
{
120+
string unitPluralName = unit.PluralName;
121+
#>
122+
Assert.AreEqual(<#=unit.PluralName#>InOne<#=baseUnitName#>, <#=baseUnitVariableName#>.Convert(<#=className#>Unit.<#=unit.SingularName#>), Delta);
123+
<#+ }
79124
#>
80125
}
81126

‎Tests/GeneratedCode/LengthTestsBase.g.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -69,6 +70,44 @@ public void MeterToLengthUnits()
6970
Assert.AreEqual(YardsInOneMeter, meter.Yards, Delta);
7071
}
7172

73+
[Test]
74+
public void FromValueAndUnit()
75+
{
76+
Assert.AreEqual(1, Length.From(1, LengthUnit.Centimeter).Centimeters, Delta);
77+
Assert.AreEqual(1, Length.From(1, LengthUnit.Decimeter).Decimeters, Delta);
78+
Assert.AreEqual(1, Length.From(1, LengthUnit.Foot).Feet, Delta);
79+
Assert.AreEqual(1, Length.From(1, LengthUnit.Inch).Inches, Delta);
80+
Assert.AreEqual(1, Length.From(1, LengthUnit.Kilometer).Kilometers, Delta);
81+
Assert.AreEqual(1, Length.From(1, LengthUnit.Meter).Meters, Delta);
82+
Assert.AreEqual(1, Length.From(1, LengthUnit.Microinch).Microinches, Delta);
83+
Assert.AreEqual(1, Length.From(1, LengthUnit.Micrometer).Micrometers, Delta);
84+
Assert.AreEqual(1, Length.From(1, LengthUnit.Mil).Mils, Delta);
85+
Assert.AreEqual(1, Length.From(1, LengthUnit.Mile).Miles, Delta);
86+
Assert.AreEqual(1, Length.From(1, LengthUnit.Millimeter).Millimeters, Delta);
87+
Assert.AreEqual(1, Length.From(1, LengthUnit.Nanometer).Nanometers, Delta);
88+
Assert.AreEqual(1, Length.From(1, LengthUnit.Yard).Yards, Delta);
89+
}
90+
91+
92+
[Test]
93+
public void In()
94+
{
95+
var meter = Length.FromMeters(1);
96+
Assert.AreEqual(CentimetersInOneMeter, meter.Convert(LengthUnit.Centimeter), Delta);
97+
Assert.AreEqual(DecimetersInOneMeter, meter.Convert(LengthUnit.Decimeter), Delta);
98+
Assert.AreEqual(FeetInOneMeter, meter.Convert(LengthUnit.Foot), Delta);
99+
Assert.AreEqual(InchesInOneMeter, meter.Convert(LengthUnit.Inch), Delta);
100+
Assert.AreEqual(KilometersInOneMeter, meter.Convert(LengthUnit.Kilometer), Delta);
101+
Assert.AreEqual(MetersInOneMeter, meter.Convert(LengthUnit.Meter), Delta);
102+
Assert.AreEqual(MicroinchesInOneMeter, meter.Convert(LengthUnit.Microinch), Delta);
103+
Assert.AreEqual(MicrometersInOneMeter, meter.Convert(LengthUnit.Micrometer), Delta);
104+
Assert.AreEqual(MilsInOneMeter, meter.Convert(LengthUnit.Mil), Delta);
105+
Assert.AreEqual(MilesInOneMeter, meter.Convert(LengthUnit.Mile), Delta);
106+
Assert.AreEqual(MillimetersInOneMeter, meter.Convert(LengthUnit.Millimeter), Delta);
107+
Assert.AreEqual(NanometersInOneMeter, meter.Convert(LengthUnit.Nanometer), Delta);
108+
Assert.AreEqual(YardsInOneMeter, meter.Convert(LengthUnit.Yard), Delta);
109+
}
110+
72111
[Test]
73112
public void ConversionRoundTrip()
74113
{

‎Tests/GeneratedCode/MassTestsBase.g.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
using System;
2323
using NUnit.Framework;
24+
using UnitsNet.Units;
2425

2526
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
2627
#pragma warning disable 1718
@@ -73,6 +74,48 @@ public void KilogramToMassUnits()
7374
Assert.AreEqual(TonnesInOneKilogram, kilogram.Tonnes, Delta);
7475
}
7576

77+
[Test]
78+
public void FromValueAndUnit()
79+
{
80+
Assert.AreEqual(1, Mass.From(1, MassUnit.Centigram).Centigrams, Delta);
81+
Assert.AreEqual(1, Mass.From(1, MassUnit.Decagram).Decagrams, Delta);
82+
Assert.AreEqual(1, Mass.From(1, MassUnit.Decigram).Decigrams, Delta);
83+
Assert.AreEqual(1, Mass.From(1, MassUnit.Gram).Grams, Delta);
84+
Assert.AreEqual(1, Mass.From(1, MassUnit.Hectogram).Hectograms, Delta);
85+
Assert.AreEqual(1, Mass.From(1, MassUnit.Kilogram).Kilograms, Delta);
86+
Assert.AreEqual(1, Mass.From(1, MassUnit.Kilotonne).Kilotonnes, Delta);
87+
Assert.AreEqual(1, Mass.From(1, MassUnit.LongTon).LongTons, Delta);
88+
Assert.AreEqual(1, Mass.From(1, MassUnit.Megatonne).Megatonnes, Delta);
89+
Assert.AreEqual(1, Mass.From(1, MassUnit.Microgram).Micrograms, Delta);
90+
Assert.AreEqual(1, Mass.From(1, MassUnit.Milligram).Milligrams, Delta);
91+
Assert.AreEqual(1, Mass.From(1, MassUnit.Nanogram).Nanograms, Delta);
92+
Assert.AreEqual(1, Mass.From(1, MassUnit.Pound).Pounds, Delta);
93+
Assert.AreEqual(1, Mass.From(1, MassUnit.ShortTon).ShortTons, Delta);
94+
Assert.AreEqual(1, Mass.From(1, MassUnit.Tonne).Tonnes, Delta);
95+
}
96+
97+
98+
[Test]
99+
public void In()
100+
{
101+
var kilogram = Mass.FromKilograms(1);
102+
Assert.AreEqual(CentigramsInOneKilogram, kilogram.Convert(MassUnit.Centigram), Delta);
103+
Assert.AreEqual(DecagramsInOneKilogram, kilogram.Convert(MassUnit.Decagram), Delta);
104+
Assert.AreEqual(DecigramsInOneKilogram, kilogram.Convert(MassUnit.Decigram), Delta);
105+
Assert.AreEqual(GramsInOneKilogram, kilogram.Convert(MassUnit.Gram), Delta);
106+
Assert.AreEqual(HectogramsInOneKilogram, kilogram.Convert(MassUnit.Hectogram), Delta);
107+
Assert.AreEqual(KilogramsInOneKilogram, kilogram.Convert(MassUnit.Kilogram), Delta);
108+
Assert.AreEqual(KilotonnesInOneKilogram, kilogram.Convert(MassUnit.Kilotonne), Delta);
109+
Assert.AreEqual(LongTonsInOneKilogram, kilogram.Convert(MassUnit.LongTon), Delta);
110+
Assert.AreEqual(MegatonnesInOneKilogram, kilogram.Convert(MassUnit.Megatonne), Delta);
111+
Assert.AreEqual(MicrogramsInOneKilogram, kilogram.Convert(MassUnit.Microgram), Delta);
112+
Assert.AreEqual(MilligramsInOneKilogram, kilogram.Convert(MassUnit.Milligram), Delta);
113+
Assert.AreEqual(NanogramsInOneKilogram, kilogram.Convert(MassUnit.Nanogram), Delta);
114+
Assert.AreEqual(PoundsInOneKilogram, kilogram.Convert(MassUnit.Pound), Delta);
115+
Assert.AreEqual(ShortTonsInOneKilogram, kilogram.Convert(MassUnit.ShortTon), Delta);
116+
Assert.AreEqual(TonnesInOneKilogram, kilogram.Convert(MassUnit.Tonne), Delta);
117+
}
118+
76119
[Test]
77120
public void ConversionRoundTrip()
78121
{

0 commit comments

Comments
 (0)