Index: branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 895)
+++ branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 939)
@@ -32,7 +32,11 @@
+
+ False
+ ..\lib\Interop.SHDocVw.dll
+
False
- ..\..\..\..\Documents and Settings\Administrator\Pulpit\Moq.4.0.812.4-bin\Moq.dll
+ ..\lib\Moq.dll
@@ -74,12 +78,16 @@
False
- ..\..\..\..\Documents and Settings\Administrator\Pulpit\WatiN-2.0.10.928-net-2.0\bin\WatiN.Core.dll
+ ..\lib\WatiN.Core.dll
+
+
+
+
Index: branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 895)
+++ branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 939)
@@ -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,54 +16,41 @@
class PlatnosciControllerTests
{
- 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 string testNip1 = "12345";
- private string testNip2 = "01234";
- private int testIdFaktury = 1000;
- 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();
- private FunkcjePlatnosci _func = new FunkcjePlatnosci();
-
+ private readonly ITranslateManager _translateManager = new FakeTranslation();
+ private const string MERCHANT_NUMBER = "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]
[Category("Unit")]
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));
-
+ var repository = new Repository(new FakeDataContext());
+ var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
+ repository.Insert(platnosci);
+ repository.SubmitChanges();
+
+ IRepository rep = new Repository(new FakeDataContext());
+
+ var builder = new TestControllerBuilder();
+ var controller = new PlatnoscController(null, repository, rep, _translateManager);
+ builder.InitializeController(controller);
+ builder.Form.Add("MERCHANTNUMBER", MERCHANT_NUMBER);
+ 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);
+
+ 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(MERCHANT_NUMBER));
+ var paymentAfterUpdate = repository.FindOne(_orderNumber);
+ System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status);
+ Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true));
}
[Test]
@@ -76,152 +58,156 @@
public void Status_Saves_Correct_Transaction_IncorrectUpdate()
{
- FakeDataContext fake = new FakeDataContext(2);
- DateTime datka = DateTime.Now;
+ var repPayment = new Repository(new FakeDataContext());
+ var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
+ repPayment.Insert(platnosci);
+ repPayment.SubmitChanges();
+ IRepository repConfirm = new Repository(new FakeDataContext());
+
var builder = new TestControllerBuilder();
- var controller = new PlatnoscController(fake,test);
+ var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager);
builder.InitializeController(controller);
- builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
+ builder.Form.Add("MERCHANTNUMBER", MERCHANT_NUMBER);
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();
-
- IRepository _rep = new Repository(fake);
- var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First();
- 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(MERCHANT_NUMBER));
- 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.LessThanOrEqualTo(datka));
- }
+ var paymentAfterUpdate = repPayment.FindOne(_orderNumber);
+ System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status);
+ Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false));
+ }
+
[Test]
[Category("Unit")]
public void StatusIsUpdated()
{
- 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);
+ IRepository repPayment = new Repository(new FakeDataContext());
+ PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1);
+ repPayment.Insert(platnosc);
+
+ 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]
+ [Category("Unit")]
+ public void StatusIsNotUpdated()
+ {
+ IRepository repPayment = new Repository(new FakeDataContext());
+
+ PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1);
+ repPayment.Insert(platnosc);
+
+ 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]
+ [Category("Unit")]
+ public void ActionShowPayment_IncorrectUserIdentity_ReturnErrorView()
+ {
+ IRepository repVPayment = new Repository(new FakeDataContext());
+ 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;
+ var error = (ErrorViewData)result.ViewData.Model;
+
+ Assert.That(error.Error, Is.EqualTo("weryfikacja"));
+ Assert.That(result.ViewName, Is.EqualTo("Error1"));
+ }
+ [Test]
+ [Category("Unit")]
+ public void ActionShowPayment_PaymentNotFound_ReturnErrorView()
+ {
+ IRepository repVPayment = new Repository(new FakeDataContext());
+ 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");
+
+ var result = controller.Show("1234", "pl") as ViewResult;
+ var error = (ErrorViewData)result.ViewData.Model;
+
+ Assert.That(error.Error, Is.EqualTo("brakdanych"));
+ Assert.That(result.ViewName, Is.EqualTo("Error1"));
+ }
+ [Test]
+ [Category("Unit")]
+ public void ActionShowPayment_PaymentIsPaid()
+ {
+ //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona
+ var repVPayment = new Repository(new FakeDataContext());
+ var invoice = _function.CreateInvoice(123, "nip1", "aaa", 0, 0);
+ repVPayment.Insert(invoice);
+ repVPayment.SubmitChanges();
+
+ var repConfirm = new Repository(new FakeDataContext());
+ var confirm = _function.CreateConfirm(CODE_OK, 123456);
+ repConfirm.Insert(confirm);
+ repConfirm.SubmitChanges();
+
+ var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager);
+ controller.ControllerContext = _function.CreateControllerContext("nip1");
+ //controller.setZaplacono("Platnosc zostala uregulowana");
+
+ var result = controller.Show("123", "pl") as ViewResult;
+ var view = (InvoiceDetailsViewData)result.ViewData.Model;
+
+ Assert.That(result.ViewName, Is.EqualTo("Paid"));
+ Assert.That(view.info, Is.EqualTo("zaplacono"));
+ }
+ [Test]
+ [Category("Unit")]
+ public void ActionShowPayment_CorrectData_ReturnViewForPayment()
+ {
+ IRepository repVPayment = new Repository(new FakeDataContext());
+ vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0);
+ repVPayment.Insert(platnosc);
+
+ var repConfirm = new Repository(new FakeDataContext());
+ var confirm = _function.CreateConfirm(CODE_OK, 1);
+ repConfirm.Insert(confirm);
+ repConfirm.SubmitChanges();
+
+ var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager);
+ controller.ControllerContext = _function.CreateControllerContext("nip1");
+
+ var result = controller.Show("123", "pl") as ViewResult;
+
+ var view = (InvoiceDetailsViewData)result.ViewData.Model;
+ System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.vPlatnosciEcard.Brutto);
+ System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.vPlatnosciEcard.Faktura_Numer);
+ Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(200));
+ Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo("numer"));
+ }
+ [Test]
+ [Category("Unit")]
+ public void AfterPay_PaymentIsNotValid()
+ {
+ IRepository repVPayment = new Repository(new FakeDataContext());
+ 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");
- 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,test);
- controller.UpdateStatus(orderNumber, code_Bad);
-
- PlatnosciEcard payment_after_update = new PlatnosciEcard();
- payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber);
- Assert.That(payment_after_update.Status_data, Is.EqualTo(data));
- }
- [Test]
- [Category("Unit")]
- public void ActionShowPayment_IncorrectUserIdentity_ReturnErrorView()
- {
- FakeDataContext fake = new FakeDataContext();
- IRepository _rep = new Repository(fake);
-
- vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, 0, 0);
- _rep.Insert(platnosc);
-
- var controller = new PlatnoscController(fake,test);
- controller.ControllerContext = _f.createControllerContext(testNip2);
- controller.setWeryfikacja("Niepoprawny nip");
-
- var result = controller.Show(testIdFaktury.ToString(),"pl") as ViewResult;
- var error = (ErrorViewData)result.ViewData.Model;
-
- Assert.That(error.error, Is.EqualTo("Niepoprawny nip"));
- Assert.That(result.ViewName, Is.EqualTo("Error1"));
- }
- [Test]
- [Category("Unit")]
- public void ActionShowPayment_PaymentNotFound_ReturnErrorView()
- {
- FakeDataContext fake = new FakeDataContext();
- // IRepository _rep = new Repository(fake);
-
- var controller = new PlatnoscController(fake,test);
-
- controller.ControllerContext = _f.createControllerContext(testNip1);
- controller.setBrakDanych("Platnosc o takim id nie istnieje");
-
- var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult;
- var error = (ErrorViewData)result.ViewData.Model;
-
- Assert.That(error.error, Is.EqualTo("Platnosc o takim id nie istnieje"));
- Assert.That(result.ViewName, Is.EqualTo("Error1"));
- }
- [Test]
- [Category("Unit")]
- public void ActionShowPayment_PaymentIsPaid(){
- //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona
- FakeDataContext fake = new FakeDataContext(1);
- var controller = new PlatnoscController(fake,test);
-
- controller.ControllerContext = _f.createControllerContext(testNip1);
- controller.setZaplacono("Platnosc zostala uregulowana");
-
- var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult;
- var view = (InvoiceDetailsViewData)result.ViewData.Model;
-
- Assert.That(result.ViewName, Is.EqualTo("Paid"));
- Assert.That(view.info, Is.EqualTo("Platnosc zostala uregulowana"));
- }
- [Test]
- [Category("Unit")]
- public void ActionShowPayment_CorrectData_ReturnViewForPayment()
- {
- FakeDataContext fake = new FakeDataContext();
- IRepository _rep = new Repository(fake);
-
- vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 0);
- _rep.Insert(platnosc);
-
- var controller = new PlatnoscController(fake,test);
- controller.ControllerContext = _f.createControllerContext(testNip1);
-
- var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult;
- Assert.IsInstanceOfType(typeof(InvoiceDetailsViewData), result.ViewData.Model);
-
- var view = (InvoiceDetailsViewData)result.ViewData.Model;
- Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(testBrutto));
- Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo(testNumerFaktury));
- }
- [Test]
- [Category("Unit")]
- public void AfterPay_PaymentIsNotValid()
- {
- FakeDataContext fake = new FakeDataContext();
- IRepository _rep = new Repository(fake);
-
- vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 2);
- _rep.Insert(platnosc);
-
- var controller = new PlatnoscController(fake,1);
- controller.ControllerContext = _f.createControllerContext(testNip1);
-
- Payer payer = _f.createPayer(testIdFaktury, "", "test"); //Brak imienia
+ Payer payer = _function.CreatePayer(123, "", "test"); //Brak imienia
controller.Show(payer, "pl");
-
Assert.That(controller.ModelState.IsValid, Is.False);
}
@@ -230,18 +216,16 @@
public void AfterPay_PaymentIsValid()
{
- FakeDataContext fake = new FakeDataContext();
- IRepository _rep = new Repository(fake);
-
- vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 2);
- _rep.Insert(platnosc);
-
- var controller = new PlatnoscController(fake,test);
- controller.ControllerContext = _f.createControllerContext(testNip1);
-
- Payer payer = _f.createPayer(testIdFaktury, "test", "test");
- var result = controller.Show(payer, "pl") as ViewResult;
-
- System.Diagnostics.Debug.WriteLine("AfterPay_PaymentIsValid_Test");
- Assert.That(controller.ModelState.IsValid, Is.True, "Model powinien byc true");
+ IRepository repVPayment = new Repository(new FakeDataContext());
+ 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);
+ Assert.That(controller.ModelState.IsValid, Is.True);
}
}