Index: trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user (revision 883) +++ trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user (revision 930) @@ -1,5 +1,5 @@  - ShowAllFiles + ProjectFiles Index: trunk/eCard/eCardMVC/Platnosci/Controllers/HomeController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/HomeController.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/HomeController.cs (revision 930) @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; +using System.Web.Mvc; namespace Platnosci.Controllers Index: trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 880) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/AccountController.cs (revision 930) @@ -1,15 +1,9 @@ using System; using System.Linq; -using System.Text; using System.Web.Mvc; using System.Web.Security; -using System.Collections.Generic; using Platnosci.Core.Linq; using Platnosci.Models; -using System.Globalization; -using System.Threading; using Platnosci.Core.Interface; -using System.Resources; -using Platnosci.Core; namespace Platnosci.Controllers Index: trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 915) +++ trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 930) @@ -209,5 +209,5 @@ False - True + False 3646 / Index: trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 927) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 930) @@ -32,4 +32,8 @@ + + False + ..\lib\Interop.SHDocVw.dll + False Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs (revision 882) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs (revision 930) @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NUnit.Framework; +using NUnit.Framework; using WatiN.Core; -using System.Web.Mvc; namespace Platnosci.Tests.Web @@ -14,8 +9,8 @@ [Test] [Category("UI")] - public void checkErrorPay() + public void CheckErrorPay() { - string test = "test"; - IE ie = new IE("http://localhost:3646/pl/Account/LogOn"); + const string test = "test"; + var ie = new IE("http://localhost:3646/pl/Account/LogOn"); ie.TextField(Find.ByName("numer_faktury")).TypeText("27/ASZ/2009"); ie.TextField(Find.ByName("nip")).TypeText("854956281"); @@ -26,11 +21,12 @@ ie.Button(Find.ById("place")).Click(); Assert.IsTrue(ie.ContainsText("Proszę podać")); + ie.ForceClose(); } [Test] [Category("UI")] - public void checkCorrectPay() + public void CheckCorrectPay() { - string test = "test"; - IE ie = new IE("http://localhost:3646/pl/Account/LogOn"); + const string test = "test"; + var ie = new IE("http://localhost:3646/pl/Account/LogOn"); ie.TextField(Find.ByName("numer_faktury")).TypeText("27/ASZ/2009"); ie.TextField(Find.ByName("nip")).TypeText("854956281"); @@ -41,4 +37,5 @@ ie.Button(Find.ById("place")).Click(); Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test)); + ie.ForceClose(); } } Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 927) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 930) @@ -34,5 +34,5 @@ { var repository = new Repository(new FakeDataContext()); - var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345); + var platnosci = _f.CreateNewPayment(orderNumber, false, DateTime.Now, 12345); repository.Insert(platnosci); repository.SubmitChanges(); @@ -64,5 +64,5 @@ { var repPayment = new Repository(new FakeDataContext()); - var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345); + var platnosci = _f.CreateNewPayment(orderNumber, false, DateTime.Now, 12345); repPayment.Insert(platnosci); repPayment.SubmitChanges(); @@ -93,5 +93,5 @@ { IRepository repPayment = new Repository(new FakeDataContext()); - PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data, 1); + PlatnosciEcard platnosc = _f.CreateNewPayment(orderNumber, false, data, 1); repPayment.Insert(platnosc); @@ -110,5 +110,5 @@ IRepository repPayment = new Repository(new FakeDataContext()); - PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data, 1); + PlatnosciEcard platnosc = _f.CreateNewPayment(orderNumber, false, data, 1); repPayment.Insert(platnosc); @@ -126,9 +126,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"); + 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 result = controller.Show("123","pl") as ViewResult; @@ -143,5 +143,5 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.createInvoice(123, "", "", 0, 0); + vPlatnosciEcard platnosc = _f.CreateInvoice(123, "", "", 0, 0); repVPayment.Insert(platnosc); @@ -161,15 +161,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 = _f.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 = _f.CreateConfirm(code_Ok, 123456); repConfirm.Insert(confirm); repConfirm.SubmitChanges(); var controller = new PlatnoscController(repVPayment, null, repConfirm, _t); - controller.ControllerContext = _f.createControllerContext("nip1"); + controller.ControllerContext = _f.CreateControllerContext("nip1"); //controller.setZaplacono("Platnosc zostala uregulowana"); @@ -185,14 +185,14 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.createInvoice(123, "nip1", "numer", 200, 0); + vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0); repVPayment.Insert(platnosc); var repConfirm = new Repository(new FakeDataContext()); - var confirm = _f.createConfirm(code_Ok, 1); + var confirm = _f.CreateConfirm(code_Ok, 1); repConfirm.Insert(confirm); repConfirm.SubmitChanges(); var controller = new PlatnoscController(repVPayment, null, repConfirm, _t); - controller.ControllerContext = _f.createControllerContext("nip1"); + controller.ControllerContext = _f.CreateControllerContext("nip1"); var result = controller.Show("123", "pl") as ViewResult; @@ -209,11 +209,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 = _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"); //Brak imienia + Payer payer = _f.CreatePayer(123, "", "test"); //Brak imienia controller.Show(payer, "pl"); Assert.That(controller.ModelState.IsValid, Is.False); @@ -224,11 +224,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"); - - Payer payer = _f.createPayer(123, "test", "test"); + 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; Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 913) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 930) @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using NUnit.Framework; using Platnosci.Core.Linq; @@ -15,6 +12,4 @@ class StatusTest { - private Function _f = new Function(); - [Test] [Category("Unit")] @@ -99,27 +94,4 @@ Assert.That(result.Content.Contains("SqlException")); } - [Test] - [Category("Unit")] - public void Correct_Date_Test() - { - string merchant = "ABC15S"; - int order = 1234; - - var controller = new PlatnoscController(); - IRepository repConfirm = controller.getRepConfirm(); - var builder = new TestControllerBuilder(); - builder.InitializeController(controller); - builder.Form.Add("MERCHANTNUMBER", merchant); - builder.Form.Add("ORDERNUMBER", order.ToString()); - builder.Form.Add("VALIDATIONCODE", "000"); - - var result = controller.Status(); - var pl = repConfirm.Find(o => o.MERCHANTNUMBER == merchant && o.ORDERNUMBER == order).SingleOrDefault(); - System.Diagnostics.Debug.WriteLine("Dodano płatność do repozytorium."); - Assert.That(pl.ORDERNUMBER.Equals(order)); - - repConfirm.Delete(pl); - System.Diagnostics.Debug.WriteLine("Usunięto poprawnie płatność o ORDERNUMBER: " + pl.ORDERNUMBER +" i MERCHANTNUMBER: " + pl.MERCHANTNUMBER); - } } } Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 896) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 930) @@ -1,9 +1,4 @@ -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; namespace Platnosci.Tests.Web @@ -12,5 +7,5 @@ class TestMethods { - private Function _f = new Function(); + private readonly Function _function = new Function(); [Test] @@ -18,12 +13,12 @@ public void TestInsertMethodForPayment() { - FakeDataContext fake = new FakeDataContext(); - var _rep = new Repository(fake); + var fake = new FakeDataContext(); + var vPlatnosciEcardRepository = new Repository(fake); - vPlatnosciEcard platnosc = _f.createInvoice(123, "nip", "", 0, 0); - _rep.Insert(platnosc); + var platnosc = _function.CreateInvoice(123, "nip", "", 0, 0); + vPlatnosciEcardRepository.Insert(platnosc); - System.Diagnostics.Debug.WriteLine("rep.Count: " + _rep.Count()); - vPlatnosciEcard pl = _rep.FindOne(123); + System.Diagnostics.Debug.WriteLine("rep.Count: " + vPlatnosciEcardRepository.Count()); + var pl = vPlatnosciEcardRepository.FindOne(123); System.Diagnostics.Debug.WriteLine("Wartosc nip ma byc 'nip'. Jest " + pl.nip); Assert.That(pl.nip, Is.EqualTo("nip")); Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 918) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 930) @@ -2,5 +2,4 @@ using System.Collections.Generic; using System.Linq; -using System.Web; using Platnosci.Core.Interface; using Platnosci.Core.Linq; @@ -10,15 +9,13 @@ public class FakeDataContext : IDataContext { - private List listaPayment = new List(); + private const string CODE_OK = "payment_deposited"; //transakcja potwierdzona do rozliczenia - private string code_Ok = "payment_deposited"; //transakcja potwierdzona do rozliczenia - - private readonly List lista = new List(); - private Function _f = new Function(); + private readonly List _lista = new List(); + private readonly Function _function = new Function(); public IQueryable GetTable() where T : class { - var query = lista.Where(objects => typeof(T).IsAssignableFrom(objects.GetType())); + var query = _lista.Where(objects => typeof(T).IsAssignableFrom(objects.GetType())); return query.Select(o => (T)o).AsQueryable(); } @@ -26,10 +23,10 @@ public void Insert(T item) where T : class { - lista.Add(item); + _lista.Add(item); } public void Delete(T item) where T : class { - lista.Remove(item); + _lista.Remove(item); } @@ -57,19 +54,18 @@ { - PlatnosciEcard platnosc = _f.createNewPayment(123456, true, DateTime.Now, 123); - List payment = new List(); - List listaConfirm = new List(); - listaConfirm.Add((PotwierdzeniaEcard)lista[0]); + var platnosc = _function.CreateNewPayment(123456, true, DateTime.Now, 123); + var payment = new List(); + var listaConfirm = new List {(PotwierdzeniaEcard) _lista[0]}; payment.Add(platnosc); - List new_confirm = new List(); + var newConfirm = new List(); if (platnosc.IDFaktury == idFaktury) { - if (listaConfirm[0].ORDERNUMBER == platnosc.ORDERNUMBER && listaConfirm[0].CURRENTSTATE == code_Ok) - new_confirm.Add(listaConfirm[0]); + if (listaConfirm[0].ORDERNUMBER == platnosc.ORDERNUMBER && listaConfirm[0].CURRENTSTATE == CODE_OK) + newConfirm.Add(listaConfirm[0]); } - System.Diagnostics.Debug.WriteLine("lista" + new_confirm.Count()); - return new_confirm; + System.Diagnostics.Debug.WriteLine("lista" + newConfirm.Count()); + return newConfirm; } public int GetOrdernumber(string desc, int? id, DateTime? data) Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 896) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 930) @@ -1,6 +1,3 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Platnosci.Core.Linq; using System.Web.Mvc; @@ -11,8 +8,7 @@ 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 fak_numer, decimal brutto, byte SystemKsiegowy) { - - vPlatnosciEcard platnosc = new vPlatnosciEcard(); + var platnosc = new vPlatnosciEcard(); platnosc.ID_faktury = id; platnosc.nip = nip; @@ -23,7 +19,7 @@ return platnosc; } - public PlatnosciEcard createNewPayment(int ordernumber, bool status, DateTime data, int id_faktury) + public PlatnosciEcard CreateNewPayment(int ordernumber, bool status, DateTime data, int id_faktury) { - PlatnosciEcard platnosc = new PlatnosciEcard(); + var platnosc = new PlatnosciEcard(); platnosc.ORDERNUMBER = ordernumber; platnosc.Status = status; @@ -33,7 +29,7 @@ return platnosc; } - public PotwierdzeniaEcard createConfirm(string code, int ordernumber) + public PotwierdzeniaEcard CreateConfirm(string code, int ordernumber) { - PotwierdzeniaEcard potwierdzenie = new PotwierdzeniaEcard(); + var potwierdzenie = new PotwierdzeniaEcard(); potwierdzenie.CURRENTSTATE = code; potwierdzenie.ORDERNUMBER = ordernumber; @@ -41,14 +37,13 @@ return potwierdzenie; } - public Payer createPayer(int id, string name, string surname) + + public Payer CreatePayer(int id, string name, string surname) { - Payer payer = new Payer(); - payer.Id_faktury = id; - payer.FirstName = name; - payer.LastName = surname; + var payer = new Payer {Id_faktury = id, FirstName = name, LastName = surname}; return payer; } - public ControllerContext createControllerContext(string UserIdentity) + + public ControllerContext CreateControllerContext(string UserIdentity) { Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 927) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 930) @@ -24,11 +24,11 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.createInvoice(123, "nip1", "", 0, 0); + vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "", 0, 0); repVPayment.Insert(platnosc); - Payer payer = _f.createPayer(123, "test", "test"); + Payer payer = _f.CreatePayer(123, "test", "test"); var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.createControllerContext("nip2"); + controller.ControllerContext = _f.CreateControllerContext("nip2"); var result = controller.Show(payer, "pl") as ViewResult; @@ -43,11 +43,11 @@ { IRepository repVPayment = new Repository(new FakeDataContext()); - vPlatnosciEcard platnosc = _f.createInvoice(12, "nip1", "", 0, 0); + vPlatnosciEcard platnosc = _f.CreateInvoice(12, "nip1", "", 0, 0); repVPayment.Insert(platnosc); - Payer payer = _f.createPayer(123, "test", "test"); + Payer payer = _f.CreatePayer(123, "test", "test"); var controller = new PlatnoscController(repVPayment, null, null, _t); - controller.ControllerContext = _f.createControllerContext("nip2"); + controller.ControllerContext = _f.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 882) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs (revision 930) @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NUnit.Framework; +using NUnit.Framework; using WatiN.Core; -using System.Web.Mvc; namespace Platnosci.Tests.Web @@ -21,4 +16,5 @@ ie.Button(Find.ById("loguj")).Click(); Assert.IsTrue(ie.ContainsText("została uregulowana")); + ie.ForceClose(); } [Test] @@ -31,4 +27,5 @@ ie.Button(Find.ById("loguj")).Click(); Assert.IsTrue(ie.ContainsText("Logowanie nie powiodło się")); + ie.ForceClose(); } }