Skip to content

Feat/support inf duration #91

New issue

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

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

Already on GitHub? # to your account

Merged
merged 3 commits into from
May 11, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Features
1. [#84](https://github.com/influxdata/influxdb-client-csharp/issues/84): Add possibility to authenticate by Basic Authentication or the URL query parameters
2. [#91](https://github.com/influxdata/influxdb-client-csharp/pull/91): Added support "inf" in Duration

## 1.7.0 [2020-04-17]

Expand Down
72 changes: 72 additions & 0 deletions Client.Core.Test/ArgumentsDurationTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
using System;
using NUnit.Framework;

namespace InfluxDB.Client.Core.Test
{
[TestFixture]
public class ArgumentsDurationTest
{
[SetUp]
public void SetUp()
{
}

[Test]
public void Literals()
{
Arguments.CheckDuration("1s", "duration");
Arguments.CheckDuration("10d", "duration");
Arguments.CheckDuration("1h15m", "duration");
Arguments.CheckDuration("5w", "duration");
Arguments.CheckDuration("1mo5d", "duration");
Arguments.CheckDuration("-1mo5d", "duration");
Arguments.CheckDuration("inf", "duration");
Arguments.CheckDuration("-inf", "duration");
}

[Test]
public void LiteralNull()
{
try
{
Arguments.CheckDuration(null, "duration");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a duration string for duration. But got: "));
}
}

[Test]
public void LiteralEmpty()
{
try
{
Arguments.CheckDuration("", "duration");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a duration string for duration. But got: "));
}
}

[Test]
public void LiteralNotDuration()
{
try
{
Arguments.CheckDuration("x", "duration");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a duration string for duration. But got: x"));
}
}
}
}
128 changes: 128 additions & 0 deletions Client.Core.Test/ArgumentsTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
using System;
using NUnit.Framework;

namespace InfluxDB.Client.Core.Test
{
[TestFixture]
public class ArgumentsTest
{
[SetUp]
public void SetUp()
{
}

[Test]
public void CheckNonNullString()
{
Arguments.CheckNotNull("valid", "property");
}

[Test]
public void CheckNonNullStringNull()
{
try
{
Arguments.CheckNotNull(null, "property");

Assert.Fail();
}
catch (NullReferenceException e)
{
Assert.That(e.Message.Equals("Expecting a not null reference for property"));
}
}

[Test]
public void CheckNonEmptyString()
{
Arguments.CheckNonEmptyString("valid", "property");
}

[Test]
public void CheckNonEmptyStringNull()
{
try
{
Arguments.CheckNonEmptyString(null, "property");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a non-empty string for property"));
}
}

[Test]
public void CheckNonEmptyStringEmpty()
{
try
{
Arguments.CheckNonEmptyString("", "property");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a non-empty string for property"));
}
}

[Test]
public void CheckPositiveNumber()
{
Arguments.CheckPositiveNumber(10, "property");
}

[Test]
public void CheckPositiveNumberZero()
{
try
{
Arguments.CheckPositiveNumber(0, "property");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a positive number for property"));
}
}

[Test]
public void CheckPositiveNumberNegative()
{
try
{
Arguments.CheckPositiveNumber(-12, "property");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a positive number for property"));
}
}

[Test]
public void CheckNotNegativeNumber()
{
Arguments.CheckNotNegativeNumber(0, "valid");
}

[Test]
public void CheckNotNegativeNumberNegative()
{
try
{
Arguments.CheckPositiveNumber(-12, "property");

Assert.Fail();
}
catch (ArgumentException e)
{
Assert.That(e.Message.Equals("Expecting a positive number for property"));
}
}
}
}
2 changes: 1 addition & 1 deletion Client.Core/Arguments.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace InfluxDB.Client.Core
[SuppressMessage("ReSharper", "ParameterOnlyUsedForPreconditionCheck.Global")]
public static class Arguments
{
private const string DurationPattern = @"([-+]?)([0-9]+(\\.[0-9]*)?[a-z]+)+";
private const string DurationPattern = @"([-+]?)([0-9]+(\\.[0-9]*)?[a-z]+)+|inf|-inf";

/// <summary>
/// Enforces that the string is not empty.
Expand Down