Version 3.0.364

TestShareeLib/ViewModel/Account/TestAccountPageViewModel.cs

@@ -9,7 +9,6 @@ using TestFramework.Model.Services.Geolocation;
 using TestFramework.Model.User.Account;
 using TestFramework.Repository;
 using TestFramework.Services.BluetoothLock;
-using TestFramework.Services.CopriApi.Connector;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;

TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs

@@ -344,7 +344,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				)); ;
 
 			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -411,7 +411,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -487,7 +487,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				throw notAtStationException);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -557,7 +557,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				throw noGPSDataException);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -625,7 +625,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -692,7 +692,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new Exception("Exception message."));
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 

TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs

@@ -213,7 +213,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			connector.Command.DoReserve(bike).Returns(x => throw new BookingDeclinedException(7)); // Booking must be performed
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -276,7 +276,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			connector.Command.DoReserve(bike).Returns<Task>(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -339,7 +339,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			connector.Command.DoReserve(bike).Returns<Task>(x => throw new Exception("Exception message."));
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -404,7 +404,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			locks.TimeOut.Returns(timeOuts);
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -470,7 +470,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			locks.TimeOut.Returns(timeOuts);
 
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 

TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs

@@ -136,7 +136,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
 			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -208,7 +208,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", response));
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -276,7 +276,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -344,7 +344,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message."));
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 

TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs

@@ -132,7 +132,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
 			bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -202,7 +202,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", l_oResponse));
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -268,7 +268,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("chub")));
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -334,7 +334,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message."));
 			bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 

TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs

@@ -81,7 +81,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Reqesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Open); // Requsthandler factory queries lock state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Open); // Requesthandler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 

TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs

@@ -10,7 +10,6 @@ using TestFramework.Model.Device;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Model.User.Account;
 using TestFramework.Repository;
-using TestFramework.Services.CopriApi.Connector;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Device;

TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs

@@ -10,11 +10,14 @@ using TestFramework.Model.Services.Geolocation;
 using TestFramework.Model.User.Account;
 using TestFramework.Repository;
 using TestFramework.Services.BluetoothLock;
-using TestFramework.Services.CopriApi.Connector;
 using TINK.Model;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Model.Settings;
+using TINK.Model.Stations.StationNS;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Services;
@@ -24,6 +27,8 @@ using TINK.View;
 using TINK.ViewModel.Map;
 using TINK.ViewModel.Settings;
 using Xamarin.Forms;
+using TINK.Model.Bikes.BikeInfoNS;
+using TINK.Model.Stations.StationNS.Operator;
 
 namespace TestShareeLib.UseCases.Startup
 {
@@ -46,7 +51,7 @@ namespace TestShareeLib.UseCases.Startup
 					activeGeolocationService: typeof(GeolocationMock).FullName),
 				new StoreMock(),
 				isConnectedFunc: () => true,
-				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001(sessionCookie)),
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001v2NotLoggedIn(sessionCookie)),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
 				locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -85,11 +90,11 @@ namespace TestShareeLib.UseCases.Startup
 				// Verify pins on map
 				Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag,
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green"))?.Tag,
 					Is.EqualTo("FR101"),
-					"Station FR105 must be marked green because there is are bike.");
+					"Station FR105 must be marked green because there are bikes.");
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag,
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red"))?.Tag,
 					Is.EqualTo("KN12"),
 					"Station KN12 must be marked red because there is no bike."); // Was station id 31
 
@@ -127,7 +132,7 @@ namespace TestShareeLib.UseCases.Startup
 					activeGeolocationService: typeof(GeolocationMock).FullName),
 				new StoreMock(),
 				isConnectedFunc: () => true,
-				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001(sessionCookie)),
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001v2NotLoggedIn(sessionCookie)),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
 				locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -151,8 +156,8 @@ namespace TestShareeLib.UseCases.Startup
 			var viewModel = new MapPageViewModel(
 				tinkApp,
 				locationPermission,
-				NSubstitute.Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
-				NSubstitute.Substitute.For<IGeolocationService>(),
+				Substitute.For<IBluetoothLE>(),
+				Substitute.For<IGeolocationService>(),
 				(mapspan) => { },
 				viewService,
 				navigationService);
@@ -166,11 +171,11 @@ namespace TestShareeLib.UseCases.Startup
 				// Verify pins on map
 				Assert.AreEqual(21, viewModel.Pins.Count); // Were 2 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station 5
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green"))?.Tag, // Was station 5
 					Is.EqualTo("FR103"),
 					"Station FR101 must be marked green because there is are bike.");
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was station 14
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red"))?.Tag, // Was station 14
 					Is.EqualTo("KN12"),
 					"Station KN12 must be marked red because there is no bike.");
 
