Skip to content

Commit 431527d

Browse files
duttsangularsen
authored andcommitted
Removed Delta suffix of TemperatureDelta units (#339)
Fixes #331 * Removed Delta suffix of TemperatureDelta units Fixed generate-code.bat to allow spaces in script path. * Fixed breaking tests caused by enums no longer matching by value with the addition of new non-"Delta" units * Changed BaseUnit from KelvinDelta to Kelvin and updated test code * Changed ▲to ∆ as per #327 and #328
1 parent c275ecd commit 431527d

File tree

9 files changed

+1011
-137
lines changed

9 files changed

+1011
-137
lines changed

UnitsNet.Tests/CustomCode/TemperatureDeltaTests.cs

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,22 @@ namespace UnitsNet.Tests.CustomCode
4444
{
4545
public class TemperatureDeltaTests : TemperatureDeltaTestsBase
4646
{
47-
protected override double DegreesCelsiusDeltaInOneKelvinDelta => 1;
48-
protected override double DegreesDelisleDeltaInOneKelvinDelta => -1.5d;
49-
protected override double DegreesFahrenheitDeltaInOneKelvinDelta => 1.8;
50-
protected override double DegreesNewtonDeltaInOneKelvinDelta => 0.33d;
51-
protected override double DegreesRankineDeltaInOneKelvinDelta => 1.8;
52-
protected override double DegreesReaumurDeltaInOneKelvinDelta => 0.8;
53-
protected override double DegreesRoemerDeltaInOneKelvinDelta => 21/40d;
54-
protected override double KelvinsDeltaInOneKelvinDelta => 1;
47+
protected override double DegreesCelsiusDeltaInOneKelvin => 1;
48+
protected override double DegreesDelisleDeltaInOneKelvin => -1.5d;
49+
protected override double DegreesFahrenheitDeltaInOneKelvin => 1.8;
50+
protected override double DegreesNewtonDeltaInOneKelvin => 0.33d;
51+
protected override double DegreesRankineDeltaInOneKelvin => 1.8;
52+
protected override double DegreesReaumurDeltaInOneKelvin => 0.8;
53+
protected override double DegreesRoemerDeltaInOneKelvin => 21/40d;
54+
protected override double KelvinsDeltaInOneKelvin => 1;
55+
56+
protected override double DegreesCelsiusInOneKelvin => 1;
57+
protected override double DegreesDelisleInOneKelvin => -1.5d;
58+
protected override double DegreesFahrenheitInOneKelvin => 1.8;
59+
protected override double DegreesNewtonInOneKelvin => 0.33d;
60+
protected override double DegreesRankineInOneKelvin => 1.8;
61+
protected override double DegreesReaumurInOneKelvin => 0.8;
62+
protected override double DegreesRoemerInOneKelvin => 21 / 40d;
63+
protected override double KelvinsInOneKelvin => 1;
5564
}
5665
}

UnitsNet.Tests/CustomCode/TemperatureTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
// THE SOFTWARE.
2121

22+
using System;
2223
using System.Diagnostics.CodeAnalysis;
2324
using System.Globalization;
2425
using Xunit;
@@ -94,7 +95,7 @@ public void MultiplyByTemperatureDeltaEqualsTemperature(TemperatureUnit unit, in
9495
public void TemperatureDeltaPlusTemperatureEqualsTemperature(TemperatureUnit unit, int deltaVal, int temperatureVal, string expected)
9596
{
9697
Temperature temperature = Temperature.From(temperatureVal, unit);
97-
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit) unit);
98+
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit)Enum.Parse(typeof(TemperatureDeltaUnit), unit.ToString()));
9899

99100
// Act
100101
Temperature resultTemp = delta + temperature;
@@ -113,7 +114,7 @@ public void TemperatureDeltaPlusTemperatureEqualsTemperature(TemperatureUnit uni
113114
public void TemperatureMinusTemperatureDeltaEqualsTemperature(TemperatureUnit unit, int temperatureVal, int deltaVal, string expected)
114115
{
115116
Temperature temperature = Temperature.From(temperatureVal, unit);
116-
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit) unit);
117+
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit)Enum.Parse(typeof(TemperatureDeltaUnit), unit.ToString()));
117118

118119
// Act
119120
Temperature resultTemp = temperature - delta;
@@ -132,7 +133,7 @@ public void TemperatureMinusTemperatureDeltaEqualsTemperature(TemperatureUnit un
132133
public void TemperaturePlusTemperatureDeltaEqualsTemperature(TemperatureUnit unit, int temperatureVal, int deltaVal, string expected)
133134
{
134135
Temperature temperature = Temperature.From(temperatureVal, unit);
135-
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit) unit);
136+
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit)Enum.Parse(typeof(TemperatureDeltaUnit), unit.ToString()));
136137

137138
// Act
138139
Temperature resultTemp = temperature + delta;

UnitsNet.Tests/GeneratedCode/TemperatureDeltaTestsBase.g.cs

Lines changed: 120 additions & 72 deletions
Large diffs are not rendered by default.

UnitsNet/GeneratedCode/Extensions/Number/NumberToTemperatureDeltaExtensions.g.cs

Lines changed: 272 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)