Skip to content
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

Plural fix for accelerations #434

Merged
merged 3 commits into from
May 8, 2018
Merged

Plural fix for accelerations #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
277802b
Plural fix for accelerations
tmilnthorp May 2, 2018
80a47b9
Find replace fix
tmilnthorp May 2, 2018
1cbc898
A bit overagressive with find replace again
tmilnthorp May 7, 2018
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
14 changes: 7 additions & 7 deletions UnitsNet.Tests/CustomCode/AccelerationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ namespace UnitsNet.Tests.CustomCode
{
public class AccelerationTests : AccelerationTestsBase
{
protected override double KilometerPerSecondSquaredInOneMeterPerSecondSquared => 1E-3;
protected override double KilometersPerSecondSquaredInOneMeterPerSecondSquared => 1E-3;

protected override double MeterPerSecondSquaredInOneMeterPerSecondSquared => 1;
protected override double MetersPerSecondSquaredInOneMeterPerSecondSquared => 1;

protected override double DecimeterPerSecondSquaredInOneMeterPerSecondSquared => 1E1;
protected override double DecimetersPerSecondSquaredInOneMeterPerSecondSquared => 1E1;

protected override double CentimeterPerSecondSquaredInOneMeterPerSecondSquared => 1E2;
protected override double CentimetersPerSecondSquaredInOneMeterPerSecondSquared => 1E2;

protected override double MillimeterPerSecondSquaredInOneMeterPerSecondSquared => 1E3;
protected override double MillimetersPerSecondSquaredInOneMeterPerSecondSquared => 1E3;

protected override double MicrometerPerSecondSquaredInOneMeterPerSecondSquared => 1E6;
protected override double MicrometersPerSecondSquaredInOneMeterPerSecondSquared => 1E6;

protected override double NanometerPerSecondSquaredInOneMeterPerSecondSquared => 1E9;
protected override double NanometersPerSecondSquaredInOneMeterPerSecondSquared => 1E9;

protected override double StandardGravityInOneMeterPerSecondSquared => 0.1019727;

Expand Down
8 changes: 4 additions & 4 deletions UnitsNet.Tests/CustomCode/ForceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ public void PressureByAreaEqualsForceUsingLength2D()
public void ForceDividedByMassEqualsAcceleration()
{
Acceleration acceleration = Force.FromNewtons(27)/Mass.FromKilograms(9);
Assert.Equal(acceleration, Acceleration.FromMeterPerSecondSquared(3));
Assert.Equal(acceleration, Acceleration.FromMetersPerSecondSquared(3));
}

[Fact]
public void ForceDividedByAccelerationEqualsMass()
{
Mass acceleration = Force.FromNewtons(200)/Acceleration.FromMeterPerSecondSquared(50);
Mass acceleration = Force.FromNewtons(200)/Acceleration.FromMetersPerSecondSquared(50);
Assert.Equal(acceleration, Mass.FromKilograms(4));
}

Expand All @@ -94,7 +94,7 @@ public void MassByAccelerationEqualsForceUsingDouble()
[Fact]
public void MassByAccelerationEqualsForce()
{
Force force = Force.FromMassByAcceleration(Mass.FromKilograms(85), Acceleration.FromMeterPerSecondSquared(-4));
Force force = Force.FromMassByAcceleration(Mass.FromKilograms(85), Acceleration.FromMetersPerSecondSquared(-4));
Assert.Equal(force, Force.FromNewtons(-340));
}

Expand All @@ -112,4 +112,4 @@ public void SpeedTimesForceEqualsPower()
Assert.Equal(power, Power.FromWatts(270));
}
}
}
}
4 changes: 2 additions & 2 deletions UnitsNet.Tests/CustomCode/MassTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class MassTests : MassTestsBase
[Fact]
public void AccelerationTimesMassEqualsForce()
{
Force force = Acceleration.FromMeterPerSecondSquared(3)*Mass.FromKilograms(18);
Force force = Acceleration.FromMetersPerSecondSquared(3)*Mass.FromKilograms(18);
Assert.Equal(force, Force.FromNewtons(54));
}

Expand Down Expand Up @@ -101,7 +101,7 @@ public void MassDividedByVolumeEqualsDensity()
[Fact]
public void MassTimesAccelerationEqualsForce()
{
Force force = Mass.FromKilograms(18)*Acceleration.FromMeterPerSecondSquared(3);
Force force = Mass.FromKilograms(18)*Acceleration.FromMetersPerSecondSquared(3);
Assert.Equal(force, Force.FromNewtons(54));
}
}
Expand Down
4 changes: 2 additions & 2 deletions UnitsNet.Tests/CustomCode/SpeedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ public void LengthDividedByTimeSpanEqualsSpeed()
public void SpeedDividedByDurationEqualsAcceleration()
{
Acceleration acceleration = Speed.FromMetersPerSecond(20)/Duration.FromSeconds(2);
Assert.Equal(acceleration, Acceleration.FromMeterPerSecondSquared(10));
Assert.Equal(acceleration, Acceleration.FromMetersPerSecondSquared(10));
}

[Fact]
public void SpeedDividedByTimeSpanEqualsAcceleration()
{
Acceleration acceleration = Speed.FromMetersPerSecond(20)/TimeSpan.FromSeconds(2);
Assert.Equal(acceleration, Acceleration.FromMeterPerSecondSquared(10));
Assert.Equal(acceleration, Acceleration.FromMetersPerSecondSquared(10));
}

[Fact]
Expand Down
20 changes: 10 additions & 10 deletions UnitsNet.Tests/DecimalOverloadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,49 +31,49 @@ public class DecimalOverloadTests
public static void CreatingQuantityWithDoubleBackingFieldFromDecimalReturnsCorrectValue()
{
decimal oneMeterPerSecondSquared = 1m;
Acceleration acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared);
Assert.Equal(1.0, acceleration.MeterPerSecondSquared);
Acceleration acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared);
Assert.Equal(1.0, acceleration.MetersPerSecondSquared);
}

[Fact]
public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalReturnsCorrectValue()
{
decimal? oneMeterPerSecondSquared = 1m;
Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared);
Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared);
Assert.NotNull(acceleration);
Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared);
Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared);
}

[Fact]
public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalReturnsNullWhenGivenNull()
{
decimal? nullDecimal = null;
Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(nullDecimal);
Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(nullDecimal);
Assert.Null(acceleration);
}

[Fact]
public static void CreatingQuantityWithDoubleBackingFieldFromDecimalWithExtensionMethodReturnsCorrectValue()
{
decimal oneMeterPerSecondSquared = 1m;
Acceleration acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared();
Assert.Equal(1.0, acceleration.MeterPerSecondSquared);
Acceleration acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared();
Assert.Equal(1.0, acceleration.MetersPerSecondSquared);
}

[Fact]
public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalWithExtensionMethodReturnsCorrectValue()
{
decimal? oneMeterPerSecondSquared = 1m;
Acceleration? acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared();
Acceleration? acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared();
Assert.NotNull(acceleration);
Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared);
Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared);
}

[Fact]
public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalWithExtensionMethodReturnsNullWhenGivenNull()
{
decimal? nullDecimal = null;
Acceleration? acceleration = nullDecimal.MeterPerSecondSquared();
Acceleration? acceleration = nullDecimal.MetersPerSecondSquared();
Assert.Null(acceleration);
}

Expand Down
Loading