Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 930) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 931) @@ -83,4 +83,5 @@ + Index: /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs (revision 931) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs (revision 931) @@ -0,0 +1,6 @@ +namespace Platnosci.Tests +{ + public class TestRunner + { + } +} Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 930) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 931) @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Web.Mvc; @@ -11,8 +9,5 @@ using Platnosci.Core.Interface; using Platnosci.Core.Linq; -using WatiN.Core; -using System.Threading; using Platnosci.Models; -using Moq; namespace Platnosci.Tests.Web @@ -21,11 +16,11 @@ class PlatnosciControllerTests { - private ITranslateManager _t = new FakeTranslation(); - private string merchantNumber = "123"; - private int orderNumber = 9999; - private string code_Ok = "payment_deposited"; //transakcja potwierdzona do rozliczenia - private string code_Bad = "payment_declined"; //transakcja odrzucona - private DateTime data = DateTime.Now; - private Function _f = new Function(); + private readonly ITranslateManager _translateManager = new FakeTranslation(); + private readonly string _merchantNumber = "123"; + private readonly int _orderNumber = 9999; + private const string CODE_OK = "payment_deposited"; //transakcja potwierdzona do rozliczenia + private const string CODE_BAD = "payment_declined"; //transakcja odrzucona + private readonly DateTime _data = DateTime.Now; + private readonly Function _function = new Function(); [Test] @@ -34,5 +29,5 @@ { var repository = new Repository(new FakeDataContext()); - var platnosci = _f.CreateNewPayment(orderNumber, false, DateTime.Now, 12345); + var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); repository.Insert(platnosci); repository.SubmitChanges(); @@ -41,21 +36,21 @@ var builder = new TestControllerBuilder(); - var controller = new PlatnoscController(null, repository, rep, _t); + var controller = new PlatnoscController(null, repository, rep, _translateManager); builder.InitializeController(controller); - builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); + builder.Form.Add("MERCHANTNUMBER", _merchantNumber); 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(); + builder.Form.Add("ORDERNUMBER", _orderNumber.ToString()); + builder.Form.Add("CURRENTSTATE", CODE_OK); + + controller.Status(); System.Diagnostics.Debug.WriteLine("rep:" + rep.Count() + " repPl: " + repository.Count() ); - var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault(); - Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); - PlatnosciEcard payment_after_update = repository.FindOne(orderNumber); - System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status); - Assert.That(payment_after_update.Status, Is.EqualTo(true)); + var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault(); + Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber)); + var paymentAfterUpdate = repository.FindOne(_orderNumber); + System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status); + Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true)); } [Test] @@ -64,5 +59,5 @@ { var repPayment = new Repository(new FakeDataContext()); - var platnosci = _f.CreateNewPayment(orderNumber, false, DateTime.Now, 12345); + var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); repPayment.Insert(platnosci); repPayment.SubmitChanges(); @@ -70,20 +65,20 @@ var builder = new TestControllerBuilder(); - var controller = new PlatnoscController(null, repPayment, repConfirm, _t); + var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager); builder.InitializeController(controller); - builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); + builder.Form.Add("MERCHANTNUMBER", _merchantNumber); 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_Bad); - - var result = controller.Status(); - - var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault(); - Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); + builder.Form.Add("ORDERNUMBER", _orderNumber.ToString()); + builder.Form.Add("CURRENTSTATE", CODE_BAD); + + controller.Status(); + + var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault(); + Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber)); - PlatnosciEcard payment_after_update = repPayment.FindOne(orderNumber); - System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status); - Assert.That(payment_after_update.Status, Is.EqualTo(false)); + var paymentAfterUpdate = repPayment.FindOne(_orderNumber); + System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status); + Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false)); } @@ -93,14 +88,13 @@ { IRepository repPayment = new Repository(new FakeDataContext()); - PlatnosciEcard platnosc = _f.CreateNewPayment(orderNumber, false, data, 1); + PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1); repPayment.Insert(platnosc); - var controller = new PlatnoscController(null, repPayment, null, _t); - controller.UpdateStatus(orderNumber, code_Ok); - - PlatnosciEcard payment_after_update = new PlatnosciEcard(); - payment_after_update = repPayment.FindOne(orderNumber); - System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status); - Assert.That(payment_after_update.Status, Is.EqualTo(true)); + var controller = new PlatnoscController(null, repPayment, null, _translateManager); + controller.UpdateStatus(_orderNumber, CODE_OK); + + var paymentAfterUpdate = repPayment.FindOne(_orderNumber); + System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status); + Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true)); } [Test] @@ -110,14 +104,13 @@ IRepository repPayment = new Repository(new FakeDataContext()); - PlatnosciEcard platnosc = _f.CreateNewPayment(orderNumber, false, data, 1); + PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1); repPayment.Insert(platnosc); - var controller = new PlatnoscController(null, repPayment, null, _t); - controller.UpdateStatus(orderNumber, code_Bad); - - PlatnosciEcard payment_after_update = new PlatnosciEcard(); - payment_after_update = repPayment.FindOne(i => i.ORDERNUMBER == orderNumber); - System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status); - Assert.That(payment_after_update.Status, Is.EqualTo(false)); + var controller = new PlatnoscController(null, repPayment, null, _translateManager); + controller.UpdateStatus(_orderNumber, CODE_BAD); + + var paymentAfterUpdate = repPayment.FindOne(i => i.ORDERNUMBER == _orderNumber); + System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status); + Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false)); } [Test] @@ -126,9 +119,9 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "", 0, 0); - repVPayment.Insert(platnosc); - - var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.CreateControllerContext("nip2"); + var platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0); + repVPayment.Insert(platnosc); + + var controller = new PlatnoscController(repVPayment, null, null, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip2"); var result = controller.Show("123","pl") as ViewResult; @@ -143,8 +136,8 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(123, "", "", 0, 0); - repVPayment.Insert(platnosc); - - var controller = new PlatnoscController(repVPayment, null, null, _t); + vPlatnosciEcard platnosc = _function.CreateInvoice(123, "", "", 0, 0); + repVPayment.Insert(platnosc); + + var controller = new PlatnoscController(repVPayment, null, null, _translateManager); //controller.setBrakDanych("Platnosc o takim id nie istnieje"); @@ -161,15 +154,15 @@ //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona var repVPayment = new Repository(new FakeDataContext()); - var invoice = _f.CreateInvoice(123, "nip1", "aaa", 0, 0); + var invoice = _function.CreateInvoice(123, "nip1", "aaa", 0, 0); repVPayment.Insert(invoice); repVPayment.SubmitChanges(); var repConfirm = new Repository(new FakeDataContext()); - var confirm = _f.CreateConfirm(code_Ok, 123456); + var confirm = _function.CreateConfirm(CODE_OK, 123456); repConfirm.Insert(confirm); repConfirm.SubmitChanges(); - var controller = new PlatnoscController(repVPayment, null, repConfirm, _t); - controller.ControllerContext = _f.CreateControllerContext("nip1"); + var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip1"); //controller.setZaplacono("Platnosc zostala uregulowana"); @@ -185,14 +178,14 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0); + vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0); repVPayment.Insert(platnosc); var repConfirm = new Repository(new FakeDataContext()); - var confirm = _f.CreateConfirm(code_Ok, 1); + var confirm = _function.CreateConfirm(CODE_OK, 1); repConfirm.Insert(confirm); repConfirm.SubmitChanges(); - var controller = new PlatnoscController(repVPayment, null, repConfirm, _t); - controller.ControllerContext = _f.CreateControllerContext("nip1"); + var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip1"); var result = controller.Show("123", "pl") as ViewResult; @@ -209,11 +202,11 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0); - repVPayment.Insert(platnosc); - - var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.CreateControllerContext("nip1"); + vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0); + repVPayment.Insert(platnosc); + + var controller = new PlatnoscController(repVPayment, null, null, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip1"); - Payer payer = _f.CreatePayer(123, "", "test"); //Brak imienia + Payer payer = _function.CreatePayer(123, "", "test"); //Brak imienia controller.Show(payer, "pl"); Assert.That(controller.ModelState.IsValid, Is.False); @@ -224,12 +217,12 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0); - repVPayment.Insert(platnosc); - - var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.CreateControllerContext("nip1"); - - Payer payer = _f.CreatePayer(123, "test", "test"); - var result = controller.Show(payer, "pl") as ViewResult; + vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0); + repVPayment.Insert(platnosc); + + var controller = new PlatnoscController(repVPayment, null, null, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip1"); + + var payer = _function.CreatePayer(123, "test", "test"); + controller.Show(payer, "pl"); System.Diagnostics.Debug.WriteLine("Model powinien byc 'true'. Jest " + controller.ModelState.IsValid); Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 930) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 931) @@ -1,4 +1,3 @@ -using System.Linq; -using NUnit.Framework; +using NUnit.Framework; using Platnosci.Core.Linq; using Platnosci.Core.Interface; Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs (revision 927) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs (revision 931) @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Platnosci.Core.Interface; +using Platnosci.Core.Interface; namespace Platnosci.Tests.Web @@ -11,10 +7,19 @@ public string Translate(string className, string keyName) { - if (keyName == "weryfikacja") return "weryfikacja"; - else if (keyName == "brakdanych") return "brakdanych"; - else if (keyName == "zaplacono") return "zaplacono"; - else if (keyName == "err_imieWK") return "imie"; - else if (keyName == "err_nazwiskoWK") return "nazwisko"; - else if (keyName == "error_hash") return "error_hash"; + switch (keyName) + { + case "weryfikacja": + return "weryfikacja"; + case "brakdanych": + return "brakdanych"; + case "zaplacono": + return "zaplacono"; + case "err_imieWK": + return "imie"; + case "err_nazwiskoWK": + return "nazwisko"; + case "error_hash": + return "error_hash"; + } return ""; Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 930) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 931) @@ -8,22 +8,22 @@ public class Function { - public vPlatnosciEcard CreateInvoice(int id, string nip, string fak_numer, decimal brutto, byte SystemKsiegowy) + public vPlatnosciEcard CreateInvoice(int id, string nip, string invoiceNumber, decimal brutto, byte systemKsiegowy) { var platnosc = new vPlatnosciEcard(); platnosc.ID_faktury = id; platnosc.nip = nip; - platnosc.Faktura_Numer = fak_numer; + platnosc.Faktura_Numer = invoiceNumber; platnosc.Brutto = brutto; - platnosc.SystemKsiegowyId = SystemKsiegowy; + platnosc.SystemKsiegowyId = systemKsiegowy; return platnosc; } - public PlatnosciEcard CreateNewPayment(int ordernumber, bool status, DateTime data, int id_faktury) + public PlatnosciEcard CreateNewPayment(int orderNumber, bool status, DateTime data, int invoiceId) { var platnosc = new PlatnosciEcard(); - platnosc.ORDERNUMBER = ordernumber; + platnosc.ORDERNUMBER = orderNumber; platnosc.Status = status; platnosc.Status_data = data; - platnosc.IDFaktury = id_faktury; + platnosc.IDFaktury = invoiceId; return platnosc; @@ -45,9 +45,9 @@ } - public ControllerContext CreateControllerContext(string UserIdentity) + public ControllerContext CreateControllerContext(string userIdentity) { var mock = new Mock(); - mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(UserIdentity); + mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(userIdentity); mock.SetupGet(m => m.HttpContext.Request.IsAuthenticated).Returns(true); Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 930) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 931) @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NUnit.Framework; +using NUnit.Framework; using Platnosci.Core.Linq; using Platnosci.Core.Interface; -using MvcContrib.TestHelper; using Platnosci.Controllers; using Platnosci.Models; @@ -16,6 +11,6 @@ class MerchantControllerTests { - private Function _f = new Function(); - private ITranslateManager _t = new FakeTranslation(); + private readonly Function _function = new Function(); + private readonly ITranslateManager _translateManager = new FakeTranslation(); [Test] @@ -24,11 +19,11 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "", 0, 0); + vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0); repVPayment.Insert(platnosc); - Payer payer = _f.CreatePayer(123, "test", "test"); + Payer payer = _function.CreatePayer(123, "test", "test"); - var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.CreateControllerContext("nip2"); + var controller = new PlatnoscController(repVPayment, null, null, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip2"); var result = controller.Show(payer, "pl") as ViewResult; @@ -43,11 +38,11 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.CreateInvoice(12, "nip1", "", 0, 0); + vPlatnosciEcard platnosc = _function.CreateInvoice(12, "nip1", "", 0, 0); repVPayment.Insert(platnosc); - Payer payer = _f.CreatePayer(123, "test", "test"); + Payer payer = _function.CreatePayer(123, "test", "test"); - var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.CreateControllerContext("nip2"); + var controller = new PlatnoscController(repVPayment, null, null, _translateManager); + controller.ControllerContext = _function.CreateControllerContext("nip2"); var result = controller.Show(payer, "pl") as ViewResult; Index: /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs =================================================================== --- /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 930) +++ /trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 931) @@ -9,7 +9,7 @@ [Test] [Category("UI")] - public void checkLoginCorrect() + public void CheckLoginCorrect() { - IE ie = new IE("http://localhost:3646/pl/Account/LogOn"); + var ie = new IE("http://localhost:3646/pl/Account/LogOn"); ie.TextField(Find.ByName("numer_faktury")).TypeText("24/HOL/2009"); ie.TextField(Find.ByName("nip")).TypeText("501379568"); @@ -20,7 +20,7 @@ [Test] [Category("UI")] - public void checkErrorLogin() + public void CheckErrorLogin() { - IE ie = new IE("http://localhost:3646/pl/Account/LogOn"); + var ie = new IE("http://localhost:3646/pl/Account/LogOn"); ie.TextField(Find.ByName("numer_faktury")).TypeText(""); ie.TextField(Find.ByName("nip")).TypeText("");