Skip to content

Commit 78f583f

Browse files
feO2xfeO2x
authored
Merge pull request #91 from feO2x/dev
Version 10.2.0
2 parents 5e3b2c2 + 673f79b commit 78f583f

15 files changed

Lines changed: 1027 additions & 51 deletions

File tree

‎.github/workflows/build-and-test.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ name: Build and Test
22

33
on:
44
push:
5-
branches: [ main, dev ]
5+
branches: [main, dev]
6+
paths: ['Code/**', 'build-and-test.yml']
67
pull_request:
7-
branches: [ main, dev ]
8+
branches: [main, dev]
9+
paths: ['Code/**', 'build-and-test.yml']
810

911
jobs:
1012
build-and-test:
1113

1214
runs-on: ubuntu-latest
1315

1416
steps:
15-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1618
- name: Setup .NET
17-
uses: actions/setup-dotnet@v1
19+
uses: actions/setup-dotnet@v3
1820
with:
1921
dotnet-version: 7.0.x
2022
- name: Restore dependencies

‎.github/workflows/release-on-nuget.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Release to NuGet
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
dotnetVersion:
9+
description: "The version of .NET to use"
10+
required: false
11+
default: "7.0.x"
12+
13+
jobs:
14+
release-to-nuget:
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 5
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
- name: Setup .NET
21+
uses: actions/setup-dotnet@v3
22+
with:
23+
dotnet-version: ${{ github.event.inputs.dotnetVersion || '7.0.x' }}
24+
- name: Prepare SNK file
25+
env:
26+
LIGHT_GUARDCLAUSES_SNK: ${{ secrets.LIGHT_GUARDCLAUSES_SNK }}
27+
run: |
28+
echo $LIGHT_GUARDCLAUSES_SNK | base64 --decode > ./Code/Light.GuardClauses/Light.GuardClauses.snk
29+
- name: Create NuGet packages
30+
run: dotnet pack ./Code/Light.GuardClauses/Light.GuardClauses.csproj -c Release /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=Light.GuardClauses.snk /p:ContinuousIntegrationBuild=true
31+
- name: Delete SNK file
32+
run: rm ./Code/Light.GuardClauses/Light.GuardClauses.snk
33+
- name: Push nupkg package
34+
env:
35+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
36+
run: dotnet nuget push "./Code/Light.GuardClauses/bin/Release/Light.GuardClauses.*.nupkg" --api-key $NUGET_API_KEY --source https://api.nuget.org/v3/index.json

