Version 3.0.337

TestTINKLib/Fixtures/ObjectTests/Bike/BC/TestBikeInfoMutable.cs

@@ -1,19 +1,18 @@
-using NUnit.Framework;
-using Rhino.Mocks;
-using System;
+using System;
 using System.Collections.Generic;
-using TINK.Model.Bike;
-using TINK.Model.Bikes.Bike;
+using NSubstitute;
+using NUnit.Framework;
+using TINK.Model.Bikes.BikeInfoNS;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.State;
-
-using IBikeInfo = TINK.Model.Bike.BC.IBikeInfo;
+using IBikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.IBikeInfo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Bike
 {
     [TestFixture]
     public class TestBikeInfoMutable
     {
-        private class BikeInfoMutable : TINK.Model.Bike.BC.BikeInfoMutable
+        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
         {
             public BikeInfoMutable(
                 string id,
@@ -28,7 +27,17 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
                 Uri operatorUri = null,
                 RentalDescription tariffDescription = null,
                 Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(id, lockModel, isDemo, group, wheelType, typeOfBike, description, stationId, stationName, operatorUri, tariffDescription, dateTimeProvider, stateInfo)
+                IStateInfo stateInfo = null) : base(
+                    new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(id, lockModel, wheelType, typeOfBike, description),
+                    new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
+                    isDemo,
+                    group,
+                    stationId,
+                    stationName,
+                    operatorUri,
+                    tariffDescription,
+                    dateTimeProvider,
+                    stateInfo)
             {
             }
         }
@@ -52,80 +61,92 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
             Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
         }
 
+
         [Test]
-        public void TestConstructCopy()
+        public void TestConstructCopyBooked()
         {
             // State Booked
-            var l_oBikeInfoMock = MockRepository.GenerateStub<IBikeInfo>();
-            var l_oStateInfoMock = MockRepository.GenerateStub<IStateInfo>();
+            var bikeInfoSource = Substitute.For<IBikeInfo>();
+            var stateSource = Substitute.For<IStateInfo>();
 
-            l_oBikeInfoMock.Stub(x => x.Id).Return("22");
-            l_oBikeInfoMock.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-            l_oBikeInfoMock.Stub(x => x.WheelType).Return(WheelType.Trike);
-            l_oBikeInfoMock.Stub(x => x.StationId).Return("23");
-            l_oBikeInfoMock.Stub(x => x.State).Return(l_oStateInfoMock);
-            l_oStateInfoMock.Stub(x => x.Value).Return(InUseStateEnum.Booked);
-            l_oStateInfoMock.Stub(x => x.From).Return(new System.DateTime(2018, 01, 03));
-            l_oStateInfoMock.Stub(x => x.MailAddress).Return("a@b");
-            l_oStateInfoMock.Stub(x => x.Code).Return("234");
+            bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
+            bikeInfoSource.StationId.Returns("23");
+            bikeInfoSource.State.Returns(stateSource);
+            stateSource.Value.Returns(InUseStateEnum.Booked);
+            stateSource.From.Returns(new System.DateTime(2018, 01, 03));
+            stateSource.MailAddress.Returns("a@b");
+            stateSource.Code.Returns("234");
 
-            var l_oBikeInfo = new TINK.Model.Bike.BC.BikeInfoMutable(l_oBikeInfoMock, "My Station Name");
+            var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Booked, l_oBikeInfo.State.Value);
-            Assert.AreEqual("22", l_oBikeInfo.Id);
-            Assert.AreEqual("23", l_oBikeInfo.StationId);
-            Assert.AreEqual("My Station Name", l_oBikeInfo.StationName);
-            Assert.AreEqual(WheelType.Trike, l_oBikeInfo.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Booked, l_oBikeInfo.State.Value);
-            Assert.AreEqual(new System.DateTime(2018, 01, 03), l_oBikeInfo.State.From);
-            Assert.AreEqual("a@b", l_oBikeInfo.State.MailAddress);
+            Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
+            Assert.AreEqual("22", bikeInfoTarget.Id);
+            Assert.AreEqual("23", bikeInfoTarget.StationId);
+            Assert.AreEqual("My Station Name", bikeInfoTarget.StationName);
+            Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
+            Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
+            Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
+            Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
+            Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
+        }
 
+        [Test]
+        public void TestConstructCopyReserved()
+        {
             // State Reserved
-            l_oBikeInfoMock = MockRepository.GenerateStub<IBikeInfo>();
-            l_oStateInfoMock = MockRepository.GenerateStub<IStateInfo>();
+            var bikeInfoSource = Substitute.For<IBikeInfo>();
+            var stateSource = Substitute.For<IStateInfo>();
 
-            l_oBikeInfoMock.Stub(x => x.Id).Return("22");
-            l_oBikeInfoMock.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-            l_oBikeInfoMock.Stub(x => x.WheelType).Return(WheelType.Trike);
-            l_oBikeInfoMock.Stub(x => x.StationId).Return("23");
-            l_oBikeInfoMock.Stub(x => x.State).Return(l_oStateInfoMock);
-            l_oStateInfoMock.Stub(x => x.Value).Return(InUseStateEnum.Reserved);
-            l_oStateInfoMock.Stub(x => x.From).Return(new System.DateTime(2018, 01, 03));
-            l_oStateInfoMock.Stub(x => x.MailAddress).Return("a@b");
-            l_oStateInfoMock.Stub(x => x.Code).Return("234");
+            bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
+            bikeInfoSource.StationId.Returns("23");
+            bikeInfoSource.State.Returns(stateSource);
+            stateSource.Value.Returns(InUseStateEnum.Reserved);
+            stateSource.From.Returns(new System.DateTime(2018, 01, 03));
+            stateSource.MailAddress.Returns("a@b");
+            stateSource.Code.Returns("234");
 
-            l_oBikeInfo = new TINK.Model.Bike.BC.BikeInfoMutable(l_oBikeInfoMock, "My Station Name");
+            var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBikeInfo.State.Value);
-            Assert.AreEqual("22", l_oBikeInfo.Id);
-            Assert.AreEqual("23", l_oBikeInfo.StationId);
-            Assert.AreEqual(WheelType.Trike, l_oBikeInfo.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBikeInfo.State.Value);
-            Assert.AreEqual(new System.DateTime(2018, 01, 03), l_oBikeInfo.State.From);
-            Assert.AreEqual("a@b", l_oBikeInfo.State.MailAddress);
+            Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
+            Assert.AreEqual("22", bikeInfoTarget.Id);
+            Assert.AreEqual("23", bikeInfoTarget.StationId);
+            Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
+            Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
+            Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
+            Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
+            Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
 
+        }
+
+        [Test]
+        public void TestConstructCopyAvailable()
+        {
             // State Disposable
-            l_oBikeInfoMock = MockRepository.GenerateStub<IBikeInfo>();
-            l_oStateInfoMock = MockRepository.GenerateStub<IStateInfo>();
+            var bikeInfoSource = Substitute.For<IBikeInfo>();
+            var stateSource = Substitute.For<IStateInfo>();
 
-            l_oBikeInfoMock.Stub(x => x.Id).Return("22");
-            l_oBikeInfoMock.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-            l_oBikeInfoMock.Stub(x => x.WheelType).Return(WheelType.Trike);
-            l_oBikeInfoMock.Stub(x => x.StationId).Return("23");
-            l_oBikeInfoMock.Stub(x => x.State).Return(l_oStateInfoMock);
-            l_oStateInfoMock.Stub(x => x.Value).Return(InUseStateEnum.Disposable);
+            bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
+            bikeInfoSource.StationId.Returns("23");
+            bikeInfoSource.State.Returns(stateSource);
+            stateSource.Value.Returns(InUseStateEnum.Disposable);
 
-            l_oBikeInfo = new TINK.Model.Bike.BC.BikeInfoMutable(l_oBikeInfoMock, "My Station Name");
+            var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
 
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeInfo.State.Value);
-            Assert.AreEqual("22", l_oBikeInfo.Id);
-            Assert.AreEqual("23", l_oBikeInfo.StationId);
-            Assert.AreEqual(WheelType.Trike, l_oBikeInfo.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeInfo.State.Value);
-            Assert.IsNull(l_oBikeInfo.State.From);
+            Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
+            Assert.AreEqual("22", bikeInfoTarget.Id);
+            Assert.AreEqual("23", bikeInfoTarget.StationId);
+            Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
+            Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
+            Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
+            Assert.IsNull(bikeInfoTarget.State.From);
+        }
+
+        [Test]
+        public void TestConstructBikeNull()
+        {
+            Assert.That(
+                () => new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(null, "My Station Name"),
+                Throws.ArgumentNullException);
         }
     }
 }

TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs

@@ -1,9 +1,9 @@
 
-using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Net;
 using System.Text;
+using Newtonsoft.Json;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
@@ -86,7 +86,7 @@ namespace UITest.Fixtures.Connector
         /// <returns>List of files.</returns>
         public static StationsAvailableResponse GetStationsAllCall(
             string p_strCopriHost,
-            string p_strMerchantId, 
+            string p_strMerchantId,
             string p_strCookie = null)
         {
             var l_oCommand = string.Format(
@@ -115,11 +115,11 @@ namespace UITest.Fixtures.Connector
         /// <returns>Response holding list of bikes.</returns>
         public static BikesAvailableResponse GetBikesAvailableCall(
             string copriHost,
-            string merchantId, 
+            string merchantId,
             string sessionCookie = null)
         {
 #if !WINDOWS_UWP
-            string l_oCommand = 
+            string l_oCommand =
                 $"request=bikes_available&system=all&authcookie={sessionCookie ?? string.Empty}{merchantId}";
 
             string response;
@@ -147,7 +147,7 @@ namespace UITest.Fixtures.Connector
 #if !WINDOWS_UWP
             string l_oCommand = !string.IsNullOrEmpty(sessionCookie)
                 ? $"request=user_bikes_occupied&system=all&authcookie={sessionCookie}{merchantId}"
-                : "request=bikes_available"; 
+                : "request=bikes_available";
 
             string l_oBikesOccupiedResponse;
 
@@ -180,7 +180,7 @@ namespace UITest.Fixtures.Connector
                 p_strSessionCookie,
                 p_strMerchantId);
 
-            string l_oBikesAvaialbeResponse  = Post(l_oCommand, copriHost);
+            string l_oBikesAvaialbeResponse = Post(l_oCommand, copriHost);
 
             // Extract bikes from response.
             return JsonConvert.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(l_oBikesAvaialbeResponse)?.shareejson;

TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using TINK.Model.Connector.Filter;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
@@ -15,7 +15,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
 
             Assert.AreEqual(1, filter.DoFilter(null).Count());
             Assert.AreEqual(
-                "Tonk", 
+                "Tonk",
                 filter.DoFilter(null).ToArray()[0],
                 "Do not apply filtering when null is passed as argement (null-filter).");
         }

TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs

@@ -1,9 +1,6 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using NUnit.Framework;
 using TINK.Model.Connector.Filter;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
@@ -16,7 +13,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Filter
         {
             var filter = new NullGroupFilter();
             Assert.IsNull(filter.DoFilter(null));
-            Assert.AreEqual(0, filter.DoFilter(new List<string>()).Count());            
+            Assert.AreEqual(0, filter.DoFilter(new List<string>()).Count());
             Assert.AreEqual(1, filter.DoFilter(new List<string> { "Hello" }).Count());
         }
     }

TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQuery.cs

@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using Rhino.Mocks;
-using System.Threading.Tasks;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
@@ -170,7 +170,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
             var server = MockRepository.GenerateMock<ICachedCopriServer>();
 
             server.Stub(x => x.GetBikesAvailable()).Return(Task.Run(() => new Result<BikesAvailableResponse>(
-                typeof(CopriCallsHttps), 
+                typeof(CopriCallsHttps),
                 JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
                 new GeneralData())));
 

TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestCachedQueryLoggedIn.cs

@@ -1,8 +1,9 @@
-using Newtonsoft.Json;
+using System;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NSubstitute;
 using NUnit.Framework;
 using Rhino.Mocks;
