Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Common/UnitDefinitions/Duration.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
},
"FromUnitToBaseFunc": "{x}",
"FromBaseToUnitFunc": "{x}",
"Prefixes": [ "Nano", "Micro", "Milli" ],
"Prefixes": [ "Pico", "Nano", "Micro", "Milli" ],
"Localization": [
{
"Culture": "en-US",
Expand Down
3 changes: 2 additions & 1 deletion Common/UnitEnumValues.g.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@
"Second": 9,
"Week": 10,
"Year365": 11,
"Sol": 15
"Sol": 15,
"Picosecond": 12
},
"DynamicViscosity": {
"Centipoise": 1,
Expand Down
12 changes: 12 additions & 0 deletions UnitsNet.NanoFramework/GeneratedCode/Quantities/Duration.g.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 27 additions & 8 deletions UnitsNet.Tests/CustomCode/DurationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,16 @@ public class DurationTests : DurationTestsBase
protected override double JulianYearsInOneSecond => 3.16880878140289e-08;

protected override double SolsInOneSecond => 1.126440159375963e-5;


protected override double PicosecondsInOneSecond => 1e+12;

[Fact]
public void AllBaseQuantityUnitsAreBaseUnits()
{
Assert.All(Duration.Info.UnitInfos, unitInfo => Assert.Equal(new BaseUnits(time: unitInfo.Value), unitInfo.BaseUnits));
Assert.All(
Duration.Info.UnitInfos,
unitInfo => Assert.Equal(new BaseUnits(time: unitInfo.Value), unitInfo.BaseUnits)
);
}

[Fact]
Expand Down Expand Up @@ -73,7 +78,10 @@ public static void ToTimeSpanShouldNotThrowExceptionOnValuesSlightlySmallerThanT
[InlineData(100, Units.DurationUnit.Nanosecond)]
[InlineData(1, Units.DurationUnit.Microsecond)]
[InlineData(1.234, Units.DurationUnit.Millisecond)]
public static void ToTimeSpanShouldNotRoundToMillisecond(double value, Units.DurationUnit unit)
public static void ToTimeSpanShouldNotRoundToMillisecond(
double value,
Units.DurationUnit unit
)
{
Duration duration = Duration.From(value, unit);
TimeSpan timeSpan = duration.ToTimeSpan();
Expand Down Expand Up @@ -196,11 +204,22 @@ public void DurationTimesVolumeFlowEqualsVolume()
[InlineData("1 сек", 1, "ru-RU")]
[InlineData("1000 мс", 1, "ru-RU")]
[InlineData("1000 мсек", 1, "ru-RU")]
public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(string textValue, double expectedSeconds, string? culture = null)
{
var cultureInfo = culture == null ? CultureInfo.InvariantCulture : CultureInfo.GetCultureInfo(culture);

AssertEx.EqualTolerance(expectedSeconds, Duration.Parse(textValue, cultureInfo).Seconds, SecondsTolerance);
public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(
string textValue,
double expectedSeconds,
string? culture = null
)
{
var cultureInfo =
culture == null
? CultureInfo.InvariantCulture
: CultureInfo.GetCultureInfo(culture);

AssertEx.EqualTolerance(
expectedSeconds,
Duration.Parse(textValue, cultureInfo).Seconds,
SecondsTolerance
);
}

[Fact]
Expand Down
Loading