Skip to content

Commit 1794043

Browse files
author
Erik Ovegard
committed
Fixes after review by anjdreas
1 parent 9c00fc7 commit 1794043

File tree

9 files changed

+14
-38
lines changed

9 files changed

+14
-38
lines changed

UnitsNet.Tests/CustomCode/AreaTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace UnitsNet.Tests.CustomCode
2626
public class AreaTests : AreaTestsBase
2727
{
2828
[Test]
29-
public void AreaDevidedByLengthEqualsLength()
29+
public void AreaDividedByLengthEqualsLength()
3030
{
3131
var length = Area.FromSquareMeters(50) / Length.FromMeters(5);
3232
Assert.AreEqual(length, Length.FromMeters(10));

UnitsNet.Tests/CustomCode/ForceTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ public void SpeedTimesForceEqualsPower()
3737
Assert.AreEqual(power, Power.FromWatts(270));
3838
}
3939
[Test]
40-
public void ForceDevidedByMassEqualsAcceleration()
40+
public void ForceDividedByMassEqualsAcceleration()
4141
{
4242
var acceleration= Force.FromNewtons(27)/Mass.FromKilograms(9);
4343
Assert.AreEqual(acceleration, Acceleration.FromMeterPerSecondSquared(3));
4444
}
4545
[Test]
46-
public void ForceDevidedByAreaEqualsPressure()
46+
public void ForceDividedByAreaEqualsPressure()
4747
{
4848
var pressure=Force.FromNewtons(81)/Area.FromSquareMeters(9);
4949
Assert.AreEqual(pressure, Pressure.FromNewtonsPerSquareMeter(9));

UnitsNet.Tests/CustomCode/PowerTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ namespace UnitsNet.Tests.CustomCode
2626
public class PowerTests : PowerTestsBase
2727
{
2828
[Test]
29-
public void PowerDevidedBySpeedEqualsForce()
29+
public void PowerDividedBySpeedEqualsForce()
3030
{
3131
var force= Power.FromWatts(15.0) / Speed.FromMetersPerSecond(3);
3232
Assert.AreEqual(force, Force.FromNewtons(5));
3333
}
3434
[Test]
35-
public void PowerDevidedByRotationalSpeedEqualsForce()
35+
public void PowerDividedByRotationalSpeedEqualsForce()
3636
{
3737
var torque = Power.FromWatts(15.0) / RotationalSpeed.FromRadiansPerSecond(3);
3838
Assert.AreEqual(torque, Torque.FromNewtonMeters(5));
3939
}
4040
[Test]
41-
public void PowerDevidedByTorqueEqualsRotationalSpeed()
41+
public void PowerDividedByTorqueEqualsRotationalSpeed()
4242
{
4343
var rotationalSpeed= Power.FromWatts(15.0) / Torque.FromNewtonMeters(3);
4444
Assert.AreEqual(rotationalSpeed, RotationalSpeed.FromRadiansPerSecond(5));

UnitsNet.Tests/CustomCode/PressureTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void PressureTimesAreaEqualsForce()
3232
}
3333

3434
[Test]
35-
public void AreaTimePressureEqualsForce()
35+
public void AreaTimesPressureEqualsForce()
3636
{
3737
var force = Area.FromSquareMeters(3) * Pressure.FromPascals(20);
3838
Assert.AreEqual(force, Force.FromNewtons(60));

UnitsNet.Tests/CustomCode/RotationalSpeedTests.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,6 @@ public void DurationTimesRotationalSpeedEqualsAngle()
5555
Assert.AreEqual(angle, Angle.FromRadians(90.0));
5656
}
5757

58-
[Test]
59-
public void RotationalSpeedTimesForceEqualsPower()
60-
{
61-
var power = RotationalSpeed.FromRadiansPerSecond(10.0) * Force.FromNewtons(2.0);
62-
Assert.AreEqual(power, Power.FromWatts(20.0));
63-
}
64-
65-
[Test]
66-
public void ForceTimesRotationalSpeedEqualsPower()
67-
{
68-
var power = Force.FromNewtons(2.0) * RotationalSpeed.FromRadiansPerSecond(10.0) ;
69-
Assert.AreEqual(power, Power.FromWatts(20.0));
70-
}
71-
7258
protected override double RadiansPerSecondInOneRadianPerSecond
7359
{
7460
get { return 1; }

UnitsNet.Tests/CustomCode/SpeedTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace UnitsNet.Tests.CustomCode
2727
public class SpeedTests : SpeedTestsBase
2828
{
2929
[Test]
30-
public void SpeedDevidedByTimeSpanEqualsAcceleration()
30+
public void SpeedDividedByTimeSpanEqualsAcceleration()
3131
{
3232
var acceleration = Speed.FromMetersPerSecond(20) / TimeSpan.FromSeconds(2);
3333
Assert.AreEqual(acceleration, Acceleration.FromMeterPerSecondSquared(10));
@@ -41,7 +41,7 @@ public void SpeedTimesTimeSpanEqualsLength()
4141
}
4242

4343
[Test]
44-
public void SpeedDevidedByDurationEqualsAcceleration()
44+
public void SpeedDividedByDurationEqualsAcceleration()
4545
{
4646
var acceleration = Speed.FromMetersPerSecond(20) / Duration.FromSeconds(2);
4747
Assert.AreEqual(acceleration, Acceleration.FromMeterPerSecondSquared(10));
@@ -55,7 +55,7 @@ public void SpeedTimesDurationEqualsLength()
5555
}
5656

5757
[Test]
58-
public void TimeSpanSpeedTimesEqualsLength()
58+
public void TimeSpanTimesSpeedEqualsLength()
5959
{
6060
var length = TimeSpan.FromSeconds(2) * Speed.FromMetersPerSecond(20);
6161
Assert.AreEqual(length, Length.FromMeters(40));

UnitsNet.Tests/CustomCode/TorqueTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ namespace UnitsNet.Tests.CustomCode
2525
public class TorqueTests : TorqueTestsBase
2626
{
2727
[Test]
28-
public void TorqueDevidedByLengthEqualsForce()
28+
public void TorqueDividedByLengthEqualsForce()
2929
{
3030
var force = Torque.FromNewtonMeters(4) / Length.FromMeters(2);
3131
Assert.AreEqual(force, Force.FromNewtons(2));
3232
}
3333
[Test]
34-
public void TorqueDevidedByForceEqualsLength()
34+
public void TorqueDividedByForceEqualsLength()
3535
{
3636
var length= Torque.FromNewtonMeters(4) / Force.FromNewtons(2);
3737
Assert.AreEqual(length, Length.FromMeters(2));

UnitsNet/CustomCode/UnitClasses/RotationalSpeed.extra.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,5 @@ public partial struct RotationalSpeed
4444
{
4545
return Angle.FromRadians(rotationalSpeed.RadiansPerSecond * duration.Seconds);
4646
}
47-
48-
public static Power operator *(RotationalSpeed rotationalSpeed, Force force)
49-
{
50-
return Power.FromWatts(rotationalSpeed.RadiansPerSecond * force.Newtons);
51-
}
52-
53-
public static Power operator *(Force force, RotationalSpeed rotationalSpeed)
54-
{
55-
return Power.FromWatts(rotationalSpeed.RadiansPerSecond * force.Newtons);
56-
}
5747
}
5848
}

UnitsNet/Scripts/UnitDefinitions/SpecificEnergy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Name": "SpecificEnergy",
33
"BaseUnit": "JoulePerKilogram",
44
"XmlDoc": "The SpecificEnergy",
5-
"XmlDocRemarks": "https://en.wikipedia.org/wiki/Specific_energy",
5+
"XmlDocRemarks": "https://en.wikipedia.org/wiki/Specific_energy",
66
"Units": [
77
{
88
"SingularName": "JoulePerKilogram",
@@ -22,7 +22,7 @@
2222
"PluralName": "CaloriesPerGram",
2323
"FromUnitToBaseFunc": "x*4.184e3",
2424
"FromBaseToUnitFunc": "x/4.184e3",
25-
"Prefixes": ["Kilo"],
25+
"Prefixes": ["Kilo"],
2626
"Localization": [
2727
{
2828
"Culture": "en-US",

0 commit comments

Comments
 (0)