Skip to content

Commit 9b04493

Browse files
mludlummludlum
committed
Corrected UsSurveyFoot camel case. Using value for test property UsSurveyFeetInOneMeter different from method used in conversion formula.
1 parent b4c78f4 commit 9b04493

File tree

7 files changed

+45
-45
lines changed

7 files changed

+45
-45
lines changed

‎UnitsNet.Tests/CustomCode/LengthTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class LengthTests : LengthTestsBase
3333

3434
protected override double FeetInOneMeter => 3.28084;
3535

36-
protected override double USSurveyFeetInOneMeter => 3937.0/1200.0;
36+
protected override double UsSurveyFeetInOneMeter => 3.280833333333333;
3737

3838
protected override double InchesInOneMeter => 39.37007874;
3939

‎UnitsNet.Tests/GeneratedCode/LengthTestsBase.g.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public abstract partial class LengthTestsBase
6666
protected abstract double MillimetersInOneMeter { get; }
6767
protected abstract double NanometersInOneMeter { get; }
6868
protected abstract double NauticalMilesInOneMeter { get; }
69-
protected abstract double USSurveyFeetInOneMeter { get; }
69+
protected abstract double UsSurveyFeetInOneMeter { get; }
7070
protected abstract double YardsInOneMeter { get; }
7171

7272
// ReSharper disable VirtualMemberNeverOverriden.Global
@@ -83,7 +83,7 @@ public abstract partial class LengthTestsBase
8383
protected virtual double MillimetersTolerance { get { return 1e-5; } }
8484
protected virtual double NanometersTolerance { get { return 1e-5; } }
8585
protected virtual double NauticalMilesTolerance { get { return 1e-5; } }
86-
protected virtual double USSurveyFeetTolerance { get { return 1e-5; } }
86+
protected virtual double UsSurveyFeetTolerance { get { return 1e-5; } }
8787
protected virtual double YardsTolerance { get { return 1e-5; } }
8888
// ReSharper restore VirtualMemberNeverOverriden.Global
8989

@@ -104,7 +104,7 @@ public void MeterToLengthUnits()
104104
Assert.AreEqual(MillimetersInOneMeter, meter.Millimeters, MillimetersTolerance);
105105
Assert.AreEqual(NanometersInOneMeter, meter.Nanometers, NanometersTolerance);
106106
Assert.AreEqual(NauticalMilesInOneMeter, meter.NauticalMiles, NauticalMilesTolerance);
107-
Assert.AreEqual(USSurveyFeetInOneMeter, meter.USSurveyFeet, USSurveyFeetTolerance);
107+
Assert.AreEqual(UsSurveyFeetInOneMeter, meter.UsSurveyFeet, UsSurveyFeetTolerance);
108108
Assert.AreEqual(YardsInOneMeter, meter.Yards, YardsTolerance);
109109
}
110110

@@ -124,7 +124,7 @@ public void FromValueAndUnit()
124124
Assert.AreEqual(1, Length.From(1, LengthUnit.Millimeter).Millimeters, MillimetersTolerance);
125125
Assert.AreEqual(1, Length.From(1, LengthUnit.Nanometer).Nanometers, NanometersTolerance);
126126
Assert.AreEqual(1, Length.From(1, LengthUnit.NauticalMile).NauticalMiles, NauticalMilesTolerance);
127-
Assert.AreEqual(1, Length.From(1, LengthUnit.USSurveyFoot).USSurveyFeet, USSurveyFeetTolerance);
127+
Assert.AreEqual(1, Length.From(1, LengthUnit.UsSurveyFoot).UsSurveyFeet, UsSurveyFeetTolerance);
128128
Assert.AreEqual(1, Length.From(1, LengthUnit.Yard).Yards, YardsTolerance);
129129
}
130130

@@ -145,7 +145,7 @@ public void As()
145145
Assert.AreEqual(MillimetersInOneMeter, meter.As(LengthUnit.Millimeter), MillimetersTolerance);
146146
Assert.AreEqual(NanometersInOneMeter, meter.As(LengthUnit.Nanometer), NanometersTolerance);
147147
Assert.AreEqual(NauticalMilesInOneMeter, meter.As(LengthUnit.NauticalMile), NauticalMilesTolerance);
148-
Assert.AreEqual(USSurveyFeetInOneMeter, meter.As(LengthUnit.USSurveyFoot), USSurveyFeetTolerance);
148+
Assert.AreEqual(UsSurveyFeetInOneMeter, meter.As(LengthUnit.UsSurveyFoot), UsSurveyFeetTolerance);
149149
Assert.AreEqual(YardsInOneMeter, meter.As(LengthUnit.Yard), YardsTolerance);
150150
}
151151

