Index: trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 882) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 888) @@ -97,5 +97,5 @@ - + Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 883) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 888) @@ -31,4 +31,6 @@ private string testNumerFaktury = "abcd"; private decimal testBrutto = 200; + private int test = 1; //oznacza, ze nie ustawiamy tlumaczen poprzez funkcje ustawTlumaczenia() + //w controllerze Platnosci, tylko poprzez funkcje setXXXXXXX() private Function _f = new Function(); @@ -39,33 +41,43 @@ public void Status_Saves_Correct_Transaction() { + // //IDataContext fake = new FakeDataContext(); + // var repository = new Repository(new FakeDataContext()); + // var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345); //new PlatnosciEcard(); + // repository.Insert(platnosci); + // repository.SubmitChanges(); + + + // DateTime datka = DateTime.Now; + // var builder = new TestControllerBuilder(); + // var controller = new PlatnoscController(fake,test); + // builder.InitializeController(controller); + // builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); + // builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); + // builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); + // builder.Form.Add("ORDERNUMBER", orderNumber.ToString()); + // builder.Form.Add("CURRENTSTATE", code_Ok); + + // var result = controller.Status(); + + // IRepository _rep = new Repository(new FakeDataContext()); + + + // System.Diagnostics.Debug.WriteLine("" + _rep.Count()); + + // //var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First(); + //// Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); + // PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); + // System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka); + // Assert.That(payment_after_update.Status, Is.EqualTo(true)); + + } + [Test] + [Category("Unit")] + public void Status_Saves_Correct_Transaction_IncorrectUpdate() + { FakeDataContext fake = new FakeDataContext(2); DateTime datka = DateTime.Now; var builder = new TestControllerBuilder(); - var controller = new PlatnoscController(fake); - builder.InitializeController(controller); - builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); - builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); - builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); - builder.Form.Add("ORDERNUMBER", orderNumber.ToString()); - builder.Form.Add("CURRENTSTATE", code_Ok); - - var result = controller.Status(); - - IRepository _rep = new Repository(fake); - var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First(); - Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); - PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); - System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka); - Assert.That(payment_after_update.Status_data, Is.GreaterThan(datka)); - - } - [Test] - [Category("Unit")] - public void Status_Saves_Correct_Transaction_IncorrectUpdate() - { - FakeDataContext fake = new FakeDataContext(2); - DateTime datka = DateTime.Now; - var builder = new TestControllerBuilder(); - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,test); builder.InitializeController(controller); builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); @@ -81,4 +93,5 @@ Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); + PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " <= " + datka ); @@ -89,28 +102,30 @@ public void StatusIsUpdated() { - FakeDataContext fake = new FakeDataContext(); + FakeDataContext fake = new FakeDataContext(3); IRepository _rep = new Repository(fake); + PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data.AddDays(-1), 1); + _rep.Insert(platnosc); + + DateTime datka = DateTime.Now; + var controller = new PlatnoscController(fake,test); + controller.UpdateStatus(orderNumber, code_Ok); + + PlatnosciEcard payment_after_update = new PlatnosciEcard(); + payment_after_update = _rep.FindOne(orderNumber); + + Assert.That(payment_after_update.Status, Is.EqualTo(true)); + } + [Test] + [Category("Unit")] + public void StatusIsNotUpdated() + { + FakeDataContext fake = new FakeDataContext(); + IRepository _rep = new Repository(fake); + PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1); _rep.Insert(platnosc); - var controller = new PlatnoscController(fake); - controller.UpdateStatus(orderNumber, code_Ok); - - PlatnosciEcard payment_after_update = new PlatnosciEcard(); - payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber); - Assert.That(payment_after_update.Status_data, Is.GreaterThan(data)); - } - [Test] - [Category("Unit")] - public void StatusIsNotUpdated() - { - FakeDataContext fake = new FakeDataContext(); - IRepository _rep = new Repository(fake); - - PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,test); controller.UpdateStatus(orderNumber, code_Bad); @@ -129,5 +144,5 @@ _rep.Insert(platnosc); - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,test); controller.ControllerContext = _f.createControllerContext(testNip2); controller.setWeryfikacja("Niepoprawny nip"); @@ -144,7 +159,7 @@ { FakeDataContext fake = new FakeDataContext(); - IRepository _rep = new Repository(fake); - - var controller = new PlatnoscController(fake); + // IRepository _rep = new Repository(fake); + + var controller = new PlatnoscController(fake,test); controller.ControllerContext = _f.createControllerContext(testNip1); @@ -162,5 +177,5 @@ //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona FakeDataContext fake = new FakeDataContext(1); - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,test); controller.ControllerContext = _f.createControllerContext(testNip1); @@ -168,8 +183,8 @@ var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult; - var error = (ErrorViewData)result.ViewData.Model; - - Assert.That(result.ViewName, Is.EqualTo("Error1")); - Assert.That(error.error, Is.EqualTo("Platnosc zostala uregulowana")); + var view = (InvoiceDetailsViewData)result.ViewData.Model; + + Assert.That(result.ViewName, Is.EqualTo("Paid")); + Assert.That(view.info, Is.EqualTo("Platnosc zostala uregulowana")); } [Test] @@ -183,5 +198,5 @@ _rep.Insert(platnosc); - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,test); controller.ControllerContext = _f.createControllerContext(testNip1); @@ -203,5 +218,5 @@ _rep.Insert(platnosc); - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,1); controller.ControllerContext = _f.createControllerContext(testNip1); @@ -221,5 +236,5 @@ _rep.Insert(platnosc); - var controller = new PlatnoscController(fake); + var controller = new PlatnoscController(fake,test); controller.ControllerContext = _f.createControllerContext(testNip1); Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 883) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 888) @@ -48,32 +48,54 @@ listaPlatnosci.Add(DodajPlatnosc(2, "2", "aaa")); } - public FakeDataContext(int i) - { - if (i == 1) - { - listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345")); - listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); - listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999)); - } - else if (i == 2) - { - listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); - } - } + //public FakeDataContext(int fake) + //{ + // if (fake == 1) + // { + // listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345")); + // listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); + // listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999)); + // } + // else if (fake == 2) + // { + // listaPl.Add(createNewPayment(9999, false, DateTime.Now, 1000)); + // } + //} + + + private readonly List _dataStore = new List(); + public IQueryable GetTable() where T : class { - var query = from objects in lista - where typeof(T).IsAssignableFrom(objects.GetType()) - select objects; - return query.Select(o => (T)o).AsQueryable(); + var query = _dataStore.Where(objects => typeof(T).IsAssignableFrom(objects.GetType())); + return query.Select(o => (T)o).AsQueryable(); } + public void Insert(T item) where T : class { - lista.Add(item); + _dataStore.Add(item); } + public void Delete(T item) where T : class { - lista.Remove(item); + _dataStore.Remove(item); } + + public void SubmitChanges() + { + InvokeCompleted(EventArgs.Empty); + } + + public event EventHandler Completed; + + private void InvokeCompleted(EventArgs e) + { + var completedHandler = Completed; + if (completedHandler != null) completedHandler(this, e); + } + + public void Dispose() + { + } + public IQueryable FindInvoiceById(int id) { @@ -132,9 +154,4 @@ return query.AsQueryable(); } - public void SubmitChanges() - { - - } - } } Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 882) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 888) @@ -48,5 +48,5 @@ mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(UserIdentity); mock.SetupGet(m => m.HttpContext.Request.IsAuthenticated).Returns(true); - + return mock.Object; }