Zbiór zmian 931
- Data:
- 2009-12-07 11:50:15 (16 years ago)
- Lokalizacja:
- trunk/eCard/eCardMVC/Platnosci.Tests
- Pliki:
-
- 1 dodane
- 7 zmodyfikowane
-
Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
-
TestRunner.cs (dodane)
-
Web/FakeTranslation.cs (zmodyfikowane) (2 diffs)
-
Web/Function.cs (zmodyfikowane) (2 diffs)
-
Web/MerchantControllerTests.cs (zmodyfikowane) (4 diffs)
-
Web/PlatnosciControllerTests.cs (zmodyfikowane) (15 diffs)
-
Web/StatusTest.cs (zmodyfikowane) (1 diff)
-
Web/UIAccountTest.cs (zmodyfikowane) (2 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj
r930 r931 83 83 <ItemGroup> 84 84 <Compile Include="Properties\AssemblyInfo.cs" /> 85 <Compile Include="TestRunner.cs" /> 85 86 <Compile Include="Web\MerchantControllerTests.cs" /> 86 87 <Compile Include="Web\FakeDataContext.cs" /> -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs
r927 r931 1 using System; 2 using System.Collections.Generic; 3 using System.Linq; 4 using System.Text; 5 using Platnosci.Core.Interface; 1 using Platnosci.Core.Interface; 6 2 7 3 namespace Platnosci.Tests.Web … … 11 7 public string Translate(string className, string keyName) 12 8 { 13 if (keyName == "weryfikacja") return "weryfikacja"; 14 else if (keyName == "brakdanych") return "brakdanych"; 15 else if (keyName == "zaplacono") return "zaplacono"; 16 else if (keyName == "err_imieWK") return "imie"; 17 else if (keyName == "err_nazwiskoWK") return "nazwisko"; 18 else if (keyName == "error_hash") return "error_hash"; 9 switch (keyName) 10 { 11 case "weryfikacja": 12 return "weryfikacja"; 13 case "brakdanych": 14 return "brakdanych"; 15 case "zaplacono": 16 return "zaplacono"; 17 case "err_imieWK": 18 return "imie"; 19 case "err_nazwiskoWK": 20 return "nazwisko"; 21 case "error_hash": 22 return "error_hash"; 23 } 19 24 20 25 return ""; -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs
r930 r931 8 8 public class Function 9 9 { 10 public vPlatnosciEcard CreateInvoice(int id, string nip, string fak_numer, decimal brutto, byte SystemKsiegowy)10 public vPlatnosciEcard CreateInvoice(int id, string nip, string invoiceNumber, decimal brutto, byte systemKsiegowy) 11 11 { 12 12 var platnosc = new vPlatnosciEcard(); 13 13 platnosc.ID_faktury = id; 14 14 platnosc.nip = nip; 15 platnosc.Faktura_Numer = fak_numer;15 platnosc.Faktura_Numer = invoiceNumber; 16 16 platnosc.Brutto = brutto; 17 platnosc.SystemKsiegowyId = SystemKsiegowy;17 platnosc.SystemKsiegowyId = systemKsiegowy; 18 18 19 19 return platnosc; 20 20 } 21 public PlatnosciEcard CreateNewPayment(int order number, bool status, DateTime data, int id_faktury)21 public PlatnosciEcard CreateNewPayment(int orderNumber, bool status, DateTime data, int invoiceId) 22 22 { 23 23 var platnosc = new PlatnosciEcard(); 24 platnosc.ORDERNUMBER = order number;24 platnosc.ORDERNUMBER = orderNumber; 25 25 platnosc.Status = status; 26 26 platnosc.Status_data = data; 27 platnosc.IDFaktury = i d_faktury;27 platnosc.IDFaktury = invoiceId; 28 28 29 29 return platnosc; … … 45 45 } 46 46 47 public ControllerContext CreateControllerContext(string UserIdentity)47 public ControllerContext CreateControllerContext(string userIdentity) 48 48 { 49 49 50 50 var mock = new Mock<ControllerContext>(); 51 mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns( UserIdentity);51 mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(userIdentity); 52 52 mock.SetupGet(m => m.HttpContext.Request.IsAuthenticated).Returns(true); 53 53 -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs
r930 r931 1 using System; 2 using System.Collections.Generic; 3 using System.Linq; 4 using System.Text; 5 using NUnit.Framework; 1 using NUnit.Framework; 6 2 using Platnosci.Core.Linq; 7 3 using Platnosci.Core.Interface; 8 using MvcContrib.TestHelper;9 4 using Platnosci.Controllers; 10 5 using Platnosci.Models; … … 16 11 class MerchantControllerTests 17 12 { 18 private Function _f= new Function();19 private ITranslateManager _t= new FakeTranslation();13 private readonly Function _function = new Function(); 14 private readonly ITranslateManager _translateManager = new FakeTranslation(); 20 15 21 16 [Test] … … 24 19 { 25 20 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 26 vPlatnosciEcard platnosc = _f .CreateInvoice(123, "nip1", "", 0, 0);21 vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0); 27 22 repVPayment.Insert(platnosc); 28 23 29 Payer payer = _f .CreatePayer(123, "test", "test");24 Payer payer = _function.CreatePayer(123, "test", "test"); 30 25 31 var controller = new PlatnoscController(repVPayment, null, null, _t );32 controller.ControllerContext = _f .CreateControllerContext("nip2");26 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 27 controller.ControllerContext = _function.CreateControllerContext("nip2"); 33 28 34 29 var result = controller.Show(payer, "pl") as ViewResult; … … 43 38 { 44 39 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 45 vPlatnosciEcard platnosc = _f .CreateInvoice(12, "nip1", "", 0, 0);40 vPlatnosciEcard platnosc = _function.CreateInvoice(12, "nip1", "", 0, 0); 46 41 repVPayment.Insert(platnosc); 47 42 48 Payer payer = _f .CreatePayer(123, "test", "test");43 Payer payer = _function.CreatePayer(123, "test", "test"); 49 44 50 var controller = new PlatnoscController(repVPayment, null, null, _t );51 controller.ControllerContext = _f .CreateControllerContext("nip2");45 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 46 controller.ControllerContext = _function.CreateControllerContext("nip2"); 52 47 53 48 var result = controller.Show(payer, "pl") as ViewResult; -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs
r930 r931 1 1 using System; 2 using System.Collections.Generic;3 2 using System.Linq; 4 using System.Text;5 3 using System.Web.Mvc; 6 4 … … 11 9 using Platnosci.Core.Interface; 12 10 using Platnosci.Core.Linq; 13 using WatiN.Core;14 using System.Threading;15 11 using Platnosci.Models; 16 using Moq;17 12 18 13 namespace Platnosci.Tests.Web … … 21 16 class PlatnosciControllerTests 22 17 { 23 private ITranslateManager _t= new FakeTranslation();24 private stringmerchantNumber = "123";25 private intorderNumber = 9999;26 private string code_Ok= "payment_deposited"; //transakcja potwierdzona do rozliczenia27 private string code_Bad= "payment_declined"; //transakcja odrzucona28 private DateTimedata = DateTime.Now;29 private Function _f= new Function();18 private readonly ITranslateManager _translateManager = new FakeTranslation(); 19 private readonly string _merchantNumber = "123"; 20 private readonly int _orderNumber = 9999; 21 private const string CODE_OK = "payment_deposited"; //transakcja potwierdzona do rozliczenia 22 private const string CODE_BAD = "payment_declined"; //transakcja odrzucona 23 private readonly DateTime _data = DateTime.Now; 24 private readonly Function _function = new Function(); 30 25 31 26 [Test] … … 34 29 { 35 30 var repository = new Repository<PlatnosciEcard>(new FakeDataContext()); 36 var platnosci = _f .CreateNewPayment(orderNumber, false, DateTime.Now, 12345);31 var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); 37 32 repository.Insert(platnosci); 38 33 repository.SubmitChanges(); … … 41 36 42 37 var builder = new TestControllerBuilder(); 43 var controller = new PlatnoscController(null, repository, rep, _t );38 var controller = new PlatnoscController(null, repository, rep, _translateManager); 44 39 builder.InitializeController(controller); 45 builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());40 builder.Form.Add("MERCHANTNUMBER", _merchantNumber); 46 41 builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); 47 42 builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); 48 builder.Form.Add("ORDERNUMBER", orderNumber.ToString());49 builder.Form.Add("CURRENTSTATE", code_Ok);50 51 var result =controller.Status();43 builder.Form.Add("ORDERNUMBER", _orderNumber.ToString()); 44 builder.Form.Add("CURRENTSTATE", CODE_OK); 45 46 controller.Status(); 52 47 53 48 System.Diagnostics.Debug.WriteLine("rep:" + rep.Count() + " repPl: " + repository.Count() ); 54 49 55 var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault();56 Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo( merchantNumber));57 PlatnosciEcard payment_after_update = repository.FindOne(orderNumber);58 System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment _after_update.Status);59 Assert.That(payment _after_update.Status, Is.EqualTo(true));50 var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault(); 51 Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber)); 52 var paymentAfterUpdate = repository.FindOne(_orderNumber); 53 System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status); 54 Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true)); 60 55 } 61 56 [Test] … … 64 59 { 65 60 var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 66 var platnosci = _f .CreateNewPayment(orderNumber, false, DateTime.Now, 12345);61 var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); 67 62 repPayment.Insert(platnosci); 68 63 repPayment.SubmitChanges(); … … 70 65 71 66 var builder = new TestControllerBuilder(); 72 var controller = new PlatnoscController(null, repPayment, repConfirm, _t );67 var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager); 73 68 builder.InitializeController(controller); 74 builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());69 builder.Form.Add("MERCHANTNUMBER", _merchantNumber); 75 70 builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); 76 71 builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); 77 builder.Form.Add("ORDERNUMBER", orderNumber.ToString());78 builder.Form.Add("CURRENTSTATE", code_Bad);79 80 var result =controller.Status();81 82 var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault();83 Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo( merchantNumber));72 builder.Form.Add("ORDERNUMBER", _orderNumber.ToString()); 73 builder.Form.Add("CURRENTSTATE", CODE_BAD); 74 75 controller.Status(); 76 77 var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault(); 78 Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber)); 84 79 85 PlatnosciEcard payment_after_update = repPayment.FindOne(orderNumber);86 System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment _after_update.Status);87 Assert.That(payment _after_update.Status, Is.EqualTo(false));80 var paymentAfterUpdate = repPayment.FindOne(_orderNumber); 81 System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status); 82 Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false)); 88 83 } 89 84 … … 93 88 { 94 89 IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 95 PlatnosciEcard platnosc = _f .CreateNewPayment(orderNumber, false,data, 1);90 PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1); 96 91 repPayment.Insert(platnosc); 97 92 98 var controller = new PlatnoscController(null, repPayment, null, _t); 99 controller.UpdateStatus(orderNumber, code_Ok); 100 101 PlatnosciEcard payment_after_update = new PlatnosciEcard(); 102 payment_after_update = repPayment.FindOne(orderNumber); 103 System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status); 104 Assert.That(payment_after_update.Status, Is.EqualTo(true)); 93 var controller = new PlatnoscController(null, repPayment, null, _translateManager); 94 controller.UpdateStatus(_orderNumber, CODE_OK); 95 96 var paymentAfterUpdate = repPayment.FindOne(_orderNumber); 97 System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status); 98 Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true)); 105 99 } 106 100 [Test] … … 110 104 IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext()); 111 105 112 PlatnosciEcard platnosc = _f .CreateNewPayment(orderNumber, false,data, 1);106 PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1); 113 107 repPayment.Insert(platnosc); 114 108 115 var controller = new PlatnoscController(null, repPayment, null, _t); 116 controller.UpdateStatus(orderNumber, code_Bad); 117 118 PlatnosciEcard payment_after_update = new PlatnosciEcard(); 119 payment_after_update = repPayment.FindOne(i => i.ORDERNUMBER == orderNumber); 120 System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status); 121 Assert.That(payment_after_update.Status, Is.EqualTo(false)); 109 var controller = new PlatnoscController(null, repPayment, null, _translateManager); 110 controller.UpdateStatus(_orderNumber, CODE_BAD); 111 112 var paymentAfterUpdate = repPayment.FindOne(i => i.ORDERNUMBER == _orderNumber); 113 System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status); 114 Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false)); 122 115 } 123 116 [Test] … … 126 119 { 127 120 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 128 v PlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "", 0, 0);129 repVPayment.Insert(platnosc); 130 131 var controller = new PlatnoscController(repVPayment, null, null, _t );132 controller.ControllerContext = _f .CreateControllerContext("nip2");121 var platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0); 122 repVPayment.Insert(platnosc); 123 124 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 125 controller.ControllerContext = _function.CreateControllerContext("nip2"); 133 126 134 127 var result = controller.Show("123","pl") as ViewResult; … … 143 136 { 144 137 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 145 vPlatnosciEcard platnosc = _f .CreateInvoice(123, "", "", 0, 0);146 repVPayment.Insert(platnosc); 147 148 var controller = new PlatnoscController(repVPayment, null, null, _t );138 vPlatnosciEcard platnosc = _function.CreateInvoice(123, "", "", 0, 0); 139 repVPayment.Insert(platnosc); 140 141 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 149 142 //controller.setBrakDanych("Platnosc o takim id nie istnieje"); 150 143 … … 161 154 //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona 162 155 var repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 163 var invoice = _f .CreateInvoice(123, "nip1", "aaa", 0, 0);156 var invoice = _function.CreateInvoice(123, "nip1", "aaa", 0, 0); 164 157 repVPayment.Insert(invoice); 165 158 repVPayment.SubmitChanges(); 166 159 167 160 var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext()); 168 var confirm = _f .CreateConfirm(code_Ok, 123456);161 var confirm = _function.CreateConfirm(CODE_OK, 123456); 169 162 repConfirm.Insert(confirm); 170 163 repConfirm.SubmitChanges(); 171 164 172 var controller = new PlatnoscController(repVPayment, null, repConfirm, _t );173 controller.ControllerContext = _f .CreateControllerContext("nip1");165 var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager); 166 controller.ControllerContext = _function.CreateControllerContext("nip1"); 174 167 //controller.setZaplacono("Platnosc zostala uregulowana"); 175 168 … … 185 178 { 186 179 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 187 vPlatnosciEcard platnosc = _f .CreateInvoice(123, "nip1", "numer", 200, 0);180 vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0); 188 181 repVPayment.Insert(platnosc); 189 182 190 183 var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext()); 191 var confirm = _f .CreateConfirm(code_Ok, 1);184 var confirm = _function.CreateConfirm(CODE_OK, 1); 192 185 repConfirm.Insert(confirm); 193 186 repConfirm.SubmitChanges(); 194 187 195 var controller = new PlatnoscController(repVPayment, null, repConfirm, _t );196 controller.ControllerContext = _f .CreateControllerContext("nip1");188 var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager); 189 controller.ControllerContext = _function.CreateControllerContext("nip1"); 197 190 198 191 var result = controller.Show("123", "pl") as ViewResult; … … 209 202 { 210 203 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 211 vPlatnosciEcard platnosc = _f .CreateInvoice(123, "nip1", "numer", 200, 0);212 repVPayment.Insert(platnosc); 213 214 var controller = new PlatnoscController(repVPayment, null, null, _t );215 controller.ControllerContext = _f .CreateControllerContext("nip1");204 vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0); 205 repVPayment.Insert(platnosc); 206 207 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 208 controller.ControllerContext = _function.CreateControllerContext("nip1"); 216 209 217 Payer payer = _f .CreatePayer(123, "", "test"); //Brak imienia210 Payer payer = _function.CreatePayer(123, "", "test"); //Brak imienia 218 211 controller.Show(payer, "pl"); 219 212 Assert.That(controller.ModelState.IsValid, Is.False); … … 224 217 { 225 218 IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext()); 226 vPlatnosciEcard platnosc = _f .CreateInvoice(123, "nip1", "numer", 200, 0);227 repVPayment.Insert(platnosc); 228 229 var controller = new PlatnoscController(repVPayment, null, null, _t );230 controller.ControllerContext = _f .CreateControllerContext("nip1");231 232 Payer payer = _f.CreatePayer(123, "test", "test");233 var result = controller.Show(payer, "pl") as ViewResult;219 vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0); 220 repVPayment.Insert(platnosc); 221 222 var controller = new PlatnoscController(repVPayment, null, null, _translateManager); 223 controller.ControllerContext = _function.CreateControllerContext("nip1"); 224 225 var payer = _function.CreatePayer(123, "test", "test"); 226 controller.Show(payer, "pl"); 234 227 235 228 System.Diagnostics.Debug.WriteLine("Model powinien byc 'true'. Jest " + controller.ModelState.IsValid); -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs
r930 r931 1 using System.Linq; 2 using NUnit.Framework; 1 using NUnit.Framework; 3 2 using Platnosci.Core.Linq; 4 3 using Platnosci.Core.Interface; -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs
r930 r931 9 9 [Test] 10 10 [Category("UI")] 11 public void checkLoginCorrect()11 public void CheckLoginCorrect() 12 12 { 13 IEie = new IE("http://localhost:3646/pl/Account/LogOn");13 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 14 14 ie.TextField(Find.ByName("numer_faktury")).TypeText("24/HOL/2009"); 15 15 ie.TextField(Find.ByName("nip")).TypeText("501379568"); … … 20 20 [Test] 21 21 [Category("UI")] 22 public void checkErrorLogin()22 public void CheckErrorLogin() 23 23 { 24 IEie = new IE("http://localhost:3646/pl/Account/LogOn");24 var ie = new IE("http://localhost:3646/pl/Account/LogOn"); 25 25 ie.TextField(Find.ByName("numer_faktury")).TypeText(""); 26 26 ie.TextField(Find.ByName("nip")).TypeText("");