@@ -166,7 +166,7 @@ public void ConversionRoundTrip()
166166
Assert.AreEqual(1, Length.FromMillimeters(meter.Millimeters).Meters, MillimetersTolerance);
167167
Assert.AreEqual(1, Length.FromNanometers(meter.Nanometers).Meters, NanometersTolerance);
168168
Assert.AreEqual(1, Length.FromNauticalMiles(meter.NauticalMiles).Meters, NauticalMilesTolerance);
169-
Assert.AreEqual(1, Length.FromUSSurveyFeet(meter.USSurveyFeet).Meters, USSurveyFeetTolerance);
169+
Assert.AreEqual(1, Length.FromUsSurveyFeet(meter.UsSurveyFeet).Meters, UsSurveyFeetTolerance);
170170
Assert.AreEqual(1, Length.FromYards(meter.Yards).Meters, YardsTolerance);
171171
}
172172

‎UnitsNet/GeneratedCode/Enums/LengthUnit.g.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public enum LengthUnit
5555
Millimeter,
5656
Nanometer,
5757
NauticalMile,
58-
USSurveyFoot,
58+
UsSurveyFoot,
5959
Yard,
6060
}
6161
}

‎UnitsNet/GeneratedCode/Extensions/Number/NumberToLengthExtensions.g.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -486,37 +486,37 @@ public static class NumberToLengthExtensions
486486

487487
#endregion
488488

489-
#region USSurveyFoot
489+
#region UsSurveyFoot
490490

491-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double)"/>
492-
public static Length USSurveyFeet(this int value) => Length.FromUSSurveyFeet(value);
491+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double)"/>
492+
public static Length UsSurveyFeet(this int value) => Length.FromUsSurveyFeet(value);
493493

494-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double?)"/>
495-
public static Length? USSurveyFeet(this int? value) => Length.FromUSSurveyFeet(value);
494+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double?)"/>
495+
public static Length? UsSurveyFeet(this int? value) => Length.FromUsSurveyFeet(value);
496496

497-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double)"/>
498-
public static Length USSurveyFeet(this long value) => Length.FromUSSurveyFeet(value);
497+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double)"/>
498+
public static Length UsSurveyFeet(this long value) => Length.FromUsSurveyFeet(value);
499499

500-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double?)"/>
501-
public static Length? USSurveyFeet(this long? value) => Length.FromUSSurveyFeet(value);
500+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double?)"/>
501+
public static Length? UsSurveyFeet(this long? value) => Length.FromUsSurveyFeet(value);
502502

503-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double)"/>
504-
public static Length USSurveyFeet(this double value) => Length.FromUSSurveyFeet(value);
503+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double)"/>
504+
public static Length UsSurveyFeet(this double value) => Length.FromUsSurveyFeet(value);
505505

506-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double?)"/>
507-
public static Length? USSurveyFeet(this double? value) => Length.FromUSSurveyFeet(value);
506+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double?)"/>
507+
public static Length? UsSurveyFeet(this double? value) => Length.FromUsSurveyFeet(value);
508508

509-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double)"/>
510-
public static Length USSurveyFeet(this float value) => Length.FromUSSurveyFeet(value);
509+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double)"/>
510+
public static Length UsSurveyFeet(this float value) => Length.FromUsSurveyFeet(value);
511511

512-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double?)"/>
513-
public static Length? USSurveyFeet(this float? value) => Length.FromUSSurveyFeet(value);
512+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double?)"/>
513+
public static Length? UsSurveyFeet(this float? value) => Length.FromUsSurveyFeet(value);
514514

515-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double)"/>
516-
public static Length USSurveyFeet(this decimal value) => Length.FromUSSurveyFeet(Convert.ToDouble(value));
515+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double)"/>
516+
public static Length UsSurveyFeet(this decimal value) => Length.FromUsSurveyFeet(Convert.ToDouble(value));
517517

518-
/// <inheritdoc cref="Length.FromUSSurveyFeet(double?)"/>
519-
public static Length? USSurveyFeet(this decimal? value) => Length.FromUSSurveyFeet(value == null ? (double?)null : Convert.ToDouble(value.Value));
518+
/// <inheritdoc cref="Length.FromUsSurveyFeet(double?)"/>
519+
public static Length? UsSurveyFeet(this decimal? value) => Length.FromUsSurveyFeet(value == null ? (double?)null : Convert.ToDouble(value.Value));
520520