@@ -205,7 +210,7 @@ namespace TestShareeLib.UseCases.Startup
 					activeGeolocationService: typeof(GeolocationMock).FullName),
 				new StoreMock(),
 				isConnectedFunc: () => true,
-				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001(sessionCookie)),
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001v2NotLoggedIn(sessionCookie)),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
 				locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -242,11 +247,11 @@ namespace TestShareeLib.UseCases.Startup
 				// Verify pins on map
 				Assert.AreEqual(21, viewModel.Pins.Count); // Were 2 when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 31
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green"))?.Tag, // Was station id 31
 					Is.EqualTo("FR103"),
 					"Station FR101 must be marked green because there is are bike.");
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 14
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red"))?.Tag, // Was 14
 					Is.EqualTo("KN12"),
 					"Station KN12 must be marked red because there is no bike.");
 
@@ -278,7 +283,7 @@ namespace TestShareeLib.UseCases.Startup
 					activeGeolocationService: typeof(GeolocationMock).FullName),
 				new StoreMock(),
 				isConnectedFunc: () => true,
-				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001(sessionCookie)),
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001v2NotLoggedIn(sessionCookie)),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
 				locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -315,11 +320,11 @@ namespace TestShareeLib.UseCases.Startup
 				// Verify pins on map
 				Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pin when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag,
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green"))?.Tag,
 					Is.EqualTo("FR101"), // Was station id 4
 					"Station FR101 must be marked green because there is are bike.");
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red"))?.Tag, // Was 31
 					Is.EqualTo("KN12"), // Was station id 31
 					"Station KN12 must be marked red because there is no bike.");
 
@@ -351,7 +356,7 @@ namespace TestShareeLib.UseCases.Startup
 					activeGeolocationService: typeof(GeolocationMock).FullName),
 				new StoreMock(),
 				isConnectedFunc: () => false,
-				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001(sessionCookie)),
+				connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, server: new CopriCallsMemory001v2NotLoggedIn(sessionCookie)),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
 				locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -373,7 +378,7 @@ namespace TestShareeLib.UseCases.Startup
 			var viewModel = new MapPageViewModel(
 				tinkApp,
 				locationPermission,
-				Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+				Substitute.For<IBluetoothLE>(),
 				Substitute.For<IGeolocationService>(),
 				(mapspan) => { },
 				viewService,
@@ -388,11 +393,11 @@ namespace TestShareeLib.UseCases.Startup
 				// Verify pins on map
 				Assert.AreEqual(27, viewModel.Pins.Count); // Were 8 pins when loading from CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 4
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green"))?.Tag, // Was station id 4
 					Is.EqualTo("FR101"),
 					"Station FR101 must be marked green because there is are bike.");
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red"))?.Tag, // Was 31
 					Is.EqualTo("KN12"),
 					"Station KN12 must be marked red because there is no bike.");
 
@@ -439,7 +444,7 @@ namespace TestShareeLib.UseCases.Startup
 						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
 						null /*UI language */,
 						sessionCookie: sessionCookie,
-						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+						cacheServer: new CopriCallsCacheMemory001v2NotLoggedIn(sessionCookie: sessionCookie),
 						httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
@@ -479,11 +484,11 @@ namespace TestShareeLib.UseCases.Startup
 				// Verify pins on map
 				Assert.AreEqual(27, viewModel.Pins.Count);
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green")).Tag, // Was station id 4
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Green"))?.Tag, // Was station id 4
 					Is.EqualTo("FR101"),
 					"Station FR101 must be marked green because there is are bike.");
 				Assert.That(
-					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red")).Tag, // Was 31
+					viewModel.Pins.FirstOrDefault(pin => pin.Icon.Id.Contains("Open_Red"))?.Tag, // Was 31
 					Is.EqualTo("KN12"),
 					"Station KN12 must be marked red because there is no bike.");
 
@@ -529,7 +534,7 @@ namespace TestShareeLib.UseCases.Startup
 						new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
 						null /*UI language */,
 						sessionCookie: sessionCookie,
-						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+						cacheServer: new CopriCallsCacheMemory001v2NotLoggedIn(sessionCookie: sessionCookie),
 						httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
@@ -591,5 +596,116 @@ namespace TestShareeLib.UseCases.Startup
 				await viewModel.OnDisappearing();
 			}
 		}
