Skip to content

Commit 0df61ae

Browse files
committed
Dynamic conversions for Volume moved to UnitConverterTests.
1 parent c72d7c2 commit 0df61ae

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed

Tests/UnitConverterTests.cs

+51-36
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,51 @@
1-
using System;
2-
using NUnit.Framework;
3-
4-
namespace UnitsNet.Tests.net35
5-
{
6-
[TestFixture]
7-
public class UnitConverterTests
8-
{
9-
private const double Delta = 1E-5;
10-
11-
// TODO Test Force, Length2d, Mass, Pressure and Volume units.
12-
13-
[Test]
14-
public void MeterToLengthUnits()
15-
{
16-
Assert.AreEqual(1E-3, UnitConverter.Convert(1, Unit.Meter, Unit.Kilometer));
17-
Assert.AreEqual(1, UnitConverter.Convert(1, Unit.Meter, Unit.Meter));
18-
Assert.AreEqual(1E1, UnitConverter.Convert(1, Unit.Meter, Unit.Decimeter));
19-
Assert.AreEqual(1E2, UnitConverter.Convert(1, Unit.Meter, Unit.Centimeter));
20-
Assert.AreEqual(1E3, UnitConverter.Convert(1, Unit.Meter, Unit.Millimeter));
21-
Assert.AreEqual(1E6, UnitConverter.Convert(1, Unit.Meter, Unit.Micrometer));
22-
Assert.AreEqual(1E9, UnitConverter.Convert(1, Unit.Meter, Unit.Nanometer));
23-
24-
Assert.AreEqual(0.000621371, UnitConverter.Convert(1, Unit.Meter, Unit.Mile), Delta);
25-
Assert.AreEqual(1.09361, UnitConverter.Convert(1, Unit.Meter, Unit.Yard), Delta);
26-
Assert.AreEqual(3.28084, UnitConverter.Convert(1, Unit.Meter, Unit.Foot), Delta);
27-
Assert.AreEqual(39.3701, UnitConverter.Convert(1, Unit.Meter, Unit.Inch), Delta);
28-
}
29-
30-
[Test]
31-
public void ThrowsOnIncompatibleUnits()
32-
{
33-
Assert.Throws<Exception>(() => UnitConverter.Convert(1, Unit.Meter, Unit.Second));
34-
}
35-
}
36-
}
1+
using System;
2+
using NUnit.Framework;
3+
4+
namespace UnitsNet.Tests.net35
5+
{
6+
[TestFixture]
7+
public class UnitConverterTests
8+
{
9+
private const double Delta = 1E-5;
10+
11+
// TODO Test Force, Length2d, Mass, Pressure units.
12+
13+
[Test]
14+
public void MeterToLengthUnits()
15+
{
16+
Assert.AreEqual(1E-3, UnitConverter.Convert(1, Unit.Meter, Unit.Kilometer));
17+
Assert.AreEqual(1, UnitConverter.Convert(1, Unit.Meter, Unit.Meter));
18+
Assert.AreEqual(1E1, UnitConverter.Convert(1, Unit.Meter, Unit.Decimeter));
19+
Assert.AreEqual(1E2, UnitConverter.Convert(1, Unit.Meter, Unit.Centimeter));
20+
Assert.AreEqual(1E3, UnitConverter.Convert(1, Unit.Meter, Unit.Millimeter));
21+
Assert.AreEqual(1E6, UnitConverter.Convert(1, Unit.Meter, Unit.Micrometer));
22+
Assert.AreEqual(1E9, UnitConverter.Convert(1, Unit.Meter, Unit.Nanometer));
23+
24+
Assert.AreEqual(0.000621371, UnitConverter.Convert(1, Unit.Meter, Unit.Mile), Delta);
25+
Assert.AreEqual(1.09361, UnitConverter.Convert(1, Unit.Meter, Unit.Yard), Delta);
26+
Assert.AreEqual(3.28084, UnitConverter.Convert(1, Unit.Meter, Unit.Foot), Delta);
27+
Assert.AreEqual(39.3701, UnitConverter.Convert(1, Unit.Meter, Unit.Inch), Delta);
28+
}
29+
30+
[Test]
31+
public void CubicMeterToVolumeUnits()
32+
{
33+
Assert.AreEqual(1E-9, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicKilometer), Delta);
34+
Assert.AreEqual(1E0, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicMeter), Delta);
35+
Assert.AreEqual(1E3, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicDecimeter), Delta);
36+
Assert.AreEqual(1E6, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicCentimeter), Delta);
37+
Assert.AreEqual(1E9, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicMilimeter), Delta);
38+
Assert.AreEqual(1E1, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Hectoliter), Delta);
39+
Assert.AreEqual(1E3, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Liter), Delta);
40+
Assert.AreEqual(1E4, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Deciliter), Delta);
41+
Assert.AreEqual(1E5, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Centiliter), Delta);
42+
Assert.AreEqual(1E6, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Milliliter), Delta);
43+
}
44+
45+
[Test]
46+
public void ThrowsOnIncompatibleUnits()
47+
{
48+
Assert.Throws<Exception>(() => UnitConverter.Convert(1, Unit.Meter, Unit.Second));
49+
}
50+
}
51+
}

Tests/VolumeTests.cs

-15
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,5 @@ public void EqualsCanHandleNullInstance()
124124
{
125125
Assert.IsFalse(cubicMeter.Equals(null));
126126
}
127-
128-
[Test]
129-
public void DynamicConversion()
130-
{
131-
Assert.AreEqual(1E-9, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicKilometer), Delta);
132-
Assert.AreEqual(1E0, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicMeter), Delta);
133-
Assert.AreEqual(1E3, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicDecimeter), Delta);
134-
Assert.AreEqual(1E6, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicCentimeter), Delta);
135-
Assert.AreEqual(1E9, UnitConverter.Convert(1, Unit.CubicMeter, Unit.CubicMilimeter), Delta);
136-
Assert.AreEqual(1E1, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Hectoliter), Delta);
137-
Assert.AreEqual(1E3, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Liter), Delta);
138-
Assert.AreEqual(1E4, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Deciliter), Delta);
139-
Assert.AreEqual(1E5, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Centiliter), Delta);
140-
Assert.AreEqual(1E6, UnitConverter.Convert(1, Unit.CubicMeter, Unit.Milliliter), Delta);
141-
}
142127
}
143128
}

0 commit comments

Comments
 (0)