521521
#endregion
522522

‎UnitsNet/GeneratedCode/UnitClasses/Length.g.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ public double NauticalMiles
215215
}
216216

217217
/// <summary>
218-
/// Get Length in USSurveyFeet.
218+
/// Get Length in UsSurveyFeet.
219219
/// </summary>
220-
public double USSurveyFeet
220+
public double UsSurveyFeet
221221
{
222222
get { return _meters*3937/1200; }
223223
}
@@ -344,9 +344,9 @@ public static Length FromNauticalMiles(double nauticalmiles)
344344
}
345345

346346
/// <summary>
347-
/// Get Length from USSurveyFeet.
347+
/// Get Length from UsSurveyFeet.
348348
/// </summary>
349-
public static Length FromUSSurveyFeet(double ussurveyfeet)
349+
public static Length FromUsSurveyFeet(double ussurveyfeet)
350350
{
351351
return new Length(ussurveyfeet*1200/3937);
352352
}
@@ -556,13 +556,13 @@ public static Length FromYards(double yards)
556556
}
557557

558558
/// <summary>
559-
/// Get nullable Length from nullable USSurveyFeet.
559+
/// Get nullable Length from nullable UsSurveyFeet.
560560
/// </summary>
561-
public static Length? FromUSSurveyFeet(double? ussurveyfeet)
561+
public static Length? FromUsSurveyFeet(double? ussurveyfeet)
562562
{
563563
if (ussurveyfeet.HasValue)
564564
{
565-
return FromUSSurveyFeet(ussurveyfeet.Value);
565+
return FromUsSurveyFeet(ussurveyfeet.Value);
566566
}
567567
else
568568
{
@@ -623,8 +623,8 @@ public static Length From(double val, LengthUnit fromUnit)
623623
return FromNanometers(val);
624624
case LengthUnit.NauticalMile:
625625
return FromNauticalMiles(val);
626-
case LengthUnit.USSurveyFoot:
627-
return FromUSSurveyFeet(val);
626+
case LengthUnit.UsSurveyFoot:
627+
return FromUsSurveyFeet(val);
628628
case LengthUnit.Yard:
629629
return FromYards(val);
630630

@@ -674,8 +674,8 @@ public static Length From(double val, LengthUnit fromUnit)
674674
return FromNanometers(value.Value);
675675
case LengthUnit.NauticalMile:
676676
return FromNauticalMiles(value.Value);
677-
case LengthUnit.USSurveyFoot:
678-
return FromUSSurveyFeet(value.Value);
677+
case LengthUnit.UsSurveyFoot:
678+
return FromUsSurveyFeet(value.Value);
679679
case LengthUnit.Yard:
680680
return FromYards(value.Value);
681681

@@ -858,8 +858,8 @@ public double As(LengthUnit unit)
858858
return Nanometers;
859859
case LengthUnit.NauticalMile:
860860
return NauticalMiles;
861-
case LengthUnit.USSurveyFoot:
862-
return USSurveyFeet;
861+
case LengthUnit.UsSurveyFoot:
862+
return UsSurveyFeet;
863863
case LengthUnit.Yard:
864864
return Yards;
865865

‎UnitsNet/GeneratedCode/UnitSystem.Default.g.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
11521152
new AbbreviationsForCulture("en-US", "NM"),
11531153
new AbbreviationsForCulture("ru-RU", "мил"),
11541154
}),
1155-
new CulturesForEnumValue((int) LengthUnit.USSurveyFoot,
1155+
new CulturesForEnumValue((int) LengthUnit.UsSurveyFoot,
11561156
new[]
11571157
{
11581158
new AbbreviationsForCulture("en-US", "ftUS"),

‎UnitsNet/Scripts/UnitDefinitions/Length.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
]
7171
},
7272
{
73-
"SingularName": "USSurveyFoot",
74-
"PluralName": "USSurveyFeet",
73+
"SingularName": "UsSurveyFoot",
74+
"PluralName": "UsSurveyFeet",
7575
"FromUnitToBaseFunc": "x*1200/3937",
7676
"FromBaseToUnitFunc": "x*3937/1200",
7777
"Localization": [

0 commit comments

Comments
 (0)