+
+		[Test]
+		public void TestGetStationColors()
+		{
+			var stationIds = new List<string>() { "FR101", "BVB9003", "BVB9001" };
+
+			var bikeGroupFr101 = Substitute.For<IBikeGroupCol>();
+			var bikeGroupBVB9003 = Substitute.For<IBikeGroupCol>();
+			var bikeGroupBVB9001 = Substitute.For<IBikeGroupCol>();
+
+			bikeGroupFr101.AvailableCount.Returns(1);
+			bikeGroupBVB9003.AvailableCount.Returns(7);
+			bikeGroupBVB9001.AvailableCount.Returns(0);
+
+			var stations = new List<Station>
+			{
+				new Station("FR101", new List<string>() /* group */, Substitute.For<IPosition>(), bikeGropCol: bikeGroupFr101),
+				new Station("BVB9003", new List<string>() /* group */, Substitute.For<IPosition>(), bikeGropCol: bikeGroupBVB9003),
+				new Station("BVB9001", new List<string>() /* group */, Substitute.For<IPosition>(), bikeGropCol : bikeGroupBVB9001)
+			};
+
+			var bikes = new List<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo> {
+				// Add a reserved bike to station "FR101"
+				new BikeInfo(
+					new Bike("Id1", LockModel.ILockIt),
+					new Drive(),
+					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
+					123, // Lock id
+					new Guid(),
+					new byte[0],
+					new byte[0],
+					new byte[0],
+					DateTime.Parse("2023-03-26 15:19"),
+					"a@b",
+					"FR101",
+					new Uri("https://1.2.3.4"),
+					new RentalDescription(),
+					() => DateTime.Now)
+			};
+
+			var colorList = MapPageViewModel.GetStationColors(stationIds, stations, bikes);
+
+			Assert.That(colorList[0], Is.EqualTo(Color.LightBlue), "1 bike reserved/ rented.");
+			Assert.That(colorList[1], Is.EqualTo(Color.Green), "7 available bikes.");
+			Assert.That(colorList[2], Is.EqualTo(Color.Red), "No bike");
+		}
+
+		[Test]
+		public void TestGetStationColorsNullIds()
+		{
+			var colorList = MapPageViewModel.GetStationColors(null, null, null);
+
+			Assert.That(colorList.Count, Is.EqualTo(0));
+		}
+
+		[Test]
+		public void TestGetStationColorsNoStations()
+		{
+			var stationIds = new List<string>() { "FR101", "BVB9003", "BVB9001" };
+
+			var bikes = new List<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo> {
+				// Add a reserved bike to station "FR101"
+				new BikeInfo(
+					new Bike("Id1", LockModel.ILockIt),
+					new Drive(),
+					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
+					123, // Lock id
+					new Guid(),
+					new byte[0],
+					new byte[0],
+					new byte[0],
+					DateTime.Parse("2023-03-26 15:19"),
+					"a@b",
+					"FR101",
+					new Uri("https://1.2.3.4"),
+					new RentalDescription(),
+					() => DateTime.Now)
+			};
+
+			var colorList = MapPageViewModel.GetStationColors(stationIds, null, bikes);
+
+			Assert.That(colorList[0], Is.EqualTo(Color.LightBlue), "1 bike reserved/ rented.");
+			Assert.That(colorList[1], Is.EqualTo(Color.Red), "No bike.");
+			Assert.That(colorList[2], Is.EqualTo(Color.Red), "No bike");
+		}
+
+		[Test]
+		public void TestGetStationColorsNoBikes()
+		{
+			var stationIds = new List<string>() { "FR101", "BVB9003", "BVB9001" };
+			var bikeGroupFr101 = Substitute.For<IBikeGroupCol>();
+			var bikeGroupBVB9003 = Substitute.For<IBikeGroupCol>();
+			var bikeGroupBVB9001 = Substitute.For<IBikeGroupCol>();
+
+			bikeGroupFr101.AvailableCount.Returns(1);
+			bikeGroupBVB9003.AvailableCount.Returns(7);
+			bikeGroupBVB9001.AvailableCount.Returns(0);
+
+			var stations = new List<Station>
+			{
+				new Station("FR101", new List<string>() /* group */, Substitute.For<IPosition>(), bikeGropCol: bikeGroupFr101),
+				new Station("BVB9003", new List<string>() /* group */, Substitute.For<IPosition>(),bikeGropCol: bikeGroupBVB9003),
+				new Station("BVB9001", new List<string>() /* group */, Substitute.For<IPosition>(), bikeGropCol: bikeGroupBVB9001)
+			};
+
+			var colorList = MapPageViewModel.GetStationColors(stationIds, stations, null);
+
+			Assert.That(colorList[0], Is.EqualTo(Color.Green), "No bike reserved/ rented.");
+			Assert.That(colorList[1], Is.EqualTo(Color.Green), "7 available bikes.");
+			Assert.That(colorList[2], Is.EqualTo(Color.Red), "No bike");
+		}
 	}
 }

TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs

@@ -10,7 +10,6 @@ using TestFramework.Model.Device;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Model.User.Account;
 using TestFramework.Repository;
-using TestTINKLib.Mocks.Connector;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Device;