From b5b836d2d9dc3423e4ddf8f6d732bed9ba0730db Mon Sep 17 00:00:00 2001 From: Valters Melnalksnis Date: Tue, 2 Aug 2022 18:24:59 +0300 Subject: [PATCH] fix: Move test data to TransactionsUriTestData --- .../RoutesTests.cs | 18 +---------- .../TransactionsUriTestData.cs | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 tests/VMelnalksnis.NordigenDotNet.Tests/TransactionsUriTestData.cs diff --git a/tests/VMelnalksnis.NordigenDotNet.Tests/RoutesTests.cs b/tests/VMelnalksnis.NordigenDotNet.Tests/RoutesTests.cs index 5d661ac..a9195b5 100644 --- a/tests/VMelnalksnis.NordigenDotNet.Tests/RoutesTests.cs +++ b/tests/VMelnalksnis.NordigenDotNet.Tests/RoutesTests.cs @@ -3,7 +3,6 @@ // See LICENSE file in the project root for full license information. using System; -using System.Collections.Generic; using System.Collections.Specialized; using System.Web; @@ -14,7 +13,7 @@ namespace VMelnalksnis.NordigenDotNet.Tests; public sealed class RoutesTests { [Theory] - [MemberData(nameof(TestData))] + [ClassData(typeof(TransactionsUriTestData))] public void TransactionsUri_ShouldHaveExpectedQueryParameters( Guid id, Interval? interval, @@ -26,19 +25,4 @@ public sealed class RoutesTests var queryDictionary = HttpUtility.ParseQueryString(uriBuilder.Query); queryDictionary.Should().BeEquivalentTo(expectedParameters); } - - internal static IEnumerable TestData() - { - yield return new object?[] { Guid.NewGuid(), null, new NameValueCollection() }; - - var dateFrom = Instant.FromUtc(2022, 05, 01, 12, 00); - var dateTo = Instant.FromUtc(2022, 05, 12, 13, 00); - var collection = new NameValueCollection - { - { "date_from", "2022-05-01" }, - { "date_to", "2022-05-12" }, - }; - - yield return new object?[] { Guid.NewGuid(), new Interval(dateFrom, dateTo), collection }; - } } diff --git a/tests/VMelnalksnis.NordigenDotNet.Tests/TransactionsUriTestData.cs b/tests/VMelnalksnis.NordigenDotNet.Tests/TransactionsUriTestData.cs new file mode 100644 index 0000000..d056768 --- /dev/null +++ b/tests/VMelnalksnis.NordigenDotNet.Tests/TransactionsUriTestData.cs @@ -0,0 +1,32 @@ +// Copyright 2022 Valters Melnalksnis +// Licensed under the Apache License 2.0. +// See LICENSE file in the project root for full license information. + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.Specialized; + +using NodaTime; + +namespace VMelnalksnis.NordigenDotNet.Tests; + +internal sealed class TransactionsUriTestData : IEnumerable +{ + public IEnumerator GetEnumerator() + { + yield return new object?[] { Guid.NewGuid(), null, new NameValueCollection() }; + + var dateFrom = Instant.FromUtc(2022, 05, 01, 12, 00); + var dateTo = Instant.FromUtc(2022, 05, 12, 13, 00); + var collection = new NameValueCollection + { + { "date_from", "2022-05-01" }, + { "date_to", "2022-05-12" }, + }; + + yield return new object?[] { Guid.NewGuid(), new Interval(dateFrom, dateTo), collection }; + } + + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); +}