-using System;
-using System.Threading.Tasks;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
@@ -318,21 +319,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
         [Test]
         public async Task TestGetBikes()
         {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+            var server = Substitute.For<ICachedCopriServer>();
 
-            server.Stub(x => x.GetBikesAvailable()).Return(Task.Run(() => new Result<BikesAvailableResponse>(
+            server.GetBikesAvailable().Returns(Task.Run(() => new Result<BikesAvailableResponse>(
                 typeof(CopriCallsHttps),
                 JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE),
                 new GeneralData())));
 
-            server.Stub(x => x.GetBikesOccupied()).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+            server.GetBikesOccupied().Returns(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
                 typeof(CopriCallsHttps),
                 JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
                 new GeneralData())));
 
-            server.Stub(x => x.AddToCache(Arg<Result<BikesAvailableResponse>>.Is.Anything));
-            server.Stub(x => x.AddToCache(Arg<Result<BikesReservedOccupiedResponse>>.Is.Anything));
-
             var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAsync();
 
             Assert.AreEqual(2, result.Response.Count);
@@ -343,15 +341,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
         [Test]
         public async Task TestGetBikesOccupied()
         {
-            var server = MockRepository.GenerateMock<ICachedCopriServer>();
+            var server = Substitute.For<ICachedCopriServer>();
 
-            server.Stub(x => x.GetBikesOccupied()).Return(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
+            server.GetBikesAvailable().Returns(Task.Run(() => new Result<BikesAvailableResponse>(
+                typeof(CopriCallsHttps),
+                JsonConvert.DeserializeObject<BikesAvailableResponse>("{}"),
+                new GeneralData())));
+
+            server.GetBikesOccupied().Returns(Task.Run(() => new Result<BikesReservedOccupiedResponse>(
                 typeof(CopriCallsHttps),
                 JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED),
                 new GeneralData())));
 
-            server.Stub(x => x.AddToCache(Arg<Result<BikesReservedOccupiedResponse>>.Is.Anything));
-
             var result = await new CachedQueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesOccupiedAsync();
 
             Assert.AreEqual(1, result.Response.Count);

TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestQuery.cs

@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using Rhino.Mocks;
-using System.Threading.Tasks;
 using TINK.Repository;
 using TINK.Repository.Response;
 

TestTINKLib/Fixtures/ObjectTests/Connector/Query/TestQueryLoggedIn.cs

@@ -1,11 +1,12 @@
-using Newtonsoft.Json;
+using System;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NSubstitute;
 using NUnit.Framework;
 using Rhino.Mocks;
-using System;
-using System.Threading.Tasks;
 using TINK.Model.Connector;
-using TINK.Repository.Response;
 using TINK.Repository;
+using TINK.Repository.Response;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
@@ -113,7 +114,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             server.Stub(x => x.GetBikesAvailableAsync()).Return(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
             server.Stub(x => x.GetBikesOccupiedAsync()).Return(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
 
-            var result = await new QueryLoggedIn(server, "123", "a@b", ()=> DateTime.Now).GetBikesAndStationsAsync();
+            var result = await new QueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesAndStationsAsync();
 
             Assert.AreEqual(3, result.Response.StationsAll.Count);
             Assert.AreEqual(2, result.Response.Bikes.Count);
@@ -139,9 +140,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
         [Test]
         public async Task TestGetBikesOccupied()
         {
-            var server = MockRepository.GenerateMock<ICopriServer>();
+            var server = Substitute.For<ICopriServer>();
 
-            server.Stub(x => x.GetBikesOccupiedAsync()).Return(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
+            server.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>("{}")));
+
+            server.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
 
             var result = await new QueryLoggedIn(server, "123", "a@b", () => DateTime.Now).GetBikesOccupiedAsync();
 

TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs

@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using TINK.Model;
-using TINK.Repository;
 
 using static TINK.Repository.CopriCallsMemory;
 

TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs

@@ -5,7 +5,7 @@ using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.Connector.Response
 {
-    
+
     [TestFixture]
     public class TestBookingResponse
     {
@@ -33,17 +33,17 @@ namespace TestTINKLib.Fixtures.Connector.Response
         {
             // Create response to check
             var l_oResponse = DoReserve(
-                "8", 
-                "4da3044c8657a04ba60e2eaa753bc51a", 
-                SampleSets.Set2, 
+                "8",
+                "4da3044c8657a04ba60e2eaa753bc51a",
+                SampleSets.Set2,
                 1);
 
             Assert.AreEqual(
-                "4da3044c8657a04ba60e2eaa753bc51aoiF2kahH", 
+                "4da3044c8657a04ba60e2eaa753bc51aoiF2kahH",
                 l_oResponse.authcookie);
 
             Assert.AreEqual(
-                "OK: requested bike 8", 
+                "OK: requested bike 8",
                 l_oResponse.response_state);
 
             Assert.NotNull(

TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs

@@ -4,7 +4,7 @@ using NUnit.Framework;
 
 namespace TINK.Repository.Response
 {
-    
+
     [TestFixture]
     public class TestResponseBase
     {
@@ -35,7 +35,7 @@ namespace TINK.Repository.Response
             Assert.AreEqual(
                 "Response state is \"OhMyState\", " +
                 $"auth cookie is \"lecker1\" and response is \"die Antwort\", " +
-                $"code \"HabGsagt\""+
+                $"code \"HabGsagt\"" +
                 $"response text \"die Antwort\".",
                 l_oResponse.ToString());
         }

TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs

@@ -19,8 +19,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Response
         [Test]
         public void TestGetIsResponseOk_BikesOccupied_AuthcookieNotDefined()
         {
-             var l_oResponseBase = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1003: authcookie not defined\" }}");
-            Assert.Throws<AuthcookieNotDefinedException>(() =>  l_oResponseBase.GetIsResponseOk("Get not succeed"));
+            var l_oResponseBase = JsonConvert.DeserializeObject<ResponseBase>($"{{ \"response_state\" : \"Failure 1003: authcookie not defined\" }}");
+            Assert.Throws<AuthcookieNotDefinedException>(() => l_oResponseBase.GetIsResponseOk("Get not succeed"));
         }
 
 
@@ -59,7 +59,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Response
                 @"""authcookie"" : ""KeksoiF2kahH"" }");
 
             Assert.That(
-                () => l_oResponse.GetIsReturnBikeResponseOk("8"), 
+                () => l_oResponse.GetIsReturnBikeResponseOk("8"),
                 Throws.Exception.TypeOf<InvalidResponseException<ResponseBase>>());
         }
 

TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs

@@ -1,12 +1,11 @@
 using NUnit.Framework;
-using System.Linq;
 using TINK.Model;
 
 using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.Connector
 {
-    
+
     [TestFixture]
     public class TestStationsAllResponse
     {

TestTINKLib/Fixtures/ObjectTests/Connector/TestCommandLoggedIn.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using System;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using Rhino.Mocks;
-using System;
-using System.Threading.Tasks;
 using TINK.Model.Connector;
 using TINK.Repository;
 using TINK.Repository.Exception;
@@ -23,7 +23,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
             var l_oCmd = new CommandLoggedIn(l_oServer, "MeinKeks", "EMehl", () => DateTime.Now);
 
-            LoginStateChangedEventArgs l_oEventArgs = null;        
+            LoginStateChangedEventArgs l_oEventArgs = null;
             l_oCmd.LoginStateChanged += (sender, eventargs) => l_oEventArgs = eventargs;
 
             l_oCmd.DoLogout().Wait();

TestTINKLib/Fixtures/ObjectTests/Connector/TestConnector.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Rhino.Mocks;
-using System;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
@@ -22,6 +22,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             var l_oCommand = new TINK.Model.Connector.Connector(
                 new System.Uri("http://1.2.3.4"),
                 new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                null /*UI language */,
                 "",      // Not logged in
                 "",
                 server: l_oCopri).Command;
@@ -39,7 +40,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
             var l_oCommand = new TINK.Model.Connector.Connector(
                 new System.Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), 
+                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                null /*UI language */,
                 "123",      // Logged in
                 "a@b",
                 server: l_oCopri).Command;
@@ -56,8 +58,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             var l_oCopri = MockRepository.GenerateStub<ICachedCopriServer>();
 
             var l_oQuery = new TINK.Model.Connector.Connector(
-                new System.Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), 
+                new Uri("http://1.2.3.4"),
+                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                null /*UI language */,
                 "",
                 "",
                 server: l_oCopri).Query;
@@ -75,7 +78,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
             var l_oQuery = new TINK.Model.Connector.Connector(
                 new System.Uri("http://1.2.3.4"),
-                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)), 
+                new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                null /*UI language */,
                 "123",
                 "a@b",
                 server: l_oCopri).Query;

TestTINKLib/Fixtures/ObjectTests/Connector/TestConnectorCache.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Rhino.Mocks;
-using System;
 using TINK.Model.Connector;
 using TINK.Repository;
 
@@ -20,7 +20,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             // Construct not logged in version of connector.
             var l_oCommand = new ConnectorCache(
                 new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
-                "",      // Not logged in
+                null /*UI language */,
+                "", // Not logged in
                 "",
                 l_oCopri).Command;
 
@@ -36,7 +37,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
             var l_oCopri = MockRepository.GenerateStub<ICopriServer>();
 
             var l_oCommand = new ConnectorCache(
-                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), 
+                new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+                null /*UI language */,
                 "123",      // Logged in
                 "a@b",
                 l_oCopri).Command;
@@ -54,6 +56,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
             var l_oQuery = new ConnectorCache(
                 new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+                null /*UI language */,
                 "",
                 "",
                 l_oCopri).Query;
@@ -71,6 +74,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
             var l_oQuery = new ConnectorCache(
                 new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+                null /*UI language */,
                 "123",
                 "a@b",
                 l_oCopri).Query;

TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs

@@ -1,16 +1,15 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
+using NUnit.Framework;
 using TINK.Model;
+using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Repository;
 using TINK.Repository.Exception;
-using TINK.Repository.Response;
 using TINK.Repository.Request;
-
+using TINK.Repository.Response;
 using static TINK.Repository.CopriCallsHttps;
-using TINK.Model.Services.CopriApi.ServerUris;
-using System.Reflection;
 
 namespace UITest.Fixtures.Connector
 {
@@ -53,7 +52,7 @@ namespace UITest.Fixtures.Connector
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
         {
-            Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId).DoAuthorization(
+            Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId, null /*UI language */).DoAuthorization(
                 TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
                 password,
                 TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.DeviceId);
@@ -86,7 +85,7 @@ namespace UITest.Fixtures.Connector
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
         {
-            Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId).DoAuthorization(
+            Func<string, string> command = (password) => new RequestBuilder(TinkApp.MerchantId, null /*UI language */).DoAuthorization(
                 TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.Mail,
                 password,
                 TestTINKLib.LoginSessionCopriInfo.JavaministerGibtsNet.DeviceId);
@@ -149,6 +148,7 @@ namespace UITest.Fixtures.Connector
                         url,
                         new RequestBuilderLoggedIn(
                             TinkApp.MerchantId,
+                            null /*UI language */,
                             TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoAuthout(),
                         $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout)}"
                     ).Result.GetIsResponseOk());
@@ -205,7 +205,7 @@ namespace UITest.Fixtures.Connector
                 Assert.Throws<AuthcookieNotDefinedException>(
                     () => DoAuthoutAsync(
                         url,
-                        new RequestBuilderLoggedIn(TinkApp.MerchantId, l_oLoginResponse.authcookie).DoAuthout(),
+                        new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, l_oLoginResponse.authcookie).DoAuthout(),
                         $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout_NotLoggedIn)}").Result.GetIsResponseOk());
             }
             finally
@@ -261,6 +261,7 @@ namespace UITest.Fixtures.Connector
                             url,
                             new RequestBuilderLoggedIn(
                                 TinkApp.MerchantId,
+                                null /*UI language */,
                                 TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).DoAuthout(),
                             $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestLogout_AuthcookieUnknown)}"
                         ).Result.response_state);
@@ -300,17 +301,18 @@ namespace UITest.Fixtures.Connector
             Assert.NotNull(bikesReference);
             var bikeReference = bikesReference.FirstOrDefault().Value;
             Assert.That(
-                bikeReference, 
+                bikeReference,
                 Is.Not.Null,
                 $"Prerequisites are not matched: No bikes available from server {url} returned but at least one bike for verification required.");
 
             // Verify list of bikes returned from first device
             var request = new RequestBuilderLoggedIn(
                 TinkApp.MerchantId,
+                null /*UI language */,
                 TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesAvailable();
-            
+
             var bikes = GetBikesAvailableAsync(
-                url, 
+                url,
                 request).Result.bikes;
 
             Assert.That(
@@ -320,23 +322,23 @@ namespace UITest.Fixtures.Connector
 
             var bike = bikes.FirstOrDefault().Value;
             Assert.That(
-                bike, 
+                bike,
                 Is.Not.Null,
                 "Response on GetBikesAvailableCall must contain at leas one bike.");
 
             // Check if entries are valid.
             Assert.Greater(
-                bike.description.Length, 
-                0, 
+                bike.description.Length,
+                0,
                 "Bike despcription must never be empty.");
 
             Assert.That(
-                bike.bike, 
-                Is.Not.Null, 
+                bike.bike,
+                Is.Not.Null,
                 "Bike index must never be null");
 
             Assert.AreEqual(
-                "available", 
+                "available",
                 bike.state,
                 "Bike state must be available");
         }
@@ -367,7 +369,7 @@ namespace UITest.Fixtures.Connector
                 $"Prerequisites are not matched: No bikes available from server {url} returned but at least one bike for verification required.");
 
             // Verify list of bikes returned from first device
-            var request = new RequestBuilder(TinkApp.MerchantId).GetBikesAvailable();
+            var request = new RequestBuilder(TinkApp.MerchantId, null /*UI language */).GetBikesAvailable();
 
             var bikes = GetBikesAvailableAsync(
                 url,
@@ -387,8 +389,8 @@ namespace UITest.Fixtures.Connector
 
             // Check if entries are valid.
             Assert.Greater(
-                bike.description.Length, 
-                0, 
+                bike.description.Length,
+                0,
                 "Bike despcription must never be empty.");
 
             Assert.That(
@@ -397,7 +399,7 @@ namespace UITest.Fixtures.Connector
                 "Bike index must never be null");
 
             Assert.AreEqual(
-                "available", 
+                "available",
                 bike.state,
                 "Bike state must be available");
         }
@@ -440,7 +442,7 @@ namespace UITest.Fixtures.Connector
             var l_oBookingResponse = DoReserveAsync(
                 CopriServerUriList.DevelopUri.AbsoluteUri,
                 new RequestBuilderLoggedIn(
-                    TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
+                    TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
 
             try
             {
@@ -502,6 +504,7 @@ namespace UITest.Fixtures.Connector
                 CopriServerUriList.DevelopUri.AbsoluteUri,
                 new RequestBuilderLoggedIn(
                     TinkApp.MerchantId,
+                    null /*UI language */,
                     TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).DoReserve(l_oBikeId)).Result;
 
             try
@@ -552,9 +555,9 @@ namespace UITest.Fixtures.Connector
                 var bike = bikesAvailable.ToArray()[0].Value;
 
                 l_oBookingResponse = CopriCallsHttpsReference.DoReserveCall(
-                    bike.uri_operator + "/APIjsonserver", 
-                    TinkApp.MerchantId, 
-                    bike.bike, 
+                    bike.uri_operator + "/APIjsonserver",
+                    TinkApp.MerchantId,
+                    bike.bike,
                     TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
 
                 Assert.That(l_oBookingResponse.GetIsResponseOk("Testing cotext"),
@@ -567,8 +570,8 @@ namespace UITest.Fixtures.Connector
             Assert.NotNull(l_oBike, "Response on GetBikesOccupiedCall of must contain at least one bike.");
 
             l_oBookingResponse = GetBikesOccupiedAsync(
-                url, 
-                new RequestBuilderLoggedIn(TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesOccupied(),
+                url,
+                new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetBikesOccupied(),
                 $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesOccupiedCall_SomeRequestedBooked)}").Result;
 
             // Check first entry.
@@ -579,7 +582,7 @@ namespace UITest.Fixtures.Connector
             Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
             Assert.That(l_oBike.bike, Is.Not.Null, "Bike index must not be null.");
             Assert.That(
-                l_oBike.station, 
+                l_oBike.station,
                 Is.Not.Null,
                 "Station index must never be null");
             Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
@@ -608,15 +611,15 @@ namespace UITest.Fixtures.Connector
             [Values(CopriServerUriList.SHAREE_DEVEL, CopriServerUriList.SHAREE_LIVE)] string url)
 #endif
         {
-            var request = new RequestBuilderLoggedIn(TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).GetBikesOccupied();
-            
+            var request = new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerKeksGibtsNet.AuthCookie).GetBikesOccupied();
+
             var l_oBookingResponse = GetBikesOccupiedAsync(
-                url, 
+                url,
                 request,
                 $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetBikesOccupiedCall_KeksGibtsNet)}").Result;
 
             Assert.AreEqual(
-                "Failure 1001: authcookie on primary not defined", 
+                "Failure 1001: authcookie on primary not defined",
                 l_oBookingResponse.response_state); // Up to 2020-12-05 COPRI returned: "Failure 1003: authcookie not defined"
         }
 
@@ -647,7 +650,7 @@ namespace UITest.Fixtures.Connector
                 "Prerequisites are not matched: There are no stations.");
 
             // Verify implementation
-            var l_oStationsAll = GetStationsAsync(url, new RequestBuilder(TinkApp.MerchantId).GetStations()).Result;
+            var l_oStationsAll = GetStationsAsync(url, new RequestBuilder(TinkApp.MerchantId, null /*UI language */).GetStations()).Result;
             Assert.NotNull(l_oStationsAll?.stations);
             Assert.Greater(l_oStationsAll.stations.Count, 0);
         }
@@ -674,13 +677,13 @@ namespace UITest.Fixtures.Connector
 #endif
         {
             var stationsAll = GetStationsAsync(
-                url, 
-                new RequestBuilderLoggedIn(TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetStations(),
+                url,
+                new RequestBuilderLoggedIn(TinkApp.MerchantId, null /*UI language */, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie).GetStations(),
                 $"{Assembly.GetAssembly(GetType()).GetName().Name}-{GetType().Name}-{nameof(TestGetStationsAllCall_LoggedIn)}").Result;
-            
+
             Assert.NotNull(stationsAll?.stations);
             Assert.That(
-                stationsAll.stations.Count, 
+                stationsAll.stations.Count,
                 Is.GreaterThan(0),
                 $"There must be at least one station.");
         }

TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs

@@ -1,14 +1,14 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using TINK.Repository;
 using TINK.Repository.Response;
 using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.Connector.Request
 {
-    
+
     [TestFixture]
     public class TestCopriCallsMemory
     {
@@ -17,7 +17,7 @@ namespace TestTINKLib.Fixtures.Connector.Request
         {
             foreach (SampleSets l_oSampleSet in Enum.GetValues(typeof(SampleSets)))
             {
-                var l_oCopri = new CopriCallsMemory(l_oSampleSet, 1, "4da3044c8657a04ba60e2eaa753bc51a");
+                var l_oCopri = new CopriCallsMemory("MyMerchId", l_oSampleSet, 1, "4da3044c8657a04ba60e2eaa753bc51a");
 
                 for (var l_iStageIndex = 1; l_iStageIndex <= l_oCopri.StagesCount; l_iStageIndex++)
                 {
@@ -47,7 +47,7 @@ namespace TestTINKLib.Fixtures.Connector.Request
             foreach (var l_oBike in l_oBikesAvailable.bikes.Values)
             {
                 Assert.IsFalse(
-                    l_oChecker.Keys.Contains(l_oBike.bike), 
+                    l_oChecker.Keys.Contains(l_oBike.bike),
                     string.Format(
                         "Bike form available bikes with id {0} already exist in dictionary. Sample set is {1}, stage index {2}.",
                         l_oBike.bike,

TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsStatic.cs

@@ -40,7 +40,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
             Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
             Assert.AreEqual(l_oBike.bike, "26");
             Assert.That(
-                l_oBike.station, 
+                l_oBike.station,
                 Is.EqualTo("4"),
                 "Station index must never be negative");
             Assert.AreEqual("available", l_oBike.state);

TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model.Services.CopriApi.ServerUris;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
@@ -39,7 +39,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
         [Test]
         public void TestConstruct_AryStringString_InvalidList()
         {
-            Assert.Throws<ArgumentException>( () => new CopriServerUriList(
+            Assert.Throws<ArgumentException>(() => new CopriServerUriList(
                 (new List<Uri>()).ToArray(),
                 new Uri("http://2.3.4.5")));
         }
@@ -57,7 +57,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
         public void TestDefaultActiveUri()
         {
             Assert.AreEqual(
-                "https://shareeapp-primary.copri.eu/APIjsonserver", 
+                "https://shareeapp-primary.copri.eu/APIjsonserver",
                 CopriServerUriList.DefaultActiveUri.AbsoluteUri,
                 "In production environment, server address must always be app.tink-konstanz.de/APIjsonserver.");
         }

TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs

@@ -1,11 +1,11 @@
-using NUnit.Framework;
+using System;
 using System.Collections.Generic;
-using TINK.Model.Connector;
 using System.Linq;
-using TINK.Repository;
-using TestFramework.Repository;
-using System;
 using NSubstitute;
+using NUnit.Framework;
+using TestFramework.Repository;
+using TINK.Model.Connector;
+using TINK.Repository;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
@@ -19,6 +19,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
         {
             var connector = new ConnectorCache(
                 new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+                        null /*UI language */,
                         string.Empty,
                         string.Empty,
                         new CopriCallsMemory001());
@@ -54,6 +55,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
         {
             var l_oConnector = new ConnectorCache(
                 new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+                        null /*UI language */,
                         string.Empty,
                         string.Empty,
                         new CopriCallsMemory001());

TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model.Logging;
 
 namespace TestTINKLib.Fixtures.ObjectTests
@@ -14,7 +14,7 @@ namespace TestTINKLib.Fixtures.ObjectTests
             Assert.Throws<ArgumentException>(
                 () => new LoggingDirectoryManager(
                     (name) => new List<string> { "2018_02_06_22_18_00" /* oldest */, "2018_02_06_23_10_00" /*youngest*/ , "2018_02_06_22_19_00", "2018_02_06_22_20_00" },
-                    (name) =>  false,
+                    (name) => false,
                     (name) => { },
                     (name) => { },
                     "abc",

TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.ViewModel.Map;
@@ -23,9 +23,9 @@ namespace UITest.Fixtures.ObjectTests.Map
 
             Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oFilter.CurrentFilter);
 
-            l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{ FilterHelper.CITYBIKE}", FilterState.On } }));
+            l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CITYBIKE}", FilterState.On } }));
 
-            Assert.AreEqual($"HOM_{ FilterHelper.CITYBIKE}", l_oFilter.CurrentFilter);
+            Assert.AreEqual($"HOM_{FilterHelper.CITYBIKE}", l_oFilter.CurrentFilter);
         }
 
         [Test]
@@ -35,7 +35,7 @@ namespace UITest.Fixtures.ObjectTests.Map
 
             Assert.IsFalse(l_oFilter.IsToggleVisible);
 
-            l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{ FilterHelper.CITYBIKE}", FilterState.On } }));
+            l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CITYBIKE}", FilterState.On } }));
 
             Assert.IsTrue(l_oFilter.IsToggleVisible);
         }

TestTINKLib/Fixtures/ObjectTests/Model/Repository/Request/TestRequestBuilderLoggedIn.cs

@@ -1,124 +0,0 @@
-using NUnit.Framework;
-using System;
-using TINK.Repository.Request;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Model.Repository.Request
-{
-    [TestFixture]
-    public class TestRequestBuilderLoggedIn
-    {
-        [Test]
-        public void TestUpateLockingStateGeolocationIsNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, null, 15.03),
-                Is.EqualTo("request=booking_update&bike=12&lock_state=locked&voltage=15.03&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestUpateLockingStateGeolocationIsNullBatteryPercentageIsNAN()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, null, double.NaN),
-                Is.EqualTo("request=booking_update&bike=12&lock_state=locked&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestUpateLockingStateGeolocation_AccuraycyNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), 12),
-                Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_age=0.07&lock_state=locked&voltage=12&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestUpateLockingStateGeolocation_AccuraycyNullBatteryPercentageIsNAN()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), double.NaN),
-                Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_age=0.07&lock_state=locked&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestUpateLockingStateGeolocation()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.UpateLockingState("12", lock_state.locked, new LocationDto.Builder { Latitude = 21, Longitude = 17, Accuracy = 5.7, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(), 98),
-                Is.EqualTo("request=booking_update&bike=12&gps=21,17&gps_accuracy=5.7&gps_age=0.07&lock_state=locked&voltage=98&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestDoReturnGeolocationIsNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoReturn("12", null, null),
-                Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&lock_state=locked"));
-        }
-
-        [Test]
-        public void TestDoReturnGeolocation_AccuraycyNull()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoReturn(
-                    "12", 
-                    new LocationDto.Builder { Latitude = 21, Longitude = 17, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(),
-                    null),
-                Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&gps=21,17&gps_age=0.07&lock_state=locked"));
-        }
-
-        [Test]
-        public void TestDoReturnGeolocation()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoReturn(
-                    "12", 
-                    new LocationDto.Builder { Latitude = 21, Longitude = 17, Accuracy = 5.7, Age = new TimeSpan(0, 0, 0, 0, 70) }.Build(),
-                    null),
-                Is.EqualTo("request=booking_update&bike=12&authcookie=MySessionCookieMyMeranctIt&state=available&gps=21,17&gps_accuracy=5.7&gps_age=0.07&lock_state=locked"));
-        }
-
-        [Test]
-        public void TestDoSubmitFeedback_Ok()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("Radl22"),
-                Is.EqualTo("request=user_feedback&bike=Radl22&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestDoSubmitFeedback_BikeBroken()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("Cycle33", isBikeBroken: true),
-                Is.EqualTo("request=user_feedback&bike=Cycle33&bike_broken=1&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestDoSubmitFeedback_Message()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("Mühle", "Uno due tre"),
-                Is.EqualTo("request=user_feedback&bike=Mühle&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
-        }
-
-        [Test]
-        public void TestDoSubmitFeedback_ErrorMessage()
-        {
-            var builder = new RequestBuilderLoggedIn("MyMeranctIt", "MySessionCookie");
-            Assert.That(
-                builder.DoSubmitFeedback("bike12","Uno due tre", true),
-                Is.EqualTo("request=user_feedback&bike=bike12&bike_broken=1&message=Uno+due+tre&authcookie=MySessionCookieMyMeranctIt"));
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestBookingDeclinedException.cs

@@ -10,7 +10,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Repository.Exception
         public void TestIsBookingDeclined()
         {
             const string responseText = "OK: BOOKING_REQUEST declined. Max count of 8 occupied bikes has been reached";
-            
+
             BookingDeclinedException exception = null;
 
             Assert.That(() => BookingDeclinedException.IsBookingDeclined(responseText, out exception),

TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNoGPSDataException.cs

@@ -1,9 +1,4 @@
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using TINK.Repository.Exception;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Repository.Exception

TestTINKLib/Fixtures/ObjectTests/Repository/Exception/TestNotAtStationException.cs

@@ -13,7 +13,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Repository.Exception
 
             NotAtStationException exception = null;
 
-            Assert.That(() => NotAtStationException.IsNotAtStation(responseText, out exception), 
+            Assert.That(() => NotAtStationException.IsNotAtStation(responseText, out exception),
                 Is.EqualTo(true));
 
             Assert.That(() => exception.StationNr,

TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System.Linq;
+using System.Linq;
 using System.Text;
+using NUnit.Framework;
 using TINK.Services.BluetoothLock.Crypto;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
@@ -23,7 +23,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
             // Decrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
             var acces_key = (new sbyte[] { 19, -66, 55, 18, -106, -92, 70, -40, 117, -87, -19, 124, 19, 54, -18, -82 }).Select(x => (byte)x).ToArray();
 
-            var decrypt = new  Cipher().Decrypt(keyCopri, seedLockEnc);
+            var decrypt = new Cipher().Decrypt(keyCopri, seedLockEnc);
 
             Assert.IsTrue(acces_key.SequenceEqual(decrypt));
         }
@@ -51,7 +51,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
 
             var result = crypto.GetSeedLock();
 
-            Assert.IsTrue(seedLockDec.SequenceEqual(result)); 
+            Assert.IsTrue(seedLockDec.SequenceEqual(result));
         }
 
 

TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockItBaseService.cs

@@ -1,13 +1,13 @@
-using NSubstitute;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NSubstitute;
 using NUnit.Framework;
 using Plugin.BLE.Abstractions.Contracts;
-using System;
-using System.Threading.Tasks;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.BluetoothLock.BLE;
+using TINK.Services.BluetoothLock.Exception;
+using TINK.Services.BluetoothLock.Tdo;
 using DeviceState = Plugin.BLE.Abstractions.DeviceState;
-using System.Threading;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock
 {
@@ -68,10 +68,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock
         [Test]
         public void TestAuth()
         {
-            var authTdo = new LockInfoAuthTdo.Builder { 
-                Id = 12, 
-                K_seed = new byte[] { (byte)'c', (byte)'b', (byte)'z', (byte)'b', (byte)'y', (byte)'I', (byte)'q', (byte)'j', (byte)'v', (byte)'L', (byte)'V', (byte)'I', (byte)'t', (byte)'C', (byte)'B', (byte)'I' }, 
-                K_u = new byte[16] 
+            var authTdo = new LockInfoAuthTdo.Builder
+            {
+                Id = 12,
+                K_seed = new byte[] { (byte)'c', (byte)'b', (byte)'z', (byte)'b', (byte)'y', (byte)'I', (byte)'q', (byte)'j', (byte)'v', (byte)'L', (byte)'V', (byte)'I', (byte)'t', (byte)'C', (byte)'B', (byte)'I' },
+                K_u = new byte[16]
             }.Build();
 
             var device = Rhino.Mocks.MockRepository.GenerateStub<IDevice>();

TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs

@@ -1,10 +1,12 @@
-using System.Linq;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
-using TINK.Model.Bike;
+using TINK.Model.Bikes;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 using TINK.Services.BluetoothLock;
 using TINK.Services.BluetoothLock.Tdo;
-using System;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Service.LockService
 {
@@ -16,10 +18,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.Service.LockService
         {
             var service = new LocksServiceInReach();
 
-            var bikes = new BikeCollection(new Dictionary<string, TINK.Model.Bike.BC.BikeInfo>() 
+            var bikes = new BikeCollection(new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>()
                 {
-                    { "42",  new TINK.Model.Bike.BluetoothLock.BikeInfo("42", 1, new Guid(),new byte[] { 1, 4 }, new byte[] { 3, 4 }, new byte[] { 3, 4 }, DateTime.Now, "a@b", "1" , null /*operator uri*/) },
-                    { "43",  new TINK.Model.Bike.BluetoothLock.BikeInfo("43", 3, new Guid(),new byte[] { 4, 4 }, new byte[] { 4, 7 }, new byte[] { 5, 4 }, DateTime.Now, "c@b", "1" , null /*operator uri*/) }
+                    { "42",  new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), 1, new Guid(),new byte[] { 1, 4 }, new byte[] { 3, 4 }, new byte[] { 3, 4 }, DateTime.Now, "a@b", "1" , null /*operator uri*/) },
+                    { "43",  new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("43", LockModel.ILockIt), new Drive(), 3, new Guid(),new byte[] { 4, 4 }, new byte[] { 4, 7 }, new byte[] { 5, 4 }, DateTime.Now, "c@b", "1" , null /*operator uri*/) }
                 }
             );
 

TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs

@@ -1,11 +1,8 @@
-using NSubstitute;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using TINK.Model.Device;
 using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.BLE;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services
 {

TestTINKLib/Fixtures/ObjectTests/Services/TestServicesContainerMutable.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Services;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Services
@@ -11,26 +11,26 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services
         [Test]
         public void TestCtor()
         {
-            var container = new ServicesContainerMutable<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
+            var container = new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
             Assert.That(container.Active.GetType().FullName, Is.EqualTo("TestTINKLib.Fixtures.ObjectTests.Services.TestServicesContainerMutable+B"));
         }
 
         [Test]
         public void TestCtorExceptionDupes()
         {
-            Assert.That(() => new ServicesContainerMutable<object>(new List<object> { new A(), new B(), new A() }, typeof(B).FullName), Throws.InstanceOf<Exception>());
+            Assert.That(() => new ServicesContainerMutableT<object>(new List<object> { new A(), new B(), new A() }, typeof(B).FullName), Throws.InstanceOf<Exception>());
         }
 
         [Test]
         public void TestCtorExceptionActiveNotFound()
         {
-            Assert.That(() => new ServicesContainerMutable<object>(new List<object> { new A(), new B() }, "C"), Throws.InstanceOf<ArgumentException>());
+            Assert.That(() => new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, "C"), Throws.InstanceOf<ArgumentException>());
         }
 
         [Test]
         public void TestSetActive()
         {
-            var container = new ServicesContainerMutable<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
+            var container = new ServicesContainerMutableT<object>(new List<object> { new A(), new B() }, typeof(B).FullName);
             container.SetActive(typeof(A).FullName);
             Assert.That(container.Active.GetType().FullName, Is.EqualTo("TestTINKLib.Fixtures.ObjectTests.Services.TestServicesContainerMutable+A"));
         }

TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs

@@ -1,13 +1,13 @@
-using NSubstitute;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NSubstitute;
 using NUnit.Framework;
 using Plugin.BLE.Abstractions;
 using Plugin.BLE.Abstractions.Contracts;
-using System;
-using System.Threading.Tasks;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.BluetoothLock.BLE;
-using System.Threading;
+using TINK.Services.BluetoothLock.Exception;
+using TINK.Services.BluetoothLock.Tdo;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Settings.BluetoothLock
 {
@@ -21,7 +21,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Settings.BluetoothLock
             var adapter = Substitute.For<IAdapter>();
             var ciper = Substitute.For<TINK.Model.Device.ICipher>();
 
-            var authInfo = new LockInfoAuthTdo.Builder { 
+            var authInfo = new LockInfoAuthTdo.Builder
+            {
                 K_seed = new byte[] { 0 },
                 K_u = new byte[] { 1 }
             }.Build();
@@ -90,7 +91,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Settings.BluetoothLock
 
             Assert.That(
                 execption.InnerExceptions[0].Message,
-                Does.Contain ("Seed 122,68,71,120,113,77,102,65,70,113,103,78,86,114,78,89 was already used."));
+                Does.Contain("Seed 122,68,71,120,113,77,102,65,70,113,103,78,86,114,78,89 was already used."));
 
         }
 

TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.ViewModel.Settings;
@@ -13,7 +13,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Settings
         [Test]
         public void TestDoFilter()
         {
-            var l_oFilter = new GroupFilterSettings(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CITYBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On }, { "HOM_117025", FilterState.On} });
+            var l_oFilter = new GroupFilterSettings(new Dictionary<string, FilterState> { { $"HOM_{FilterHelper.CITYBIKE}", FilterState.Off }, { $"HOM_{FilterHelper.CARGOBIKE}", FilterState.On }, { "HOM_117025", FilterState.On } });
 
             var l_oResult = l_oFilter.DoFilter(new List<string> { $"HOM_{FilterHelper.CITYBIKE}", $"HOM_{FilterHelper.CARGOBIKE}" });
 

TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System;
+using System;
+using NUnit.Framework;
 using TINK.Settings;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Settings

TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs

@@ -1,8 +1,6 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using TINK.Model;
 using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Settings;
 using TINK.ViewModel.Map;
@@ -31,7 +29,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Settings
             Assert.AreEqual(PollingParameters.Default, settings.PollingParameters);
 
             Assert.IsTrue(
-                settings.CenterMapToCurrentLocation, 
+                settings.CenterMapToCurrentLocation,
                 "Center to map for sharee.bike because bt- locks require location info.");
         }
 

TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs

@@ -1,11 +1,11 @@
-using NUnit.Framework;
-using System;
+using System;
+using NUnit.Framework;
 using TINK.Model.State;
 
 
 namespace TestTINKLib
 {
-    
+
     [TestFixture]
     public class TestStateBookedInfo
     {

TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs

@@ -4,7 +4,7 @@ using TINK.Model.State;
 
 namespace TestTINKLib
 {
-    
+
     [TestFixture]
     public class TestStateDisposableInfo
     {

TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoMutable.cs

@@ -1,13 +1,13 @@
-using NUnit.Framework;
-using Rhino.Mocks;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
+using Rhino.Mocks;
 using TINK.Model.State;
 
 
 namespace TestTINKLib
 {
-    
+
     [TestFixture]
     public class TestStateInfo
     {
@@ -31,7 +31,7 @@ namespace TestTINKLib
             var l_oSource = MockRepository.GenerateStub<IStateInfo>();
             l_oSource.Stub(x => x.Value).Return(InUseStateEnum.Disposable);
 
-            var l_oState = new StateInfoMutable(p_oState: l_oSource);
+            var l_oState = new StateInfoMutable(state: l_oSource);
 
             Assert.AreEqual(InUseStateEnum.Disposable, l_oState.Value);
             Assert.IsNull(l_oState.RemainingTime);
@@ -84,9 +84,9 @@ namespace TestTINKLib
             // Update state from Copri.
             l_oStateInfo.Load(
                 InUseStateEnum.Reserved, // Copri acknowledges state reserved.
-                l_oDateTimeMock.GetDateTime(), 
+                l_oDateTimeMock.GetDateTime(),
                 "heiz@mustermann"); // Owner from Copri.
-                
+
             // Invoke first update (after simulated 4mns)
             l_oStateInfo.UpdateOnTimeElapsed();
             Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value);
@@ -123,7 +123,7 @@ namespace TestTINKLib
             l_oStateInfo.Load(InUseStateEnum.Reserved, FROM, "heiz@mustermann", "22");
 
             // Verify initial values of properties.
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value); 
+            Assert.AreEqual(InUseStateEnum.Reserved, l_oStateInfo.Value);
             Assert.AreEqual("Reserved", l_oStateInfo.ToString());
             Assert.AreEqual(new TimeSpan(0, 15, 0).Subtract(l_oNowMock().Subtract(FROM)).Minutes, l_oStateInfo.RemainingTime.Value.Minutes);
             Assert.AreEqual(FROM, l_oStateInfo.From);
@@ -137,7 +137,7 @@ namespace TestTINKLib
             Assert.AreEqual("Disposable", l_oStateInfo.ToString());
             Assert.IsNull(l_oStateInfo.RemainingTime);
             Assert.IsNull(l_oStateInfo.From);
-            Assert.IsNull( l_oStateInfo.MailAddress);
+            Assert.IsNull(l_oStateInfo.MailAddress);
             Assert.IsNull(l_oStateInfo.Code);
         }
 
@@ -154,9 +154,9 @@ namespace TestTINKLib
 
             // Construct requested state object.
             var l_oSource = new StateInfo(
-                () => new DateTime(2018, 01, 03, 21, 53, 0), 
+                () => new DateTime(2018, 01, 03, 21, 53, 0),
                 new DateTime(2018, 01, 03, 21, 13, 0), // Requested from
-                "a@b", 
+                "a@b",
                 "123");
             l_oState.Load(l_oSource);
             Assert.AreEqual(InUseStateEnum.Reserved, l_oState.Value);

TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs

@@ -1,12 +1,12 @@
-using Newtonsoft.Json;
+using System;
+using Newtonsoft.Json;
 using NUnit.Framework;
-using System;
 using TINK.Model.State;
 
 
 namespace TestTINKLib.Fixtures.State
 {
-    
+
     [TestFixture]
     public class TestStateInfoSerializeJSON
     {
@@ -33,8 +33,8 @@ namespace TestTINKLib.Fixtures.State
                         }
                     }";
                 Assert.AreEqual(
-					TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-					TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+                    TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+                    TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
             }
 
             {
@@ -87,8 +87,8 @@ namespace TestTINKLib.Fixtures.State
             });
 
             Assert.AreEqual(
-				TestHelper.PrepareXmlForStringCompare(EXPECTED).Replace("\n", string.Empty).Replace("\r", string.Empty),
-				TestHelper.PrepareXmlForStringCompare(l_oDetected).Replace("\n", string.Empty).Replace("\r", string.Empty));
+                TestHelper.PrepareXmlForStringCompare(EXPECTED).Replace("\n", string.Empty).Replace("\r", string.Empty),
+                TestHelper.PrepareXmlForStringCompare(l_oDetected).Replace("\n", string.Empty).Replace("\r", string.Empty));
 
             // Deserialize object an verify state.
             var l_oStateTarget = JsonConvert.DeserializeObject<StateInfoMutable>(l_oDetected, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.Auto });
@@ -136,8 +136,8 @@ namespace TestTINKLib.Fixtures.State
                 }";
 
                 Assert.AreEqual(
-					TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-					TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+                    TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+                    TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
             }
 
             {
@@ -194,8 +194,8 @@ namespace TestTINKLib.Fixtures.State
                 }";
 
                 Assert.AreEqual(
-					TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-					TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
+                    TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
+                    TestHelper.PrepareXmlForStringCompare(l_strJSONDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
             }
 
             {

TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfo.cs

@@ -1,12 +1,12 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model.State;
 
 
 namespace TestTINKLib
 {
-    
+
     [TestFixture]
     public class TestStateRequestedInfo
     {
@@ -40,19 +40,19 @@ namespace TestTINKLib
         public void TestConstruct_FromWebserver()
         {
             Assert.AreEqual(
-                InUseStateEnum.Reserved, 
-                new StateRequestedInfo(() => new DateTime(2017,09, 20), new DateTime(2017, 09, 19), "a@b", "372").Value);
+                InUseStateEnum.Reserved,
+                new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").Value);
 
             Assert.AreEqual(
                 "a@b",
                 new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").MailAddress);
-  
+
             Assert.AreEqual(
-                "372", 
+                "372",
                 new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").Code);
 
             Assert.AreEqual(
-                new DateTime(2017,09, 19), 
+                new DateTime(2017, 09, 19),
                 new StateRequestedInfo(() => new DateTime(2017, 09, 20), new DateTime(2017, 09, 19), "a@b", "372").From);
 
             Assert.IsTrue(
@@ -67,7 +67,7 @@ namespace TestTINKLib
         public void TestTryUpdateOnTimeElapsed()
         {
             var l_oReservedAt = new DateTime(2017, 09, 20, 22, 01, 00);
-            var l_oDateTimeMock = new DateTimeMocker( new List<DateTime> {
+            var l_oDateTimeMock = new DateTimeMocker(new List<DateTime> {
                 l_oReservedAt.Add(new TimeSpan(0, 4, 0)),    // Reserved for 4 mns
                 l_oReservedAt.Add(new TimeSpan(0, 16, 0))   // Time elapsed since booking 16 mns
                 });

TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs

@@ -1,12 +1,12 @@
-using Newtonsoft.Json;
+using System;
+using Newtonsoft.Json;
 using NUnit.Framework;
-using System;
 using TINK.Model.State;
 
 
 namespace TestTINKLib.Fixtures.State
 {
-    
+
     [TestFixture]
     public class TestStateReInquestedfoSerializeJSON
     {

TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System.Linq;
+using System.Linq;
+using NUnit.Framework;
 using TINK.Model.Station;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Station

TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs

@@ -1,19 +1,19 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using TINK.Model;
 
 namespace TestTINKLib.Fixtures.Station
 {
-    
+
     [TestFixture]
     public class TestStation
     {
         [Test]
         public void TestConstruct()
         {
-            var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1,2), "Hallo");
+            var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), "Hallo");
             Assert.AreEqual("7", l_oStation.Id);
             Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
             Assert.AreEqual(1, l_oStation.Position.Latitude);

TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model;
 using TINK.ViewModel.Map;
 
@@ -11,7 +11,7 @@ namespace TestTINKLib.Fixtures.ObjectTests
         [Test]
         public void TestGetGroup()
         {
-            var l_oFilterColl = new GroupFilterMapPage( new Dictionary<string, FilterState>
+            var l_oFilterColl = new GroupFilterMapPage(new Dictionary<string, FilterState>
             {
                 { "TINK", FilterState.On },
                 { "Konrad", FilterState.On }

TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Settings;
 
@@ -110,15 +110,15 @@ namespace TestTINKLib.Fixtures.ObjectTests
         [Test]
         public void Test_ToString_Emtpy()
         {
-			Assert.AreEqual("{}", FilterCollectionStore.ToString(new Dictionary<string, FilterState>()));
+            Assert.AreEqual("{}", FilterCollectionStore.ToString(new Dictionary<string, FilterState>()));
         }
 
-		[Test]
+        [Test]
         public void Test_ToString()
         {
-			Assert.AreEqual(
-				"{(Test1= Off), (Test2= On)}", 
-				FilterCollectionStore.ToString(new Dictionary<string, FilterState> { { "Test1", FilterState.Off}, {"Test2", FilterState.On}}));
+            Assert.AreEqual(
+                "{(Test1= Off), (Test2= On)}",
+                FilterCollectionStore.ToString(new Dictionary<string, FilterState> { { "Test1", FilterState.Off }, { "Test2", FilterState.On } }));
         }
-}
+    }
 }

TestTINKLib/Fixtures/ObjectTests/TestJsonSettingsDictionary.cs

@@ -1,126 +0,0 @@
-using NUnit.Framework;
-using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using TINK.Model.Settings;
-using TINK.Settings;
-
-namespace TestTINKLib.Fixtures.ObjectTests
-{
-    [TestFixture]
-    public class TestJsonSettingsDictionary
-    {
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetCopriHostUri_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetCopriHostUri(new Dictionary<string, string>()));
-        }
-
-        /// <summary> Verifies that empty log file leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetPolling()
-        {
-            // Serialize parameters.
-            var l_oDict = new Dictionary<string, string>()
-                .SetPollingParameters(new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false));
-
-            // Deserialize parameters.
-            Assert.AreEqual(
-                new PollingParameters(new TimeSpan(0, 0, 0, 15, 0), false),
-                l_oDict.GetPollingParameters());
-        }
-
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetPolling_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetPollingParameters(new Dictionary<string, string>()));
-        }
-
-        [Test]
-        public void TestGetGetCopriHostUri()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetCopriHostUri("http://1.2.3.4");
-            Assert.AreEqual(
-                new Uri("http://1.2.3.4"),
-                JsonSettingsDictionary.GetCopriHostUri(l_oDict));
-        }
-
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetLoggingLevel()
-        {
-            var l_oDictionary = new Dictionary<string, string>()
-                .SetMinimumLoggingLevel(0); // Verbose = 0
-            Assert.AreEqual(
-                LogEventLevel.Verbose,
-                JsonSettingsDictionary.GetMinimumLoggingLevel(l_oDictionary)); // LogEventLevel.Error = 4
-        }
-
-        /// <summary> Verifies that empty log fiel leads to expected default value and doesn not throw exceptions.</summary>
-        [Test]
-        public void TestGetLoggingLevel_NoFile()
-        {
-            Assert.IsNull(JsonSettingsDictionary.GetMinimumLoggingLevel(new Dictionary<string, string>()));
-        }
-
-        [Test]
-        public void TestGetAppVersion_FirstInstall()
-        {
-            var l_oDict = new Dictionary<string, string> ();
-            Assert.IsNull(JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
-
-        [Test]
-        public void TestGetAppVersion_LegacyTo115()
-        {
-            var l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3.9" } };
-            Assert.AreEqual(new Version(7,2,3,9), JsonSettingsDictionary.GetAppVersion(l_oDict));
-
-            l_oDict = new Dictionary<string, string> { { "AppVersion", "7.2.3" } };
-            Assert.AreEqual(new Version(7, 2, 3), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
-
-        [Test]
-        public void TestGetAppVersion_Json()
-        {
-            var l_oDict = new Dictionary<string, string> { { "AppVersion", "\"3.1.2.117\"" } };
-            Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
-
-        [Test]
-        public void TestSetAppVersion_Json()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetAppVersion(new Version(47, 12, 3));
-            Assert.AreEqual(new Version(47, 12, 3),  JsonSettingsDictionary.GetAppVersion(l_oDict));
-        }
-
-        [Test]
-        public void TestGetShowWhatsNew_FirstInstall()
-        {
-            var l_oDict = new Dictionary<string, string>();
-            Assert.IsNull(JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
-
-        [Test]
-        public void TestGetShowWhatsNew_Json()
-        {
-            var l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2.117\"" } };
-            Assert.AreEqual(new Version(3, 1, 2, 117), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-
-            l_oDict = new Dictionary<string, string> { { "ShowWhatsNew", "\"3.1.2\"" } };
-            Assert.AreEqual(new Version(3, 1, 2), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
-
-        [Test]
-        public void TestSetShowWhats_Json()
-        {
-            var l_oDict = new Dictionary<string, string>()
-                .SetWhatsNew(new Version(47, 12, 3));
-            Assert.AreEqual(new Version(47, 12, 3), JsonSettingsDictionary.GetWhatsNew(l_oDict));
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/TestWhatsNew.cs

@@ -1,76 +0,0 @@
-using NUnit.Framework;
-using System;
-using TINK.Model;
-
-namespace TestTINKLib.Fixtures.ObjectTests
-{
-    [TestFixture]
-    public class TestWhatsNew
-    {
-        [Test]
-        public void TestIsShowRequired_CleanInstall()
-        {
-            Assert.IsFalse(new WhatsNew(
-                new Version(2, 4), /* Current version */
-                null, // last version
-                null               /* Whats new was never shown */ ).IsShowRequired);
-        }
-
-        [Test]
-        public void TestIsShowRequired_Update_VersionWhichSupporsWhatsNew()
-        {
-            Assert.IsTrue(
-                new WhatsNew(
-                    new Version(2, 5), /* Current version */
-                    new Version(2, 3), /* last version */
-                    new Version(2, 1)  /* Version when whats new was shown */ ).IsShowRequired,
-                "If whats new was last shonw for version 2.1 and current version is 2.5 info must be shown");
-        }
-
-
-        [Test]
-        public void TestIsShowRequired_Update_VersionWithoutWhatsNew()
-        {
-            Assert.IsTrue(
-                new WhatsNew(
-                    new Version(2, 5), /* Current version */
-                    new Version(2, 3), /* last version */
-                    null  /* Whats new was never shown */ ).IsShowRequired,
-                "If whats new was never shown but last version was 2.3 (not clean install) info must be shown");
-        }
-
-        [Test]
-        public void TestIsShowRequired_False()
-        {
-            Assert.IsFalse(
-                new WhatsNew(new Version(2, 5), new Version(2, 5), new Version(2, 5)).IsShowRequired,
-                "Whats new must never be presented twice.");
-        }
-
-        [Test]
-        public void TestIsShowRequired_False_Errors()
-        {
-            Assert.IsFalse(new WhatsNew(null, new Version(2,6),  new Version(2, 5)).IsShowRequired);
-            Assert.IsFalse(new WhatsNew(new Version(2, 6), null, new Version(2, 5)).IsShowRequired);
-            Assert.IsFalse(new WhatsNew(null, null, new Version(2, 5)).IsShowRequired);
-        }
-
-        [Test]
-        public void TestWhatsNewText_MajorUpdate()
-        {
-            Assert.AreEqual(
-                "<p><b>3.0.0.115</b><br/>Benutzeroberfläche verbessert.\r\n\r\n" +
-                "</p><p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                new WhatsNew(new Version(3, 0, 120), new Version(3, 0, 0, 114), new Version(3, 0, 0, 114)).WhatsNewText,
-                "Current version is 30.0.120, last whats new was shown in version 3.0.0.114: Two changes to be notified about.");
-        }
-
-        [Test]
-        public void TestWhatsNewText_MinorUpdate()
-        {
-            Assert.AreEqual(
-                "<p><b>3.0.120</b><br/>Verbesserung: Keine Fehler mehr beim schnellen Tippen.\r\nOfflineanzeige Stationen/ Räderinfo.\r\n\r\n</p>",
-                new WhatsNew(new Version(3, 0, 120), new Version(3, 0, 0, 115), new Version(3, 0, 0, 115)).WhatsNewText);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs

@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 
 namespace UITest.Fixtures.ObjectTests.User.Account
 {
@@ -32,10 +32,10 @@ namespace UITest.Fixtures.ObjectTests.User.Account
         public void TestConstruct_Copy()
         {
             var account = new TINK.Model.User.Account.Account(new TINK.Model.User.Account.Account(
-                "a@b", 
-                "112", 
+                "a@b",
+                "112",
                 true, // Agbs have been acknowledged 
-                "3330", 
+                "3330",
                 new List<string> { "Honkey", "Tonkey" },
                 TINK.Model.User.Account.Permissions.None));
 

TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccountExtensions.cs

@@ -1,7 +1,7 @@
-using NUnit.Framework;
-using Rhino.Mocks;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
+using Rhino.Mocks;
 using TINK.Model.Connector;
 using TINK.Model.User.Account;
 
@@ -18,7 +18,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.User.Account
 
             l_oAccount.Stub((x) => x.Mail).Return("a@b");
             l_oAccount.Stub((x) => x.SessionCookie).Return(""); // User is not logged in
-            l_oAccount.Stub((x) => x.Group).Return(new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", "HOM_117025" }); 
+            l_oAccount.Stub((x) => x.Group).Return(new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", "HOM_117025" });
 
             var l_oSource = new List<string> { $"HOM_{FilterHelper.CARGOBIKE}", $"HOM_{FilterHelper.CITYBIKE}", "HOM_117025" };
 

TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs

@@ -4,7 +4,7 @@ using TINK.Model.User.Account;
 
 namespace TestTINKLib
 {
-    
+
     [TestFixture]
     public class TestValidator
     {

TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs

@@ -1,15 +1,13 @@
-using NUnit.Framework;
-using TINK.Model.User;
-using TINK.Model.Connector;
-
-using TINK.Model.User.Account;
+using System;
 using System.Collections.Generic;
-using TINK.Repository;
-
-using static TINK.Repository.CopriCallsMemory;
-using TestFramework.Model.User.Account;
-using System;
 using System.Threading.Tasks;
+using NUnit.Framework;
+using TestFramework.Model.User.Account;
+using TINK.Model.Connector;
+using TINK.Model.User;
+using TINK.Model.User.Account;
+using TINK.Repository;
+using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib
 {
@@ -72,9 +70,10 @@ namespace TestTINKLib
         {
             var l_oConnector = new ConnectorCache(
                     new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+                    null /*UI language */,
                     string.Empty,
                     string.Empty,
-                    new CopriCallsMemory(SampleSets.Set2, 1));
+                    new CopriCallsMemory("MyMerchId", SampleSets.Set2, 1));
 
             var l_oStoreMock = new StoreMock(); // Account without user name, password and cookie
 
@@ -86,9 +85,9 @@ namespace TestTINKLib
             Assert.IsFalse(l_oUser.IsLoggedIn);
             Assert.IsNull(l_oUser.Mail);
 
-            IAccount  l_oAccount = l_oConnector.Command.DoLogin(
-                LoginSessionCopriInfo.JavaministerHardwareNr1.Mail, 
-                LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd, 
+            IAccount l_oAccount = l_oConnector.Command.DoLogin(
+                LoginSessionCopriInfo.JavaministerHardwareNr1.Mail,
+                LoginSessionCopriInfo.JavaministerHardwareNr1.Pwd,
                 l_oUser.DeviceId).Result;
 
             await l_oUser.Login(l_oAccount);

TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs

@@ -1,30 +1,29 @@
-using NUnit.Framework;
-using Rhino.Mocks;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using TINK.Model;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.View;
-using TINK.Model.Services.CopriApi;
-using TINK.Repository;
-
-using static TINK.Repository.CopriCallsMemory;
-using TINK.ViewModel.Map;
-using TINK.ViewModel.Settings;
-using TINK.ViewModel.Account;
-using TINK.Services;
-using TINK.Services.Geolocation;
 using NSubstitute;
+using NUnit.Framework;
+using Plugin.BLE.Abstractions.Contracts;
+using Rhino.Mocks;
 using TestFramework.Model.Device;
-using TestFramework.Repository;
-using TestFramework.Model.User.Account;
 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;
+using TINK.Repository;
+using TINK.Repository.Exception;
+using TINK.Services;
+using TINK.Services.Geolocation;
 using TINK.Services.Permissions;
-using Plugin.BLE.Abstractions.Contracts;
+using TINK.View;
+using TINK.ViewModel.Account;
+using TINK.ViewModel.Map;
+using TINK.ViewModel.Settings;
+using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Account
 {
@@ -33,6 +32,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
         [Test]
         public void TestConstruct_NotLoggedIn()
         {
+            const string MERCH_ID = "MyMerchId";
+
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -44,8 +45,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(),
                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
                 locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
@@ -53,6 +54,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -74,6 +76,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
         [Test]
         public async Task TestConstruct()
         {
+            const string MERCH_ID = "MyMerchId";
+
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -85,8 +89,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "UnknownCookie", new List<string> { "TINK" })),
                                                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
                 locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
@@ -94,6 +98,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -127,7 +132,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
                                                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -136,6 +141,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -168,7 +174,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
                                                 isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -177,6 +183,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null, // Offline
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -210,17 +217,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "6103_112e96b36ba33de245943c5ffaf369cd_", new List<string> { "TINK" })),
                                                 isConnectedFunc: () => false,
                 connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-uri,
-new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-sessionCookie,
-mail,
-server: new CopriProviderHttps(
-uri,
-TinkApp.MerchantId,
-new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-sessionCookie: sessionCookie,
-cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+                    uri,
+                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                    null /*UI language */,
+                    sessionCookie,
+                    mail,
+                    server: new CopriProviderHttps(
+                        uri,
+                        TinkApp.MerchantId,
+                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                        null /*UI language */,
+                        sessionCookie: sessionCookie,
+                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+                        httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -229,6 +238,7 @@ httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, ne
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null, // Offline
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 

TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs

@@ -1,462 +0,0 @@
-using NSubstitute;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.Bikes.Bike.BluetoothLock;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.Exception;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.Geolocation;
-using TINK.Model.State;
-using TINK.View;
-using TINK.ViewModel;
-using TINK.ViewModel.Bikes;
-using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
-using TINK.Model.User;
-using TINK.Model.Device;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
-{
-    [TestFixture]
-    public class TestBookedDisconnected
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new BookedDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        [Test]
-        public void TestNotSupported()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify that nothing happened because request is not supported.
-            Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked open
-        /// </summary>
-        [Test]
-        public void TestSearch()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Open }.Build()));
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("Tst")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting with lock!", "Internet must be reachable to connect to lock of rented bike.\r\nContext info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting with lock!", "Communication error during lock search.\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => { throw new OutOfReachException(); });
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when connecting with lock!",
-                    "Lock can only be found when rented bike is nearby.",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-            public void TestSearchConnectFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => throw new Exception("Exception message.") );
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Error when connecting with lock!",
-                    "Lock of rented bike cannot be be connected right now.", 
-                    "",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Booked unknown
-        /// </summary>
-        [Test]
-        public void TestSearchConnectNotOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new BookedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(new LockInfoTdo.Builder { State = null }.Build());
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting with lock!", "Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("BookedDisconnected", handler.ButtonText);
-            Assert.IsFalse(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs

@@ -1,590 +0,0 @@
-using NSubstitute;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.Bikes.Bike.BluetoothLock;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.Exception;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.Geolocation;
-using TINK.Model.State;
-using TINK.View;
-using TINK.ViewModel;
-using TINK.ViewModel.Bikes;
-using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
-using TINK.Model.User;
-using TINK.Model.Device;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
-{
-    [TestFixture]
-    public class TestDisposableDisconnected
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new DisposableDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Reserve bike", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", handler.LockitButtonText);
-            Assert.IsFalse(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(false));
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnect()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(),Arg.Any<TimeSpan>())
-                .Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Closed }.Build())); // Return lock state indicating success
-
-            locks.TimeOut.Returns(timeOuts);
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectReserveFailsBookingDeclinedException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Hint", string.Format("A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/ rentals had already been made.", 0, 7), "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectReserveFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Verbingungsfehler beim Reservieren des Rads!", "Context info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectReserveFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Fehler beim Reservieren des Rads!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectConnectOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>()).Returns<LockInfoTdo>(x => throw new OutOfReachException());
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Lock out of reach";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectConnectException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>()).Returns<LockInfoTdo>(x => throw new Exception("Exception message."));
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Lock not found";
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Reserve bike.
-        /// Final state: Reserved unknown.
-        /// </summary>
-        [Test]
-        public void TestReserveAndConnectConnectStateUnknown()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new DisposableDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Reserve bike Nr. 0 free of charge for 15 min?", "Yes", "No").Returns(Task.FromResult(true));
-
-            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.UnknownFromHardwareError); // Connect did not throw an exception but lock state is still unknown.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reserving bike...";
-                connector.Command.DoReserve(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        [Test]
-        public void TestNotsupported()
-        {
-            var handler = new DisposableDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs

@@ -1,442 +0,0 @@
-using NSubstitute;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.Bikes.Bike.BluetoothLock;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.Exception;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.Geolocation;
-using TINK.Model.State;
-using TINK.View;
-using TINK.ViewModel;
-using TINK.ViewModel.Bikes;
-using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
-using TINK.Model.User;
-using TINK.Model.Device;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
-{
-    [TestFixture]
-    public class TestDisposableOpen
-    {
-
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new DisposableOpen (
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Rent bike or close lock", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual(nameof(DisposableOpen), handler.LockitButtonText);
-            Assert.IsFalse(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Disposable Closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLock()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
-
-            locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseLockCloseFailsOutOfReachExcption()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
-
-            locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual(nameof(DisposableDisconnected), subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseLockCloseFailsExcption()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
-
-            locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual(nameof(DisposableDisconnected), subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Booked Open.
-        /// </summary>
-        [Test]
-        public void TestDoBook()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Disposabled Closed.
-        /// </summary>
-        [Test]
-        public void TestDoBookDoBookFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
-
-            connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
-
-            locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when renting the bike!", 
-                    string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI available/ mobile networt available and mobile data activated / ... ?"),  
-                    "OK");
-                bikesViewModel.ActionText = "Verschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Lock bike.
-        /// Final state: Disposabled Closed.
-        /// </summary>
-        [Test]
-        public void TestDoBookDoBookFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new DisposableOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
-
-            connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
-
-            locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Verschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs

@@ -1,752 +0,0 @@
-using NSubstitute;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.Bikes.Bike.BluetoothLock;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.Exception;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.Geolocation;
-using TINK.Model.State;
-using TINK.View;
-using TINK.ViewModel;
-using TINK.ViewModel.Bikes;
-using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
-using Newtonsoft.Json;
-using TINK.Repository.Response;
-using TINK.Model.User;
-using TINK.Model.Device;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
-{
-    public class TestReservedDisconnected
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new ReservedDisconnected(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: User deceide to abort cancelling (user is ased whether to really cancel)
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationCancel()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(false));
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No");
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Final state: Disposable.
-        /// </summary>
-        [Test]
-        public void TestCancelReservation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Exception is thrown.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationInvalidAuthorizationResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            var l_oResponse = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
-                {
-                      ""response"" : ""authorization"",
-                      ""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
-                      ""user_group"" : [ ""TINK"", ""Konrad"" ],
-                      ""response_state"" : ""OK"",
-                      ""apiserver"" : ""https://tinkwwp.copri-bike.de""
-                   }");
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Fehler beim Aufheben der Reservierung!", "Kann Benutzer mustermann@server.de nicht anmelden. Mailadresse unbekannt oder Passwort ungültig.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Canceling reservation fails.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Verbingungsfehler beim Aufheben der Reservierung!", "Context info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Cancel reservation.
-        /// Comment: Canceling reservation fails.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCancelReservationDoCancelReservationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, string.Format("Cancel reservation for bike {0}?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike); // Booking must be performed
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Fehler beim Aufheben der Reservierung!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: reserved closed
-        /// </summary>
-        [Test]
-        public void TestSearch()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(Task.FromResult(new LockInfoTdo.Builder { State = LockitLockingState.Closed }.Build()));
-
-            locks.TimeOut.Returns(timeOuts);
-
-            viewService.DisplayAlert(string.Empty, string.Format("Rent bike {0} and open lock?", "Nr. 0"), "Yes", "No").Returns(Task.FromResult(true));
-
-            locks[0].OpenAsync()
-                .Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
-
-            bike.State.Value.Returns(InUseStateEnum.Booked); // Booking call leads to setting of state to booked.
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); // Booking must be performed
-                bikesViewModel.ActionText = "Opening lock...";
-                locks.Received()[0].OpenAsync(); // Lock must be opened
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Updating lock state...";
-                connector.Command.UpdateLockingStateAsync(bike, null);
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting to lock!", "Internet must be reachable to connect to lock of reserved bike.\r\nContext info.\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchCalculateAuthKeysFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            connector.Command.CalculateAuthKeys(bike).Returns(x => throw new Exception("Exception message."));
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-            bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting to lock!", "Communication error during lock search.\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => { throw new OutOfReachException(); });
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Error when connecting to lock!",
-                    "Lock can only be found when reserved bike is nearby.", 
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchConnectFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns<Task<LockInfoTdo>>(x => throw new Exception("Execption message."));
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAdvancedAlert(
-                    "Error when connecting to lock!", 
-                    "Lock of reserved bike can not be found.",
-                    "",
-                    "Retry",
-                    "Cancel");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Search.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestSearchConnectNotOpen()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-            var timeOuts = Substitute.For<ITimeOutProvider>();
-
-            var handler = new ReservedDisconnected(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>())
-                .Returns(new LockInfoTdo.Builder { State = null }.Build());
-            locks.TimeOut.Returns(timeOuts);
-
-            bike.State.Value.Returns(InUseStateEnum.Booked);
-
-            var subsequent = handler.HandleRequestOption2().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Request server...";
-                connector.Command.CalculateAuthKeys(bike);
-                bikesViewModel.ActionText = "Searching lock...";
-                locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when connecting to lock!", "Lock status of the reserved bike could not be determined.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Search lock", handler.LockitButtonText);
-            Assert.IsTrue(handler.IsLockitButtonVisible);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs

@@ -1,671 +0,0 @@
-using Newtonsoft.Json;
-using NSubstitute;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.Bikes.Bike.BluetoothLock;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.Repository.Response;
-using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.Exception;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Services.Geolocation;
-using TINK.Model.State;
-using TINK.View;
-using TINK.ViewModel;
-using TINK.ViewModel.Bikes;
-using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
-using TINK.Model.User;
-using TINK.Model.Device;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
-{
-    [TestFixture]
-    public class TestReservedOpen
-    {
-        /// <summary>
-        /// Test construction of object.
-        /// </summary>
-        [Test]
-        public void Testctor()
-        {
-            var handler = new ReservedOpen(
-                Substitute.For<IBikeInfoMutable>(),
-                () => true, // isConnectedDelegate
-                (isConnexted) => Substitute.For<IConnector>(),
-                Substitute.For<IGeolocation>(),
-                Substitute.For<ILocksService>(),
-                () => Substitute.For<IPollingUpdateTaskManager>(),
-                Substitute.For<ISmartDevice>(),
-                Substitute.For<IViewService>(),
-                Substitute.For<IBikesViewModel>(),
-                Substitute.For<IUser>());
-
-            // Verify prerequisites.
-            Assert.AreEqual("Rad zurückgeben oder mieten", handler.ButtonText);
-            Assert.IsTrue(handler.IsButtonVisible);
-            Assert.AreEqual("Alarm/ Sounds verwalten", handler.LockitButtonText);
-            Assert.IsFalse(handler.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: User books bike.
-        /// Final state: Booked.
-        /// </summary>
-        [Test]
-        public void TestBook()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            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.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike); 
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Close lock & return bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: User books bike.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestBookBookFailsWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(), 
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
-
-            connector.Command.DoBook(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
-
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Connection error when renting the bike!", 
-                    string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI available/ mobile networt available and mobile data activated / ... ?"),
-                    "OK");
-                bikesViewModel.ActionText = "Wiederverschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: User books bike.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestBookBookFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(), 
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
-
-            connector.Command.DoBook(bike).Returns(x => throw new Exception("Exception message."));
-
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Reading charging level...";
-                locks[0].GetBatteryPercentageAsync();
-                bikesViewModel.ActionText = "Renting bike...";
-                connector.Command.DoBook(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
-                bikesViewModel.ActionText = "Wiederverschließe Schloss...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Booked.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservation()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(), 
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "Disconnecting lock...";
-                locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved open.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCloseFailsOutOfReachException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(), 
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty, 
-                "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", 
-                "Zurückgeben", 
-                "Mieten").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(x => { throw new OutOfReachException(); });
-
-            bike.State.Value.Returns(InUseStateEnum.Reserved); // Reqesthandler factory queries state to create appropriate request handler object.
-            bike.LockInfo.State.Returns(LockingState.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Lock can not be closed!",
-                    "Lock cannot be closed until bike is near.\r\nPlease try again to close bike or report bike to support!", 
-                    "OK");
-
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Same as initial state.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCloseFailsException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(
-                string.Empty, 
-                "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", 
-                "Zurückgeben", 
-                "Mieten").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync()
-                .Returns<Task<LockitLockingState?>>(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.Open);
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert(
-                    "Lock can not be closed!", 
-                    "Please try to lock again or report bike to support!\r\nException message.", 
-                    "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
-            Assert.IsTrue(subsequent.IsButtonVisible);
-            Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-            Assert.IsTrue(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCancelReservationInvalidAuthorizationResponseException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            var response = JsonConvert.DeserializeObject<AuthorizationResponse>(@"
-            {
-                  ""response"" : ""authorization"",
-                  ""authcookie"" : ""4da3044c8657a04ba60e2eaa753bc51a"",
-                  ""user_group"" : [ ""TINK"", ""Konrad"" ],
-                  ""response_state"" : ""OK"",
-                  ""apiserver"" : ""https://tinkwwp.copri-bike.de""
-               }");
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new InvalidAuthorizationResponseException("mustermann@server.de", response));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Fehler beim Aufheben der Reservierung!", "Kann Benutzer mustermann@server.de nicht anmelden. Mailadresse unbekannt oder Passwort ungültig.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("InvalidState", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCancelReservationWebConnectFailureException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("chub")));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Verbingungsfehler beim Aufheben der Reservierung!", "Context info\r\nIs WIFI available/ mobile networt available and mobile data activated / ... ?", "OK");                
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("InvalidState", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-
-        /// <summary>
-        /// Use case: Close lock and cancel reservation.
-        /// Final state: Reserved closed.
-        /// </summary>
-        [Test]
-        public void TestCloseLockAndCancelReservationCancelReservationException()
-        {
-            var bike = Substitute.For<IBikeInfoMutable>();
-            var connector = Substitute.For<IConnector>();
-            var command = Substitute.For<ICommand>();
-            var geolocation = Substitute.For<IGeolocation>();
-            var locks = Substitute.For<ILocksService>();
-            var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-            var viewService = Substitute.For<IViewService>();
-            var bikesViewModel = Substitute.For<IBikesViewModel>();
-            var activeUser = Substitute.For<IUser>();
-
-            var handler = new ReservedOpen(
-                bike,
-                () => true, // isConnectedDelegate
-                (isConnexted) => connector,
-                geolocation,
-                locks,
-                () => pollingManager,
-                Substitute.For<ISmartDevice>(),
-                viewService,
-                bikesViewModel,
-                activeUser);
-
-            bike.Id.Returns("0");
-
-            viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
-
-            locks[0].CloseAsync().Returns(LockitLockingState.Closed);
-
-            connector.Command.DoCancelReservation(bike).Returns(x => throw new Exception("Exception message.", new Exception("chub")));
-
-            bike.State.Value.Returns(InUseStateEnum.Disposable); // Reqesthandler factory queries state to create appropriate request handler object.
-
-            var subsequent = handler.HandleRequestOption1().Result;
-
-            locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-            // Verify behaviour
-            Received.InOrder(() =>
-            {
-                bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-                bikesViewModel.ActionText = "One moment please...";
-                pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-                bikesViewModel.ActionText = "Closing lock...";
-                locks[0].CloseAsync();
-                bikesViewModel.ActionText = "Canceling reservation...";
-                connector.Command.DoCancelReservation(bike);
-                bikesViewModel.ActionText = "";
-                viewService.DisplayAlert("Fehler beim Aufheben der Reservierung!", "Exception message.", "OK");
-                bikesViewModel.ActionText = "Updating...";
-                pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-                bikesViewModel.ActionText = "";
-                bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-            });
-
-            // Verify state after action
-            Assert.AreEqual("InvalidState", subsequent.ButtonText);
-            Assert.IsFalse(subsequent.IsButtonVisible);
-            Assert.AreEqual("InvalidState", subsequent.LockitButtonText);
-            Assert.IsFalse(subsequent.IsLockitButtonVisible);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs

@@ -1,10 +1,12 @@
-using NUnit.Framework;
-using Rhino.Mocks;
-using System;
+using System;
 using System.Collections.Generic;
+using NUnit.Framework;
+using Rhino.Mocks;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Services.BluetoothLock;
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 using TINK.Model.Device;
 using TINK.Model.State;
 using TINK.Model.User;
@@ -25,7 +27,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
         {
             // Verify handler for disposable bike.
             var bike = new BikeInfoMutable(
-                new BikeInfo("22", 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12"),
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12"),
                 "My Station Name");
             Assert.AreEqual(InUseStateEnum.Disposable, bike.State.Value);
             Assert.AreEqual(LockingState.UnknownDisconnected, bike.LockInfo.State);
@@ -45,7 +47,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
             // Verify handler for requested bike with state unknown.
             bike = new BikeInfoMutable(
-                new BikeInfo("22", 0 /* lock Id */, new Guid(), /*K User*/ null, /*K Admin*/ null, /*K Seed*/  null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>(), TINK.Model.Bike.WheelType.Mono, TINK.Model.Bike.TypeOfBike.Allround),
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id */, new Guid(), /*K User*/ null, /*K Admin*/ null, /*K Seed*/  null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
                 "My Station Name");
             Assert.AreEqual(
                 typeof(ReservedDisconnected),
@@ -63,7 +65,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
             // Verify handler for requested bike with state closed.
             bike = new BikeInfoMutable(
-                new BikeInfo("22", 0 /* lock Id*/, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>(), TINK.Model.Bike.WheelType.Mono, TINK.Model.Bike.TypeOfBike.Allround), 
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
                 "My Station Name");
             bike.LockInfo.State = LockingState.Closed;
             Assert.AreEqual(
@@ -82,7 +84,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
             // Verify handler for requested bike with state open.
             bike = new BikeInfoMutable(
-                new BikeInfo("22", 0 /* lock Id*/, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>(), TINK.Model.Bike.WheelType.Mono, TINK.Model.Bike.TypeOfBike.Allround),
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null /* user key */, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
                 "My Station Name");
             bike.LockInfo.State = LockingState.Open;
             Assert.AreEqual(
@@ -101,7 +103,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
             // Verify handler for booked bike with state closed.
             bike = new BikeInfoMutable(
-                new BikeInfo("22", 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>(), TINK.Model.Bike.WheelType.Mono, TINK.Model.Bike.TypeOfBike.Allround), 
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
                 "My Station Name");
             bike.LockInfo.State = LockingState.Closed;
             Assert.AreEqual(
@@ -120,7 +122,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
             // Verify handler for booked bike with state open.
             bike = new BikeInfoMutable(
-                new BikeInfo("22", 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>(), TINK.Model.Bike.WheelType.Mono, TINK.Model.Bike.TypeOfBike.Allround), 
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
                 "My Station Name");
             bike.LockInfo.State = LockingState.Open;
             Assert.AreEqual(
@@ -139,14 +141,14 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
             // Verify handler for booked bike with state unknown.
             bike = new BikeInfoMutable(
-                new BikeInfo("22", 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>(), TINK.Model.Bike.WheelType.Mono, TINK.Model.Bike.TypeOfBike.Allround), 
+                new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
                 "My Station Name");
-            
+
             Assert.AreEqual(
                 typeof(BookedDisconnected),
                 RequestHandlerFactory.Create(
-                    bike, 
-                    ()=> false, // isConnectedDelegate
+                    bike,
+                    () => false, // isConnectedDelegate
                     (connected) => null, // connectorFactory
                     new GeolocationMock(), // geolocation
                     new LocksServiceMock(), // LockService

TestTINKLib/Fixtures/ObjectTests/ViewModel/CopriWebView/TestManageAccountViewModel.cs

@@ -1,16 +0,0 @@
-using NUnit.Framework;
-using TINK.ViewModel.Login;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.CopriWebView
-{
-    [TestFixture]
-    public class TestManageAccountViewModel
-    {
-        [Test]
-        public void TestUrl()
-        {
-            var viewModel = new ManageAccountViewModel("Keks", "Merchant", "Hosti");
-            Assert.AreEqual("https://Hosti?sessionid=KeksMerchant", viewModel.Uri);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/CopriWebView/TestPasswordForgottonViewModel.cs

@@ -1,30 +0,0 @@
-using NUnit.Framework;
-using TINK.ViewModel.CopriWebView;
-
-namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.CopriWebView
-{
-    [TestFixture]
-    public class TestPasswordForgottonViewModel
-    {
-        [Test]
-        public void TestUrl()
-        {
-            var viewModel = new PasswordForgottonViewModel("Merchant", "Hosti");
-            Assert.AreEqual("https://Hosti/app/Account?sessionid=Merchant", viewModel.Uri);
-        }
-
-        [Test]
-        public void TestUrl_TINKLive()
-        {
-            var viewModel = new PasswordForgottonViewModel("Merchant", "app.tink-konstanz.de");
-            Assert.AreEqual("https://app.tink-konstanz.de/tinkapp/Account?sessionid=Merchant", viewModel.Uri);
-        }
-
-        [Test]
-        public void TestUrl_TINK()
-        {
-            var viewModel = new PasswordForgottonViewModel("Merchant", "tinkwwp.copri-bike.de");
-            Assert.AreEqual("https://tinkwwp.copri-bike.de/tinkapp/Account?sessionid=Merchant", viewModel.Uri);
-        }
-    }
-}

TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs

@@ -9,7 +9,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Info
         [Test]
         public void TestOnAppearing()
         {
-            var viewModel = new InfoPageViewModel("Hosti", "agbResourcePath", "privacyResourcePath", "impressResourcePath", false, (url) => string.Empty);
+            var viewModel = new InfoPageViewModel("Hosti", "agbResourcePath", "privacyResourcePath", "impressResourcePath", false, "de", (url) => string.Empty);
         }
     }
 }

TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageFilter.cs

@@ -1,12 +1,11 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model;
-
 using TINK.ViewModel.Map;
 namespace UITest.Fixtures.ObjectTests.ViewModel.Map
 {
-    
-     [TestFixture]
+
+    [TestFixture]
     public class TestMapPageViewModel
     {
         /// <summary>
@@ -130,7 +129,7 @@ namespace UITest.Fixtures.ObjectTests.ViewModel.Map
         {
             var l_oDict = GroupFilterMapPageHelper.CreateUpdated(
                 new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),  // Last map page filter (Konrad was still available but off)
-                null);                  
+                null);
 
             Assert.AreEqual(2, l_oDict.Count, "Do not apply any filter if filter value null is detected.");
             Assert.IsTrue(l_oDict.ContainsKey("TINK"));
@@ -150,7 +149,7 @@ namespace UITest.Fixtures.ObjectTests.ViewModel.Map
         {
             var l_oFilter = new TinkKonradToggleViewModel(new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }));
 
-            l_oFilter =  new TinkKonradToggleViewModel(l_oFilter.FilterDictionary). DoToggle();
+            l_oFilter = new TinkKonradToggleViewModel(l_oFilter.FilterDictionary).DoToggle();
 
             Assert.AreEqual("Konrad", l_oFilter.CurrentFilter);
 

TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs

@@ -1,28 +1,28 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TINK.Model;
-using TINK.Model.Connector;
-using TINK.Repository.Exception;
-using TINK.Model.Services.CopriApi;
-using TINK.View;
-using TINK.ViewModel.Map;
-using Xamarin.Forms;
-using TINK.ViewModel.Settings;
-using TINK.Services.Geolocation;
-using TINK.Services;
 using NSubstitute;
-using TINK.Services.Permissions;
-using TestFramework.Services.BluetoothLock;
+using NUnit.Framework;
+using Plugin.BLE.Abstractions.Contracts;
+using TestFramework.Model.Device;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Model.User.Account;
-using TestFramework.Model.Device;
 using TestFramework.Repository;
+using TestFramework.Services.BluetoothLock;
 using TestFramework.Services.CopriApi.Connector;
+using TINK.Model;
+using TINK.Model.Connector;
+using TINK.Model.Services.CopriApi;
 using TINK.Repository;
-using Plugin.BLE.Abstractions.Contracts;
+using TINK.Repository.Exception;
+using TINK.Services;
+using TINK.Services.Geolocation;
+using TINK.Services.Permissions;
+using TINK.View;
+using TINK.ViewModel.Map;
+using TINK.ViewModel.Settings;
+using Xamarin.Forms;
 
 namespace TestShareeLib.UseCases.Startup
 {
@@ -44,7 +44,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)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -53,6 +53,7 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -67,7 +68,7 @@ namespace TestShareeLib.UseCases.Startup
             var viewModel = new MapPageViewModel(
                 tinkApp,
                 locationPermission,
-                Substitute.For<Plugin.BLE.Abstractions.Contracts.IBluetoothLE>(),
+                Substitute.For<IBluetoothLE>(),
                 Substitute.For<IGeolocation>(),
                 (mapspan) => { },
                 viewService,
@@ -123,7 +124,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)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -132,6 +133,7 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -199,7 +201,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)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -208,6 +210,7 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
 
@@ -257,7 +260,7 @@ namespace TestShareeLib.UseCases.Startup
         }
 
         [Test]
-        public  async Task TestConstruct_TinkOnly()
+        public async Task TestConstruct_TinkOnly()
         {
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
@@ -270,7 +273,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)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -279,8 +282,9 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
-                lastVersion: new Version(3, 0, 173)); 
+                lastVersion: new Version(3, 0, 173));
 
             var viewService = Substitute.For<IViewService>();
             var navigationService = Substitute.For<INavigation>();
@@ -341,7 +345,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)), sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory001(sessionCookie)),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -350,6 +354,7 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
 
@@ -392,7 +397,7 @@ namespace TestShareeLib.UseCases.Startup
                 Assert.AreEqual(Color.Gray, viewModel.KonradColor, "Konrad bikes are shown.");
 
 
-                Assert.AreEqual("Offline.",  viewModel.StatusInfoText);
+                Assert.AreEqual("Offline.", viewModel.StatusInfoText);
             }
             finally
             {
@@ -415,18 +420,20 @@ namespace TestShareeLib.UseCases.Startup
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(),
                 isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-     uri,
-     new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-     sessionCookie,
-     mail,
-     server: new CopriProviderHttps(
-         uri,
-         TinkApp.MerchantId,
-         new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-         sessionCookie: sessionCookie,
-         cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-         httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new Connector(
+                    uri,
+                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                    null /*UI language */,
+                    sessionCookie,
+                    mail,
+                    server: new CopriProviderHttps(
+                        uri,
+                        TinkApp.MerchantId,
+                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                        null /*UI language */,
+                        sessionCookie: sessionCookie,
+                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+                        httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -435,6 +442,7 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
 
@@ -501,18 +509,20 @@ namespace TestShareeLib.UseCases.Startup
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(),
                 isConnectedFunc: () => false,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-     uri,
-     new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-     sessionCookie,
-     mail,
-     server: new CopriProviderHttps(
-         uri,
-         TinkApp.MerchantId,
-         new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-         sessionCookie: sessionCookie,
-         cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-         httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new Connector(
+                    uri,
+                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                    null /*UI language */,
+                    sessionCookie,
+                    mail,
+                    server: new CopriProviderHttps(
+                        uri,
+                        TinkApp.MerchantId,
+                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                        null /*UI language */,
+                        sessionCookie: sessionCookie,
+                        cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
+                        httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
                 merchantId: "MyMerchId",
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -521,6 +531,7 @@ namespace TestShareeLib.UseCases.Startup
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to 
 
@@ -561,7 +572,7 @@ namespace TestShareeLib.UseCases.Startup
 
                 // Verify buttons
                 Assert.IsTrue(viewModel.IsToggleVisible, "TINK and Konrad are activated in settings.");
-                Assert.AreEqual(Color.Blue , viewModel.TinkColor, "TINK bikes are hidden.");
+                Assert.AreEqual(Color.Blue, viewModel.TinkColor, "TINK bikes are hidden.");
 
                 Assert.AreEqual(Color.Gray, viewModel.KonradColor, "Konrad bikes are shown.");
 

TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using NUnit.Framework;
 using TINK.Model;
 using TINK.ViewModel.Settings;
 

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System;
+using System;
+using NUnit.Framework;
 using TINK.ViewModel;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
@@ -10,10 +10,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
         [Test]
         public void TestGetReservedInfo()
         {
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 minutes expired."));
+            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 min. expired."));
             Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(null, code: "Code123"), Is.Not.Null);
             Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(3), code: "Code123"), Is.Not.Null);
-            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(60)), Is.EqualTo("Still 1 minutes reserved."));
+            Assert.That(new BikeAtStationInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(60)), Is.EqualTo("Still 1 min. reserved."));
         }
 
         [Test]

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs

@@ -1,18 +1,17 @@
-using NUnit.Framework;
-using System;
-using TINK.Model.Bike;
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Rhino.Mocks;
+using TestFramework.Model.User.Account;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS;
+using TINK.Model.Device;
+using TINK.Model.State;
 using TINK.Model.User;
 using TINK.Model.User.Account;
 using TINK.ViewModel;
-
-using Xamarin.Forms;
-using TINK.Model.State;
-using Rhino.Mocks;
-using System.Collections.Generic;
-
 using TINK.ViewModel.Bikes;
-using TINK.Model.Device;
-using TestFramework.Model.User.Account;
+using Xamarin.Forms;
 
 namespace UITest.Fixtures.ViewModel
 {
@@ -20,7 +19,7 @@ namespace UITest.Fixtures.ViewModel
     [TestFixture]
     public class TestBikeAtStationViewModel
     {
-        private class BikeInfoMutable : TINK.Model.Bike.BC.BikeInfoMutable
+        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
         {
             public BikeInfoMutable(
                 string id,
@@ -34,7 +33,17 @@ namespace UITest.Fixtures.ViewModel
                 string stationName = null,
                 Uri operatorUri = null,
                 Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(id, lockModel, isDemo, group, wheelType, typeOfBike, description, stationId, stationName, operatorUri, null, dateTimeProvider, stateInfo)
+                IStateInfo stateInfo = null) : base(
+                    new Bike(id, lockModel, wheelType, typeOfBike, description),
+                    new Drive(),
+                    isDemo,
+                    group,
+                    stationId,
+                    stationName,
+                    operatorUri,
+                    null,
+                    dateTimeProvider,
+                    stateInfo)
             {
             }
         }
@@ -65,8 +74,8 @@ namespace UITest.Fixtures.ViewModel
                 null,
                 NSubstitute.Substitute.For<ISmartDevice>(),
                 null,
-                l_oBike, 
-                l_oUser, 
+                l_oBike,
+                l_oUser,
                 new MyBikeInUseStateInfoProvider(),
                 MockRepository.GenerateStub<IBikesViewModel>(),
                 url => { });
@@ -92,13 +101,13 @@ namespace UITest.Fixtures.ViewModel
                     null,
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null,
-                    bike, 
-                    user, 
+                    bike,
+                    user,
                     new BikeAtStationInUseStateInfoProvider(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }));
 
-            Assert.AreEqual("Still 15 minutes reserved.", l_oViewModel.StateText);
+            Assert.AreEqual("Still 15 min. reserved.", l_oViewModel.StateText);
         }
 
         /// <summary>
@@ -115,13 +124,13 @@ namespace UITest.Fixtures.ViewModel
                     null,
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null,
-                    bike, 
-                    user, 
+                    bike,
+                    user,
                     new BikeAtStationInUseStateInfoProvider(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }));
 
-            Assert.AreEqual("Code 4asdfA, still 7 minutes reserved.", l_oViewModel.StateText);
+            Assert.AreEqual("Code 4asdfA, still 7 min. reserved.", l_oViewModel.StateText);
         }
 
         /// <summary>
@@ -138,8 +147,8 @@ namespace UITest.Fixtures.ViewModel
                     null,
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null,
-                    bike, 
-                    user, 
+                    bike,
+                    user,
                     new BikeAtStationInUseStateInfoProvider(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }));
@@ -179,7 +188,7 @@ namespace UITest.Fixtures.ViewModel
                     "123456789"), // Device id
                 new BikeAtStationInUseStateInfoProvider(),
                 MockRepository.GenerateStub<IBikesViewModel>(),
-                url => { }); 
+                url => { });
 
             Assert.AreEqual("Test description", l_oViewModel.Name);
             Assert.AreEqual("2", l_oViewModel.DisplayId);

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModel.cs

@@ -1,20 +1,20 @@
-using NUnit.Framework;
-using System;
-using TINK.Model.Bike;
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using TestFramework.Model.User.Account;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+using TINK.Model.State;
 using TINK.Model.User;
 using TINK.Model.User.Account;
-using static TINK.Repository.CopriCallsMemory;
-using TINK.Model.State;
-using System.Collections.Generic;
 using TINK.Repository;
 using TINK.ViewModel.Bikes.Bike;
-using TestFramework.Model.User.Account;
+using static TINK.Repository.CopriCallsMemory;
 
 namespace UITest.Fixtures.ViewModel
 {
     public class TestBikeViewModel
     {
-        private class BikeInfoMutable : TINK.Model.Bike.BC.BikeInfoMutable
+        private class BikeInfoMutable : TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable
         {
             public BikeInfoMutable(
                 string id,
@@ -28,19 +28,29 @@ namespace UITest.Fixtures.ViewModel
                 string stationName = null,
                 Uri operatorUri = null,
                 Func<DateTime> dateTimeProvider = null,
-                IStateInfo stateInfo = null) : base(id, lockModel, pisDemo, group, wheelType, typeOfBike, description, stationId, stationName, operatorUri, null, dateTimeProvider, stateInfo)
+                IStateInfo stateInfo = null) : base(
+                    new Bike(id, lockModel, wheelType, typeOfBike, description),
+                    new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
+                    pisDemo,
+                    group,
+                    stationId,
+                    stationName,
+                    operatorUri,
+                    null,
+                    dateTimeProvider,
+                    stateInfo)
             {
             }
         }
         /// <summary>
         /// Tests base class functionaltiy by using child.
         /// </summary>
-        public static BikeViewModelBase TestStateText_LoggedIn_Reserved(Func<TINK.Model.Bike.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
+        public static BikeViewModelBase TestStateText_LoggedIn_Reserved(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
         {
             var l_oBike = new BikeInfoMutable(
                 "2",
                 LockModel.ILockIt,
-                false, 
+                false,
                 new List<string> { "TINK" },
                 WheelType.Trike,
                 TypeOfBike.Cargo,
@@ -76,14 +86,14 @@ namespace UITest.Fixtures.ViewModel
         /// <summary>
         /// Tests base class functionaltiy by using child.
         /// </summary>
-        public static BikeViewModelBase TestStateText_LoggedIn_ReservedWithCopriConnect(Func<TINK.Model.Bike.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
+        public static BikeViewModelBase TestStateText_LoggedIn_ReservedWithCopriConnect(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
         {
             var l_oBike = new BikeInfoMutable(
                 "2",
                 LockModel.ILockIt,
-                false, 
+                false,
                 new List<string> { "TINK" },
-                WheelType.Trike, 
+                WheelType.Trike,
                 TypeOfBike.Cargo,
                 "Test description",
                 "3",
@@ -117,7 +127,7 @@ namespace UITest.Fixtures.ViewModel
         /// <summary>
         /// Tests base class functionaltiy by using child.
         /// </summary>
-        public static BikeViewModelBase TestStateText_LoggedIn_Booked(Func<TINK.Model.Bike.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
+        public static BikeViewModelBase TestStateText_LoggedIn_Booked(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
         {
             var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
 
@@ -128,7 +138,7 @@ namespace UITest.Fixtures.ViewModel
                 "ragu@gnu-systems.de",
                 "4asdfA");
 
-            var l_oCopriServer = new CopriCallsMemory(SampleSets.Set1, 1);
+            var l_oCopriServer = new CopriCallsMemory("MyMerchId", SampleSets.Set1, 1);
 
             var l_oStoreMock = new StoreMock(new Account("ragu@gnu-systems.de", "123456789"  /* password */, false, "987654321" /* session cookie */, new List<string> { "TINK" }));
             var l_oUser = new User(

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs

@@ -1,8 +1,10 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Rhino.Mocks;
-using System;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Services.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 using TINK.Model.Device;
 using TINK.Model.User;
 using TINK.ViewModel;
@@ -16,7 +18,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
     {
         [Test]
         public void TestCreateBluetoothLock()
-        {           
+        {
             Assert.AreEqual(
                 typeof(TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel),
                 BikeViewModelFactory.Create(
@@ -28,7 +30,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     null, // viewUpdateManager
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null, // viewService
-                    new TINK.Model.Bike.BluetoothLock.BikeInfoMutable(new TINK.Model.Bike.BluetoothLock.BikeInfo("42", 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
+                    new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
                     MockRepository.GenerateStub<IUser>(), // user
                     MockRepository.GenerateStub<IInUseStateInfoProvider>(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
@@ -49,7 +51,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     null, // viewUpdateManager
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null, // viewService
-                    new TINK.Model.Bike.CopriLock.BikeInfoMutable(new TINK.Model.Bike.CopriLock.BikeInfo("42", "17", new TINK.Model.Bikes.Bike.CopriLock.LockInfo.Builder { State = TINK.Model.Bikes.Bike.CopriLock.LockingState.Closed}.Build()), "My Station Name"),
+                    new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), "17", new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closed }.Build()), "My Station Name"),
                     MockRepository.GenerateStub<IUser>(), // user
                     MockRepository.GenerateStub<IInUseStateInfoProvider>(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
@@ -69,12 +71,12 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     null, // viewUpdateManager
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null, // viewService
-                    new TINK.Model.Bike.BC.BikeInfoMutable(new TINK.Model.Bike.BluetoothLock.BikeInfo("42", 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
+                    new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
                     MockRepository.GenerateStub<IUser>(), // user
                     MockRepository.GenerateStub<IInUseStateInfoProvider>(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }),
-                Is.Null); 
+                Is.Null);
         }
     }
 }

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs

@@ -1,5 +1,5 @@
-using NUnit.Framework;
-using System;
+using System;
+using NUnit.Framework;
 using TINK.ViewModel;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
@@ -10,12 +10,12 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
         [Test]
         public void TestGetReservedInfo()
         {
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 minutes expired."));
+            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null), Is.EqualTo("Max. reservation time of 15 min. expired."));
             Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, code: "Code12"), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12"), Is.EqualTo("Location 12, max. reservation time of 15 minutes expired."));
+            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12"), Is.EqualTo("Location 12, max. reservation time of 15 min. expired."));
             Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(null, "12", "Code12"), Is.Not.Null);
             Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10)), Is.Not.Null);
-            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123"), Is.EqualTo("Location Station 123, still 0 minutes reserved."));
+            Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123"), Is.EqualTo("Location Station 123, still 0 min. reserved."));
             Assert.That(new MyBikeInUseStateInfoProvider().GetReservedInfo(TimeSpan.FromSeconds(10), "123", "code123"), Is.Not.Null);
         }
 

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikePageViewModel.cs

@@ -1,14 +1,14 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using Rhino.Mocks;
-using System;
 using TINK.Model.Device;
 using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 
 namespace UITest.Fixtures.ViewModel
 {
-    
-     [TestFixture]
+
+    [TestFixture]
     public class TestMyBikesPageViewModel
     {
         /// <summary>
@@ -25,14 +25,14 @@ namespace UITest.Fixtures.ViewModel
                     null,
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null,
-                    bike, 
-                    user, 
+                    bike,
+                    user,
                     new MyBikeInUseStateInfoProvider(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }));
 
 
-            Assert.AreEqual("Location Station 3, still 15 minutes reserved.", l_oViewModel.StateText);
+            Assert.AreEqual("Location Station 3, still 15 min. reserved.", l_oViewModel.StateText);
         }
 
         /// <summary>
@@ -49,13 +49,13 @@ namespace UITest.Fixtures.ViewModel
                     null,
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null,
-                    bike, 
-                    user, 
+                    bike,
+                    user,
                     new MyBikeInUseStateInfoProvider(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }));
 
-            Assert.AreEqual("Code 4asdfA, location Station 3, still 7 minutes reserved.", l_oViewModel.StateText);
+            Assert.AreEqual("Code 4asdfA, location Station 3, still 7 min. reserved.", l_oViewModel.StateText);
         }
 
 
@@ -74,8 +74,8 @@ namespace UITest.Fixtures.ViewModel
                     null,
                     NSubstitute.Substitute.For<ISmartDevice>(),
                     null,
-                    bike, 
-                    user, 
+                    bike,
+                    user,
                     new MyBikeInUseStateInfoProvider(),
                     MockRepository.GenerateStub<IBikesViewModel>(),
                     url => { }));

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs

@@ -1,33 +1,33 @@
-using NUnit.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using NSubstitute;
+using NSubstitute.ExceptionExtensions;
+using NUnit.Framework;
+using Plugin.BLE.Abstractions.Contracts;
+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.Repository.Exception;
-using TINK.View;
+using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
-using static TINK.Repository.CopriCallsMemory;
-using TINK.ViewModel.Map;
-using TINK.ViewModel.Settings;
-using Plugin.BLE.Abstractions.Contracts;
-using TINK.Services.BluetoothLock;
-using NSubstitute;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.ViewModel.MyBikes;
-using TINK.Services.Permissions;
-using Xamarin.Forms;
-using TINK.Services.Geolocation;
-using NSubstitute.ExceptionExtensions;
+using TINK.Repository.Exception;
 using TINK.Services;
-using TINK.Model.Device;
-using TestFramework.Model.Device;
-using TestFramework.Repository;
-using TestFramework.Model.User.Account;
-using TestFramework.Model.Services.Geolocation;
+using TINK.Services.BluetoothLock;
+using TINK.Services.BluetoothLock.Tdo;
+using TINK.Services.Geolocation;
+using TINK.Services.Permissions;
+using TINK.View;
+using TINK.ViewModel.Map;
+using TINK.ViewModel.MyBikes;
+using TINK.ViewModel.Settings;
+using Xamarin.Forms;
+using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 {
@@ -46,7 +46,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
             locksService.TimeOut.Returns(timeOut);
             timeOut.MultiConnect.Returns(new TimeSpan(0));
-            
+
             // Fake location permissions to be set
             permissions.CheckStatusAsync().Returns(Task.FromResult(Status.Granted));
             geolocation.Active.IsGeolcationEnabled.Returns(true); // Fake gps to be on
@@ -59,7 +59,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
                     }
                 );
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -71,8 +71,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: geolocation,
@@ -80,6 +80,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(), // Permissions,
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -154,7 +155,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
                 }
             );
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -166,8 +167,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: geolocation,
@@ -175,6 +176,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(), // Permissions,
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -257,7 +259,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 };
 
             locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(lockInfoTdo);
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -269,8 +271,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: geolocation,
@@ -278,6 +280,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(), // Permissions,
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -355,7 +358,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 { new LockInfoTdo.Builder { Id = 2200537, State = LockitLockingState.Closed }.Build() }
             }
             );
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -367,8 +370,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: geolocation,
@@ -376,6 +379,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(), // Permissions,
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -451,7 +455,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 };
 
             locksService.GetLocksStateAsync(Arg.Any<IEnumerable<LockInfoAuthTdo>>(), Arg.Any<TimeSpan>()).Returns(lockInfoTdo);
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -463,8 +467,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "5781_d47fc786e740ef77d85a24bcb6f0ff97_oiF2kahH", new List<string> { "300001", "300029" })),
                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.ShareeFr01_Set1, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: geolocation,
@@ -472,6 +476,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(), // Permissions,
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -541,7 +546,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
             locksService.TimeOut.Returns(timeOut);
             timeOut.MultiConnect.Returns(new TimeSpan(0));
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -553,8 +558,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "Invalid_SessionCookie", new List<string> { "TINK" })),
                                 isConnectedFunc: () => true,
-                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
                 locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
@@ -562,6 +567,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null,
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -606,7 +612,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
             locksService.TimeOut.Returns(timeOut);
             timeOut.MultiConnect.Returns(new TimeSpan(0));
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -618,8 +624,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                     activeGeolocationService: typeof(GeolocationMock).FullName),
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
                                 isConnectedFunc: () => false,
-                            connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)), sessionCookie, mail, new CopriCallsMemory(SampleSets.Set2, 1, sessionCookie)),
-                merchantId: "MyMerchId",
+                            connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new ConnectorCache(new AppContextInfo(MERCH_ID, "MyApp", new Version(1, 2)), null /*UI language */, sessionCookie, mail, new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1, sessionCookie)),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
@@ -627,6 +633,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 device: new DeviceMock(), // Permissions
                 specialFolder: new SpecialFolderMock(),
                 cipher: null, // Offline
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -674,7 +681,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
             locksService.TimeOut.Returns(timeOut);
             timeOut.MultiConnect.Returns(new TimeSpan(0));
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -687,18 +694,20 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
                                 isConnectedFunc: () => false,
                 connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-uri,
-new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-sessionCookie,
-mail,
-server: new CopriProviderHttps(
-uri,
-TinkApp.MerchantId,
-new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-sessionCookie: sessionCookie,
-cacheServer: new CopriCallsCacheMemory(sessionCookie: sessionCookie),
-httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
-                merchantId: "MyMerchId",
+                    uri,
+                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                    null /*UI language */,
+                    sessionCookie,
+                    mail,
+                    server: new CopriProviderHttps(
+                        uri,
+                        TinkApp.MerchantId,
+                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                        null /*UI language */,
+                        sessionCookie: sessionCookie,
+                        cacheServer: new CopriCallsCacheMemory(MERCH_ID, sessionCookie: sessionCookie),
+                        httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: Substitute.For<ILocationPermission>(),
                 locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
@@ -706,6 +715,7 @@ httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, ne
                 device: new DeviceMock(),
                 specialFolder: new SpecialFolderMock(),
                 cipher: null, // Offline
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 
@@ -756,7 +766,7 @@ httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, ne
 
             locksService.TimeOut.Returns(timeOut);
             timeOut.MultiConnect.Returns(new TimeSpan(0));
-
+            const string MERCH_ID = "MyMerchId";
             var tinkApp = new TinkApp(
                 new TINK.Model.Settings.Settings(
                     new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
@@ -769,18 +779,20 @@ httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, ne
                 new StoreMock(new TINK.Model.User.Account.Account("a@b", "123456789", false, "4da3044c8657a04ba60e2eaa753bc51a", new List<string> { "TINK" })),
                                 isConnectedFunc: () => false,
                 connectorFactory: (isConnected, uri, sessionCookie, mail, expiresAfter) => new TINK.Model.Connector.Connector(
-uri,
-new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-sessionCookie,
-mail,
-server: new CopriProviderHttps(
-uri,
-TinkApp.MerchantId,
-new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
-sessionCookie: sessionCookie,
-cacheServer: new CopriCallsCacheMemory(sessionCookie: sessionCookie),
-httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
-                merchantId: "MyMerchId",
+                    uri,
+                    new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                    null /*UI language */,
+                    sessionCookie,
+                    mail,
+                    server: new CopriProviderHttps(
+                        uri,
+                        TinkApp.MerchantId,
+                        new AppContextInfo("oiF2kahH", "sharee.bike.test", new Version(3, 0, 267)),
+                        null /*UI language */,
+                        sessionCookie: sessionCookie,
+                        cacheServer: new CopriCallsCacheMemory(MERCH_ID, sessionCookie: sessionCookie),
+                        httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
+                merchantId: MERCH_ID,
                 bluetoothService: Substitute.For<IBluetoothLE>(),
                 locationPermissionsService: null,
                 locationServicesContainer: Substitute.For<IServicesContainer<IGeolocation>>(),
@@ -788,6 +800,7 @@ httpsServer: new ExceptionServer((msg) => new Exception(msg)))),
                 device: new DeviceMock(), // Permissions.
                 specialFolder: new SpecialFolderMock(),
                 cipher: null, // Offline
+                theme: null,
                 postAction: (d, obj) => d(obj),
                 currentVersion: new Version(3, 2, 0, 115), // Current app version
                 lastVersion: new Version(3, 0, 173), // Current app version. Must be larger or equal 3.0.173 to 

TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs

@@ -1,13 +1,13 @@
 using NUnit.Framework;
 using Rhino.Mocks;
-using TINK.Model.Bike;
-using TINK.Model.Bikes.Bike.BC;
+using TINK.Model.Bikes.BikeInfoNS.BC;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.ViewModel;
 
 namespace UITest.Fixtures.ObjectTests.ViewModel
 {
-    
-     [TestFixture]
+
+    [TestFixture]
     public class TestViewModelHelper
     {
         [Test]
@@ -15,7 +15,7 @@ namespace UITest.Fixtures.ObjectTests.ViewModel
         {
             var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
             l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Citybike);
+            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
             l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
             l_oBike.Stub(x => x.Id).Return("22");
             Assert.AreEqual(
@@ -28,7 +28,7 @@ namespace UITest.Fixtures.ObjectTests.ViewModel
 
             l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
             l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Citybike);
+            l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
             l_oBike.Stub(x => x.Id).Return("22");
             l_oBike.Stub(x => x.IsDemo).Return(true);
             l_oBike.Stub(x => x.Description).Return("MeinStadtrad");