Version 3.0.261

This commit is contained in:
ohauff 2021-11-14 23:27:29 +01:00
parent 8aa3089f32
commit 4bccfe740b
80 changed files with 2672 additions and 458 deletions

View file

@ -31,10 +31,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
[Test]
public void TestDoFilter()
{
var filter = new IntersectGroupFilter(new List<string> { "Tonk", "Honk" });
var filter = new IntersectGroupFilter(new List<string> { "FR_001", "FR_009" });
Assert.AreEqual(1, filter.DoFilter(new List<string> { "Tonk", "Klonk" }).Count());
Assert.AreEqual("Tonk", filter.DoFilter(new List<string> { "Tonk", "Klonk" }).ToArray()[0]);
Assert.AreEqual(1, filter.DoFilter(new List<string> { "FR_001", "FR_007" }).Count());
Assert.AreEqual("FR_001", filter.DoFilter(new List<string> { "FR_001", "FR_007" }).ToArray()[0]);
}
}
}

View file

@ -4,6 +4,7 @@ using System.Collections.Generic;
using TINK.Model.Connector;
using System.Linq;
using TINK.Repository;
using TestFramework.Repository;
namespace TestTINKLib.Fixtures.ObjectTests.Connector
{
@ -15,34 +16,34 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
[Test]
public void TestGetStationsAll()
{
var l_oConnector = new ConnectorCache(
var connector = new ConnectorCache(
string.Empty,
string.Empty,
new CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1));
new CopriCallsMemory001());
var l_oFilter = new FilteredConnector(new List<string> { "TINK", "Konrad" }, l_oConnector);
var l_oStations = l_oFilter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(9, l_oStations.StationsAll.Count());
var filter = new FilteredConnector(new List<string> { FilterHelper.FILTERTINKGENERAL, FilterHelper.FILTERKONRAD }, connector);
var stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(41, stations.StationsAll.Count()); // Count of stations was 9 before switching to data provider CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1)
l_oFilter = new FilteredConnector(new List<string> { "TINK" }, l_oConnector);
l_oStations = l_oFilter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(8, l_oStations.StationsAll.Count());
filter = new FilteredConnector(new List<string> { FilterHelper.FILTERTINKGENERAL }, connector);
stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(21, stations.StationsAll.Count());
l_oFilter = new FilteredConnector(new List<string> { "Konrad" }, l_oConnector);
l_oStations = l_oFilter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(2, l_oStations.StationsAll.Count());
filter = new FilteredConnector(new List<string> { FilterHelper.FILTERKONRAD }, connector);
stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(27, stations.StationsAll.Count());
l_oFilter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, l_oConnector);
l_oStations = l_oFilter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(0, l_oStations.StationsAll.Count());
filter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, connector);
stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(0, stations.StationsAll.Count());
l_oFilter = new FilteredConnector(new List<string>(), l_oConnector);
l_oStations = l_oFilter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(9, l_oStations.StationsAll.Count());
filter = new FilteredConnector(new List<string>(), connector);
stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(41, stations.StationsAll.Count());
l_oFilter = new FilteredConnector(null, l_oConnector);
l_oStations = l_oFilter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(9, l_oStations.StationsAll.Count(), "Null means filter none.");
filter = new FilteredConnector(null, connector);
stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
Assert.AreEqual(41, stations.StationsAll.Count(), "Null means filter none.");
}
/// <summary> Tests all stations. </summary>
@ -52,19 +53,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
var l_oConnector = new ConnectorCache(
string.Empty,
string.Empty,
new CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1));
new CopriCallsMemory001());
var l_oFilter = new FilteredConnector(new List<string> { "TINK", "Konrad" }, l_oConnector);
var l_oFilter = new FilteredConnector(new List<string> { FilterHelper.FILTERTINKGENERAL, FilterHelper.FILTERKONRAD }, l_oConnector);
var l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
Assert.AreEqual(12, l_oBikes.Count());
Assert.AreEqual(8, l_oBikes.Count()); // Count of stations was 12 CopriCallsMemory(CopriCallsMemory.SampleSets.Set2, 1)
l_oFilter = new FilteredConnector(new List<string> { "TINK" }, l_oConnector);
l_oFilter = new FilteredConnector(new List<string> { FilterHelper.FILTERTINKGENERAL }, l_oConnector);
l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
Assert.AreEqual(11, l_oBikes.Count());
Assert.AreEqual(5, l_oBikes.Count()); // Was 11
l_oFilter = new FilteredConnector(new List<string> { "Konrad" }, l_oConnector);
l_oFilter = new FilteredConnector(new List<string> { FilterHelper.FILTERKONRAD }, l_oConnector);
l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
Assert.AreEqual(1, l_oBikes.Count());
Assert.AreEqual(3, l_oBikes.Count()); // Was 1
l_oFilter = new FilteredConnector(new List<string> { "AGroupNamedNonsensDoesNotExist" }, l_oConnector);
l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
@ -72,11 +73,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
l_oFilter = new FilteredConnector(new List<string>(), l_oConnector);
l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
Assert.AreEqual(12, l_oBikes.Count(), "List with zero element means filter all.");
Assert.AreEqual(8, l_oBikes.Count(), "List with zero element means filter all."); // Was 12
l_oFilter = new FilteredConnector(null, l_oConnector);
l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
Assert.AreEqual(12, l_oBikes.Count(), "Null means filter none.");
Assert.AreEqual(8, l_oBikes.Count(), "Null means filter none.");
}
[Test]

View file

@ -342,18 +342,21 @@ namespace TestTINKLib.Fixtures.Connector
[Test]
public void TestGetAuthGroup()
{
var l_oResponse = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
// User group was of format [ ""TINK"", ""Konrad"" ] in early day...
// Since COPRI 4.1 use group is no more used.
// Groups are of format <OperatorId>_<BikeType> for this user group would be like below if it would be used.
var response = JsonConvertRethrow.DeserializeObject<AuthorizationResponse>(@"
{
""response"" : ""authorization"",
""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
""user_group"" : [ ""TINK"", ""Konrad"" ],
""user_group"" : [ ""KN_300102"", ""KN_300101"" ],
""response_state"" : ""OK"",
""apiserver"" : ""https://tinkwwp.copri-bike.de""
}");
Assert.AreEqual(2, l_oResponse.GetGroup().ToList().Count);
Assert.AreEqual(FilterHelper.FILTERTINKGENERAL, l_oResponse.GetGroup().ToList()[0]);
Assert.AreEqual("Konrad", l_oResponse.GetGroup().ToList()[1]);
Assert.AreEqual(2, response.GetGroup().ToList().Count);
Assert.AreEqual($"KN_300102", response.GetGroup().ToList()[0]);
Assert.AreEqual($"KN_300101", response.GetGroup().ToList()[1]);
}
[Test]