Skip to content

Commit

Permalink
Removed Delta suffix of TemperatureDelta units (#339)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dutts authored and angularsen committed Dec 10, 2017
1 parent c275ecd commit 431527d
Show file tree
Hide file tree
Showing 9 changed files with 1,011 additions and 137 deletions.
25 changes: 17 additions & 8 deletions UnitsNet.Tests/CustomCode/TemperatureDeltaTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,22 @@ namespace UnitsNet.Tests.CustomCode
{
public class TemperatureDeltaTests : TemperatureDeltaTestsBase
{
protected override double DegreesCelsiusDeltaInOneKelvinDelta => 1;
protected override double DegreesDelisleDeltaInOneKelvinDelta => -1.5d;
protected override double DegreesFahrenheitDeltaInOneKelvinDelta => 1.8;
protected override double DegreesNewtonDeltaInOneKelvinDelta => 0.33d;
protected override double DegreesRankineDeltaInOneKelvinDelta => 1.8;
protected override double DegreesReaumurDeltaInOneKelvinDelta => 0.8;
protected override double DegreesRoemerDeltaInOneKelvinDelta => 21/40d;
protected override double KelvinsDeltaInOneKelvinDelta => 1;
protected override double DegreesCelsiusDeltaInOneKelvin => 1;
protected override double DegreesDelisleDeltaInOneKelvin => -1.5d;
protected override double DegreesFahrenheitDeltaInOneKelvin => 1.8;
protected override double DegreesNewtonDeltaInOneKelvin => 0.33d;
protected override double DegreesRankineDeltaInOneKelvin => 1.8;
protected override double DegreesReaumurDeltaInOneKelvin => 0.8;
protected override double DegreesRoemerDeltaInOneKelvin => 21/40d;
protected override double KelvinsDeltaInOneKelvin => 1;

protected override double DegreesCelsiusInOneKelvin => 1;
protected override double DegreesDelisleInOneKelvin => -1.5d;
protected override double DegreesFahrenheitInOneKelvin => 1.8;
protected override double DegreesNewtonInOneKelvin => 0.33d;
protected override double DegreesRankineInOneKelvin => 1.8;
protected override double DegreesReaumurInOneKelvin => 0.8;
protected override double DegreesRoemerInOneKelvin => 21 / 40d;
protected override double KelvinsInOneKelvin => 1;
}
}
7 changes: 4 additions & 3 deletions UnitsNet.Tests/CustomCode/TemperatureTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

using System;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Xunit;
Expand Down Expand Up @@ -94,7 +95,7 @@ public void MultiplyByTemperatureDeltaEqualsTemperature(TemperatureUnit unit, in
public void TemperatureDeltaPlusTemperatureEqualsTemperature(TemperatureUnit unit, int deltaVal, int temperatureVal, string expected)
{
Temperature temperature = Temperature.From(temperatureVal, unit);
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit) unit);
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit)Enum.Parse(typeof(TemperatureDeltaUnit), unit.ToString()));

// Act
Temperature resultTemp = delta + temperature;
Expand All @@ -113,7 +114,7 @@ public void TemperatureDeltaPlusTemperatureEqualsTemperature(TemperatureUnit uni
public void TemperatureMinusTemperatureDeltaEqualsTemperature(TemperatureUnit unit, int temperatureVal, int deltaVal, string expected)
{
Temperature temperature = Temperature.From(temperatureVal, unit);
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit) unit);
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit)Enum.Parse(typeof(TemperatureDeltaUnit), unit.ToString()));

// Act
Temperature resultTemp = temperature - delta;
Expand All @@ -132,7 +133,7 @@ public void TemperatureMinusTemperatureDeltaEqualsTemperature(TemperatureUnit un
public void TemperaturePlusTemperatureDeltaEqualsTemperature(TemperatureUnit unit, int temperatureVal, int deltaVal, string expected)
{
Temperature temperature = Temperature.From(temperatureVal, unit);
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit) unit);
TemperatureDelta delta = TemperatureDelta.From(deltaVal, (TemperatureDeltaUnit)Enum.Parse(typeof(TemperatureDeltaUnit), unit.ToString()));

// Act
Temperature resultTemp = temperature + delta;
Expand Down
192 changes: 120 additions & 72 deletions UnitsNet.Tests/GeneratedCode/TemperatureDeltaTestsBase.g.cs

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit 431527d

Please sign in to comment.