‎Code/Light.GuardClauses.SourceCodeTransformation/SourceFileMerger.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void CreateSingleSourceFile(SourceFileMergeOptions options)
3434
.AppendLine($@"License information for Light.GuardClauses
3535
3636
The MIT License (MIT)
37-
Copyright (c) 2016, 2021 Kenny Pflug mailto:kenny.pflug@live.de
37+
Copyright (c) 2016, 2023 Kenny Pflug mailto:kenny.pflug@live.de
3838
3939
Permission is hereby granted, free of charge, to any person obtaining a copy
4040
of this software and associated documentation files (the ""Software""), to deal

‎Code/Light.GuardClauses.Tests/CommonAssertions/IsGreaterThanOrApproximatelyTests.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
using FluentAssertions;
2+
using Xunit;
3+
4+
namespace Light.GuardClauses.Tests.CommonAssertions;
5+
6+
public static class IsGreaterThanOrApproximatelyTests
7+
{
8+
[Theory]
9+
[InlineData(17.4, 17.3, true)]
10+
[InlineData(19.9999999, 20.0, true)]
11+
[InlineData(-5.49998, -5.5, true)]
12+
[InlineData(-5.4998, -5.4996, false)]
13+
public static void DoubleWithDefaultTolerance(double first, double second, bool expected) =>
14+
first.IsGreaterThanOrApproximately(second).Should().Be(expected);
15+
16+
[Theory]
17+
[InlineData(15.91, 15.9, 0.1, true)]
18+
[InlineData(24.449, 24.45, 0.0001, false)]
19+
[InlineData(-3.12, -3.2, 0.001, true)]
20+
[InlineData(2.369, 2.37, 0.0005, false)]
21+
public static void DoubleWithCustomTolerance(double first, double second, double tolerance, bool expected) =>
22+
first.IsGreaterThanOrApproximately(second, tolerance).Should().Be(expected);
23+
24+
[Theory]
25+
[InlineData(100.225f, 100.2f, true)]
26+
[InlineData(-5.9f, -5.5f, false)]
27+
[InlineData(0f, -0.02f, true)]
28+
[InlineData(-0.001f, 0f, false)]
29+
public static void FloatWithDefaultTolerance(float first, float second, bool expected) =>
30+
first.IsGreaterThanOrApproximately(second).Should().Be(expected);
31+
32+
[Theory]
33+
[InlineData(2.0f, 1.0f, 0.1f, true)]
34+
[InlineData(1.0f, 1.0f, 0.1f, true)]
35+
[InlineData(1.0f, 1.1f, 0.01f, false)]
36+
[InlineData(1.0f, 2.0f, 0.1f, false)]
37+
public static void FloatWIthCustomTolerance(float first, float second, float tolerance, bool expected) =>
38+
first.IsGreaterThanOrApproximately(second, tolerance).Should().Be(expected);
39+
}

‎Code/Light.GuardClauses.Tests/CommonAssertions/IsLessThanOrApproximatelyTests.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
using FluentAssertions;
2+
using Xunit;
3+
4+
namespace Light.GuardClauses.Tests.CommonAssertions;
5+
6+
public static class IsLessThanOrApproximatelyTests
7+
{
8+
[Theory]
9+
[InlineData(13.25, 13.5, true)]
10+
[InlineData(48.99, 48.98999, true)]
11+
[InlineData(19.775, 19.7, false)]
12+
[InlineData(-14.32, -14.33, false)]
13+
public static void DoubleWithDefaultTolerance(double first, double second, bool expected) =>
14+
first.IsLessThanOrApproximately(second).Should().Be(expected);
15+
16+
[Theory]
17+
[InlineData(50.3, 50.5, 0.5, true)]
18+
[InlineData(2015.5, 2015.3, 0.3, true)]
19+
[InlineData(-519, -519.5, 0.25, false)]
20+
[InlineData(0, -1, 0.9, false)]
21+
public static void DoubleWithCustomTolerance(double first, double second, double tolerance, bool expected) =>
22+
first.IsLessThanOrApproximately(second, tolerance).Should().Be(expected);
23+
24+
[Theory]
25+
[InlineData(13.25f, 13.5f, true)]
26+
[InlineData(48.99f, 48.98999f, true)]
27+
[InlineData(19.775f, 19.7f, false)]
28+
[InlineData(-14.32f, -14.33f, false)]
29+
public static void FloatWithDefaultTolerance(float first, float second, bool expected) =>
30+
first.IsLessThanOrApproximately(second).Should().Be(expected);
31+
32+
[Theory]
33+
[InlineData(50.3f, 50.5f, 0.5f, true)]
34+
[InlineData(2015.5f, 2015.3f, 0.3f, true)]
35+
[InlineData(-519f, -519.5f, 0.25f, false)]
36+
[InlineData(0f, -1f, 0.9f, false)]
37+
public static void FloatWithCustomTolerance(float first, float second, float tolerance, bool expected) =>
38+
first.IsLessThanOrApproximately(second, tolerance).Should().Be(expected);
39+
}

‎Code/Light.GuardClauses.Tests/StringAssertions/MustBeTrimmedAtEndTests.cs‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
using System;
2+
using FluentAssertions;
3+
using Light.GuardClauses.Exceptions;
4+
using Light.GuardClauses.FrameworkExtensions;
5+
using Xunit;
6+
7+
namespace Light.GuardClauses.Tests.StringAssertions;
8+
9+
public static class MustBeTrimmedAtEndTests
10+
{
11+
[Theory]
12+
[InlineData("")]
13+
[InlineData("foo")]
14+
[InlineData(" bar")]
15+
[InlineData("Sto p")]
16+
public static void StringIsTrimmedAtEnd(string input) =>
17+
input.MustBeTrimmedAtEnd().Should().BeSameAs(input);
18+
19+
[Fact]
20+
public static void StringIsNull()
21+
{
22+
var nullString = default(string);
23+
24+
// ReSharper disable once ExpressionIsAlwaysNull
25+
var act = () => nullString.MustBeTrimmedAtEnd(nameof(nullString));
26+
27+
act.Should().Throw<ArgumentNullException>()
28+
.And.ParamName.Should().Be(nameof(nullString));
29+
}
30+
31+
[Theory]
32+
[InlineData("abc ")]
33+
[InlineData(" Let's go\n")]
34+
[InlineData("not trimmed at the end\t")]
35+
public static void StringIsNotTrimmedAtTheEnd(string invalidString)
36+
{
37+
var act = () => invalidString.MustBeTrimmedAtEnd(nameof(invalidString));
38+
39+
act.Should().Throw<StringException>()
40+
.And.Message.Should().Contain($"invalidString must be trimmed at the end, but it actually is {invalidString.ToStringOrNull()}");
41+
}
42+
43+
[Fact]
44+
public static void CustomExceptionStringNull() =>
45+
Test.CustomException(
46+
default(string),
47+
(@null, exceptionFactory) => @null.MustBeTrimmedAtEnd(exceptionFactory)
48+
);
49+
50+
[Theory]
51+
[InlineData("Not trimmed at end ")]
52+
[InlineData("Meh\t")]
53+
public static void CustomExceptionInvalidString(string invalidString) =>
54+
Test.CustomException(
55+
invalidString,
56+
(@string, exceptionFactory) => @string.MustBeTrimmedAtEnd(exceptionFactory)
57+
);
58+
59+
[Fact]
60+
public static void CallerArgumentExpression()
61+
{
62+
const string invalidString = "not trimmed ";
63+
64+
var act = () => invalidString.MustBeTrimmedAtEnd();
65+
66+
act.Should().Throw<StringException>()
67+
.And.ParamName.Should().Be(nameof(invalidString));
68+
}
69+
}

‎Code/Light.GuardClauses.Tests/StringAssertions/MustBeTrimmedAtStartTests.cs‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
using System;
2+
using FluentAssertions;
3+
using Light.GuardClauses.Exceptions;
4+
using Light.GuardClauses.FrameworkExtensions;
5+
using Xunit;
6+
7+
namespace Light.GuardClauses.Tests.StringAssertions;
8+
9+
public static class MustBeTrimmedAtStartTests
10+
{
11+
[Theory]
12+
[InlineData("")]
13+
[InlineData("foo")]
14+
[InlineData("bar\n")]
15+
[InlineData("I have white space ")]
16+
public static void StringIsTrimmedAtStart(string input) =>
17+
input.MustBeTrimmedAtStart().Should().BeSameAs(input);
18+
19+
[Fact]
20+
public static void StringIsNulL()
21+
{
22+
var nullString = default(string);
23+
24+
// ReSharper disable once ExpressionIsAlwaysNull
25+
var act = () => nullString.MustBeTrimmedAtStart(nameof(nullString));
26+
27+
act.Should().Throw<ArgumentNullException>()
28+
.And.ParamName.Should().Be(nameof(nullString));
29+
}
30+
31+
[Theory]
32+
[InlineData(" Hey")]
33+
[InlineData("\tTab")]
34+
[InlineData(" White space on both ends ")]
35+
public static void StringIsNotTrimmedAtStart(string invalidString)
36+
{
37+
var act = () => invalidString.MustBeTrimmedAtStart(nameof(invalidString));
38+
39+
act.Should().Throw<StringException>()
40+
.And.Message.Should().Contain($"invalidString must be trimmed at the start, but it actually is {invalidString.ToStringOrNull()}");
41+
}
42+
43+
[Fact]
44+
public static void CustomExceptionStringNull() =>
45+
Test.CustomException(
46+
default(string),
47+
(@null, exceptionFactory) => @null.MustBeTrimmedAtStart(exceptionFactory)
48+
);
49+
50+
[Theory]
51+
[InlineData(" Not trimmed at the start")]
52+
[InlineData("\nFoo")]
53+
public static void CustomExceptionInvalidString(string invalidString) =>
54+
Test.CustomException(
55+
invalidString,
56+
(@string, exceptionFactory) => @string.MustBeTrimmedAtStart(exceptionFactory)
57+
);
58+
59+
[Fact]
60+
public static void CallerArgumentExpression()
61+
{
62+
const string invalidString = " Not trimmed at start";
63+
64+
var act = () => invalidString.MustBeTrimmedAtStart();
65+
66+
act.Should().Throw<StringException>()
67+
.And.ParamName.Should().Be(nameof(invalidString));
68+
}
69+
}

‎Code/Light.GuardClauses.Tests/StringAssertions/MustBeTrimmedTests.cs‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
using System;
2+
using FluentAssertions;
3+
using Light.GuardClauses.Exceptions;
4+
using Light.GuardClauses.FrameworkExtensions;
5+
using Xunit;
6+
7+
namespace Light.GuardClauses.Tests.StringAssertions;
8+
9+
public static class MustBeTrimmedTests
10+
{
11+
[Theory]
12+
[InlineData("")]
13+
[InlineData("foo")]
14+
[InlineData("bar")]
15+
[InlineData("Another string\twith whitespace")]
16+
public static void StringIsTrimmed(string input) =>
17+
input.MustBeTrimmed().Should().BeSameAs(input);
18+
19+
[Fact]
20+
public static void StringIsNull()
21+
{
22+
var nullString = default(string);
23+
24+
// ReSharper disable once ExpressionIsAlwaysNull
25+
var act = () => nullString.MustBeTrimmed(nameof(nullString));
26+
27+
act.Should().Throw<ArgumentNullException>()
28+
.And.ParamName.Should().Be(nameof(nullString));
29+
}
30+
31+
[Theory]
32+
[InlineData("123 ")]
33+
[InlineData("\nFoo")]
34+
[InlineData(" not trimmed ")]
35+
public static void StringIsNotTrimmed(string invalidString)
36+
{
37+
var act = () => invalidString.MustBeTrimmed(nameof(invalidString));
38+
39+
act.Should().Throw<StringException>()
40+
.And.Message.Should().Contain($"invalidString must be trimmed, but it actually is {invalidString.ToStringOrNull()}");
41+
}
42+
43+
[Fact]
44+
public static void CustomExceptionStringNull()
45+
{
46+
Test.CustomException(
47+
default(string),
48+
(@null, exceptionFactory) => @null.MustBeTrimmed(exceptionFactory)
49+
);
50+
}
51+
52+
[Theory]
53+
[InlineData(" This is not trimmed at the start")]
54+
[InlineData("And not at the end\t ")]
55+
public static void CustomExceptionInvalidString(string invalidString)
56+
{
57+
Test.CustomException(
58+
invalidString,
59+
(@string, exceptionFactory) => @string.MustBeTrimmed(exceptionFactory)
60+
);
61+
}
62+
63+
[Fact]
64+
public static void CallerArgumentExpression()
65+
{
66+
const string invalidString = " Not trimmed ";
67+
68+
var act = () => invalidString.MustBeTrimmed();
69+
70+
act.Should().Throw<StringException>()
71+
.And.ParamName.Should().Be(nameof(invalidString));
72+
}
73+
}

0 commit comments

Comments
 (0)