Skip to content

Removed Delta suffix of TemperatureDelta units (Fixes #331). #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 10, 2017
Merged

Removed Delta suffix of TemperatureDelta units (Fixes #331). #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c518641
Removed Delta suffix of TemperatureDelta units (Fixes #331).
dutts Dec 10, 2017
0a7174b
Fixed breaking tests caused by enums no longer matching by value with…
dutts Dec 10, 2017
88c6079
Changed BaseUnit from KelvinDelta to Kelvin and updated test code
dutts Dec 10, 2017
acb2066
Changed ▲to ∆ as per #327 and #328
dutts Dec 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions UnitsNet.Tests/CustomCode/TemperatureDeltaTests.cs
View file
Open in desktop
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
View file
Open in desktop
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()));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch


// 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
View file
Open in desktop

Large diffs are not rendered by default.

272 changes: 272 additions & 0 deletions UnitsNet/GeneratedCode/Extensions/Number/NumberToTemperatureDeltaExtensions.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

Loading