Version 3.0.363

This commit is contained in:
Anja 2023-04-19 12:14:14 +02:00
parent 4ff3307997
commit 91d42552c7
212 changed files with 1799 additions and 1318 deletions

View file

@ -6,6 +6,7 @@ using TINK.Model.Connector;
using TINK.Model.Services.CopriApi;
using TINK.Repository;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
using TINK.Services.CopriApi;
namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query

View file

@ -7,6 +7,7 @@ using TINK.Model.Connector;
using TINK.Model.Services.CopriApi;
using TINK.Repository;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
using TINK.Services.CopriApi;
namespace TestShareeLib.Model.Connector

View file

@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using NUnit.Framework;
using TINK.Repository;
using TINK.Repository.Response;
@ -37,7 +37,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
// Ensure that answer holds a valid bike.
var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
Assert.AreEqual(l_oBike.bike, "26");
Assert.That(
l_oBike.station,
@ -108,7 +108,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
// Ensure that answer holds a valid bike.
var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
Assert.That(l_oBike.bike, Is.Null);
Assert.That(l_oBike.station, Is.Not.Null);
Assert.AreEqual("available", l_oBike.state);
@ -150,7 +150,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
// Ensure that answer holds a valid bike.
var l_oBike = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(VALID_RESPONSE).bikes_occupied.FirstOrDefault().Value;
Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
Assert.That(l_oBike.bike, Is.Not.Null);
Assert.That(l_oBike.station, Is.Not.Null);
Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");

View file

@ -8,6 +8,7 @@ using TINK.Model.Services.CopriApi;
using TINK.Repository;
using TINK.Repository.Exception;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
using TINK.Services.CopriApi;
namespace TestTINKLib.Fixtures.ObjectTests.Connector

View file

@ -4,10 +4,11 @@ using NSubstitute;
using NUnit.Framework;
using TINK.Repository;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
namespace TestTINKLib.Fixtures.ObjectTests.Query
{
[TestFixture]
[TestFixture]
public class TestQuery
{
private const string BIKESAVAILABLE = @"{

View file

@ -6,10 +6,11 @@ using NUnit.Framework;
using TINK.Model.Connector;
using TINK.Repository;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
namespace TestTINKLib.Fixtures.ObjectTests.Connector
{
[TestFixture]
[TestFixture]
public class TestQueryLoggedIn
{
private const string BIKESAVAILABLE = @"{

View file

@ -1,11 +1,14 @@
using System;
using System;
using System.Linq;
using Newtonsoft.Json;
using NUnit.Framework;
using NUnit.Framework.Internal;
using TINK.Model.Bikes.BikeInfoNS.BikeNS;
using TINK.Model.Connector;
using TINK.Repository.Exception;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
using TINK.Repository.Response.Stations.Station;
using JsonConvertRethrow = TINK.Repository.Response.JsonConvertRethrow;
namespace TestTINKLib.Fixtures.Connector
@ -22,7 +25,7 @@ namespace TestTINKLib.Fixtures.Connector
// Verify prerequisites
Assert.IsNull(l_oInfo.description);
// Verify behaviour of member.
// Verify behavior of member.
Assert.IsNull(TextToTypeHelper.GetWheelType(l_oInfo));
}
@ -43,7 +46,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.AreEqual(WheelType.Two, TextToTypeHelper.GetWheelType(l_oInfo));
l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -60,7 +63,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.AreEqual(WheelType.Trike, TextToTypeHelper.GetWheelType(l_oInfo));
l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -73,7 +76,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -86,7 +89,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
}
@ -98,7 +101,7 @@ namespace TestTINKLib.Fixtures.Connector
// Verify prerequisites
Assert.IsNull(l_oInfo.description);
// Verify behaviour of member.
// Verify behavior of member.
Assert.IsNull(TextToTypeHelper.GetTypeOfBike(l_oInfo));
}
@ -119,7 +122,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -136,7 +139,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -153,7 +156,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.AreEqual(TypeOfBike.City, TextToTypeHelper.GetTypeOfBike(info));
info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -168,12 +171,38 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.That(
TextToTypeHelper.GetTypeOfBike(info),
Is.Null); // Version up to 3.0.322 considered this bike to be a city bike to to description "Stadtrad"
}
[Test]
public void TestGetAaRideTypeNoAa() =>
Assert.That(
JsonConvert.DeserializeObject<BikeInfoBase>(@"
{
""aa_ride"": ""0"",
}").GetAaRideType(),
Is.EqualTo(AaRideType.NoAaRide));
[Test]
public void TestGetAaRideTypeAa() =>
Assert.That(
JsonConvert.DeserializeObject<BikeInfoBase>(@"
{
""aa_ride"": ""1"",
}").GetAaRideType(),
Is.EqualTo(AaRideType.AaRide));
[Test]
public void TestGetAaRideTypeNull() =>
Assert.That(
JsonConvert.DeserializeObject<BikeInfoBase>(@"
{
}").GetAaRideType(),
Is.Null);
[Test]
public void TestGetStateAvailable()
=> Assert.That(
@ -229,7 +258,7 @@ namespace TestTINKLib.Fixtures.Connector
// Verify prerequisites
Assert.IsNull(info.state);
// Verify behaviour of member.
// Verify behavior of member.
Assert.Throws<InvalidResponseException<BikeInfoBase>>(() => TextToTypeHelper.GetState(info));
}
@ -246,7 +275,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -259,7 +288,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -272,7 +301,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.IsTrue(TextToTypeHelper.GetIsDemo(l_oInfo));
l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@ -285,7 +314,7 @@ namespace TestTINKLib.Fixtures.Connector
""state"" : ""available""
}");
// Verify behaviour of member.
// Verify behavior of member.
Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
}
@ -368,7 +397,7 @@ namespace TestTINKLib.Fixtures.Connector
[Test]
public void TestGetStationGroup_Invalid()
{
var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
var l_oStation = JsonConvertRethrow.DeserializeObject<StationInfo>(
@"{
""station"" : ""4"",
""gps"" : { ""latitude"": ""47.6586936667"", ""longitude"": ""9.16863116667"" }
@ -381,7 +410,7 @@ namespace TestTINKLib.Fixtures.Connector
[Test]
public void TestGetStationGroup_TINK()
{
var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
var l_oStation = JsonConvertRethrow.DeserializeObject<StationInfo>(
@"{
""station"" : ""4"",
""station_group"" : [ ""TINK"" ],
@ -394,7 +423,7 @@ namespace TestTINKLib.Fixtures.Connector
[Test]
public void TestGetStationGroup_TINKAndKonrad()
{
var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
var l_oStation = JsonConvertRethrow.DeserializeObject<StationInfo>(
@"{
""station"" : ""4"",
""station_group"": [ ""TINK"", ""Konrad"" ],
@ -1027,4 +1056,4 @@ namespace TestTINKLib.Fixtures.Connector
}").GetFrom(),
Is.EqualTo(DateTime.MinValue));
}
}
}

View file

@ -12,6 +12,7 @@ using TINK.Model.State;
using TINK.Model.User.Account;
using TINK.Repository;
using TINK.Repository.Response;
using TINK.Repository.Response.Stations;
using Xamarin.Forms;
using static TINK.Repository.CopriCallsMemory;
@ -165,7 +166,7 @@ namespace TestShareeLib.Model.Connector.Updater
[Test]
public void TestUpdateBikesAvailable_BikeNr5GetBooked()
{
// Bike 5 is availalbe.
// Bike 5 is centered.
var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(DataSource.Copri);
Assert.AreEqual(12, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
@ -241,7 +242,7 @@ namespace TestShareeLib.Model.Connector.Updater
public void TestGetBikesAvailable_BikeNr5GetBooked()
{
// Bike 5 is availalbe.
// Bike 5 is centered.
var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(DataSource.Copri);
Assert.AreEqual(11, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
@ -420,7 +421,7 @@ namespace TestShareeLib.Model.Connector.Updater
}
[Test]
public void TestGetBikesAll_BikesAvaialbleResponse()
public void TestGetBikesAll_BikesAvailbleResponse()
{
var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
@"{
@ -460,7 +461,7 @@ namespace TestShareeLib.Model.Connector.Updater
"There must be one ILockitBike and one BC bike (BikeInfo class).");
}
[Test]
public void TestGetBikesAll_BikesAvaialbleResponse_InvalidState()
public void TestGetBikesAll_BikesAvailbleResponse_InvalidState()
{
var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
@"{
@ -489,7 +490,7 @@ namespace TestShareeLib.Model.Connector.Updater
}
[Test]
public void TestGetBikesAll_BikesAvaialbleResponse_InvalidStation()
public void TestGetBikesAll_BikesAvailableResponse_InvalidStation()
{
var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
@"{
@ -518,7 +519,7 @@ namespace TestShareeLib.Model.Connector.Updater
}
[Test]
public void TestGetBikesAll_BikesAvaialbleResponse_DuplicateId()
public void TestGetBikesAll_BikesAvailableResponse_DuplicateId()
{
var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
@"{