Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs (revision 971) @@ -2,8 +2,8 @@ using adMoto.Payments.Core; using adMoto.Payments.Core.Data; +using adMoto.Payments.Web.Models; using NUnit.Framework; -using Platnosci.Models; - -namespace Platnosci.Tests.Web + +namespace adMoto.Payments.Test.Web { [TestFixture] @@ -21,11 +21,11 @@ repPayment.Insert(platnosc); - var ecarddata = new eCardData(repPayment); + var ecarddata = new MerchantHelper(repPayment); var merchant = new Merchant(){ - Payment = platnosc, - Id = "171485000", - Password = "ashSeth2", - }; + Payment = platnosc, + Id = "171485000", + Password = "ashSeth2", + }; //Act @@ -46,16 +46,16 @@ repPayment.Insert(platnosc); - var ecarddata = new eCardData(repPayment); - - var merchant = new Merchant() - { - Payment = new PlatnosciEcard(){ - ORDERDESCRIPTION = "dd", - IDFaktury = 21, - Data = DateTime.Now - }, - Id = "171485000", - Password = "ashSeth2", - }; + var ecarddata = new MerchantHelper(repPayment); + + var merchant = new Merchant() + { + Payment = new PlatnosciEcard(){ + ORDERDESCRIPTION = "dd", + IDFaktury = 21, + Data = DateTime.Now + }, + Id = "171485000", + Password = "ashSeth2", + }; //Act @@ -73,16 +73,16 @@ var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 229; - platnosc.CURRENCY = FunkcjePlatnosci.PLN; - - repPayment.Insert(platnosc); - - var ecarddata = new eCardData(repPayment); - - var merchant = new Merchant() - { - Payment = platnosc, - Id = "171485000", - Password = "ashSeth2", - }; + platnosc.CURRENCY = PaymentsUtils.PLN; + + repPayment.Insert(platnosc); + + var ecarddata = new MerchantHelper(repPayment); + + var merchant = new Merchant() + { + Payment = platnosc, + Id = "171485000", + Password = "ashSeth2", + }; //Act @@ -101,16 +101,16 @@ var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 0; - platnosc.CURRENCY = FunkcjePlatnosci.PLN; - - repPayment.Insert(platnosc); - - var ecarddata = new eCardData(repPayment); - - var merchant = new Merchant() - { - Payment = platnosc, - Id = "171485000", - Password = "ashSeth2", - }; + platnosc.CURRENCY = PaymentsUtils.PLN; + + repPayment.Insert(platnosc); + + var ecarddata = new MerchantHelper(repPayment); + + var merchant = new Merchant() + { + Payment = platnosc, + Id = "171485000", + Password = "ashSeth2", + }; //Act @@ -129,16 +129,16 @@ var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 229; - platnosc.CURRENCY = FunkcjePlatnosci.PLN; - - repPayment.Insert(platnosc); - - var ecarddata = new eCardData(repPayment); - - var merchant = new Merchant() - { - Payment = platnosc, - Id = "TEST", - Password = "test", - }; + platnosc.CURRENCY = PaymentsUtils.PLN; + + repPayment.Insert(platnosc); + + var ecarddata = new MerchantHelper(repPayment); + + var merchant = new Merchant() + { + Payment = platnosc, + Id = "TEST", + Password = "test", + }; //Act @@ -157,16 +157,16 @@ var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 11; - platnosc.CURRENCY = FunkcjePlatnosci.PLN; - - repPayment.Insert(platnosc); - - var ecarddata = new eCardData(repPayment); - - var merchant = new Merchant() - { - Payment = platnosc, - Id = "171485000", - Password = "ashSeth2", - }; + platnosc.CURRENCY = PaymentsUtils.PLN; + + repPayment.Insert(platnosc); + + var ecarddata = new MerchantHelper(repPayment); + + var merchant = new Merchant() + { + Payment = platnosc, + Id = "171485000", + Password = "ashSeth2", + }; //Act @@ -193,5 +193,5 @@ var payer = _function.CreatePayer(idFaktury, "test", "test"); var repPayment = new Repository(new FakeDataContext()); - var eCardData = new eCardData(repPayment); + var eCardData = new MerchantHelper(repPayment); //Act @@ -210,5 +210,5 @@ { //Arrange - var ecarddata = new eCardData(new Repository(new FakeDataContext())); + var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 0, 2); @@ -228,5 +228,5 @@ { //Arrange - var ecarddata = new eCardData(new Repository(new FakeDataContext())); + var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); var invoice = _function.CreateInvoice(123, "nip", "", 200, 2); @@ -246,5 +246,5 @@ { //Arrange - var ecarddata = new eCardData(new Repository(new FakeDataContext())); + var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2); @@ -264,5 +264,5 @@ { //Arrange - var ecarddata = new eCardData(new Repository(new FakeDataContext())); + var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2); @@ -282,5 +282,5 @@ { //Arrange - var ecarddata = new eCardData(new Repository(new FakeDataContext())); + var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2); @@ -302,5 +302,5 @@ var pl = new PlatnosciEcard() {ORDERDESCRIPTION = "abc/2009"}; var m = new Merchant(){Payment = pl, Id = "ABCD" }; - var eCardData = new eCardData(new Repository(new FakeDataContext())); + var eCardData = new MerchantHelper(new Repository(new FakeDataContext())); //Act Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PaymentUtilsTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PaymentUtilsTests.cs (revision 971) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PaymentUtilsTests.cs (revision 971) @@ -0,0 +1,72 @@ +using System.Linq; +using adMoto.Payments.Core; +using adMoto.Payments.Core.Data; +using adMoto.Payments.Core.Interfaces; +using adMoto.Payments.Web.Models; +using NUnit.Framework; + +namespace adMoto.Payments.Test.Web +{ + [TestFixture] + public class PaymentUtilsTests + { + private readonly Function _function = new Function(); + private readonly ITranslateManager _translateManager = new FakeTranslation(); + + [Test, Sequential] + [Category("Unit")] + public void GetCurrency_Returns_Correct_Currency( + [Values(null, "", "eur", "usd", "gbp", "GBP")] string input, + [Values(PaymentsUtils.PLN, PaymentsUtils.PLN, PaymentsUtils.EUR, PaymentsUtils.USD, PaymentsUtils.GBP, PaymentsUtils.GBP)] string output + ) + { + //Arrange + var funkcjePlantosi = new PaymentsUtils(); + + //Act + var result = funkcjePlantosi.GetCurrency(input); + + //Assert + Assert.That(result, Is.EqualTo(output)); + } + + [Test] + [Category("Unit")] + public void CreateAndAddNewPayment_Creates_PlatnosciEcard() + { + //Arrange + var idFaktury = 123; + var repPayment = new Repository(new FakeDataContext()); + var paymentsUtils = new PaymentsUtils(repPayment, _translateManager); + var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2); + var payer = _function.CreatePayer(idFaktury, "test", "test"); + var waluta = new Waluta { Amount = 200, Currency = PaymentsUtils.PLN }; + + //Act + paymentsUtils.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId"); + var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault(); + + //Act + Assert.That(payment.AMOUNT, Is.EqualTo(200)); + } + + [Test, Sequential] + [Category("Unit")] + public void BruttoToString_Returns_Correct_Amount( + [Values(null, "", "pln", "PLN", "GBP", "gbp", "xx")] string input, + [Values("100 PLN ", "100 PLN ", "100 PLN ", "100 PLN ", "100 PLN (1 GBP)", "100 PLN (1 GBP)", "100 PLN (1 XX)")] string output + ) + { + //Arrange + var funkcjePlantosi = new PaymentsUtils(); + + //Act + var result = funkcjePlantosi.BruttoToString(100, 1, input); + + //Act + System.Diagnostics.Debug.WriteLine(result); + Assert.That(result, Is.EqualTo(output)); + } + + } +} Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 971) @@ -4,9 +4,9 @@ using adMoto.Payments.Core.Data; using adMoto.Payments.Core.Interfaces; +using adMoto.Payments.Web.Controllers; +using adMoto.Payments.Web.Models; using NUnit.Framework; -using Platnosci.Controllers; -using Platnosci.Models; - -namespace Platnosci.Tests.Web + +namespace adMoto.Payments.Test.Web { [TestFixture] @@ -201,5 +201,5 @@ //Assert Assert.That(result.ViewName, Is.EqualTo("Paid")); - Assert.That(view.info, Is.EqualTo("zaplacono")); + Assert.That(view.Info, Is.EqualTo("zaplacono")); } @@ -224,10 +224,10 @@ 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); + System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.Invoice.Brutto); + System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.Invoice.Faktura_Numer); //Assert - Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(200)); - Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo("numer")); + Assert.That(view.Invoice.Brutto, Is.EqualTo(200)); + Assert.That(view.Invoice.Faktura_Numer, Is.EqualTo("numer")); } Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/StatusTest.cs (revision 971) @@ -4,8 +4,7 @@ using NUnit.Framework; using MvcContrib.TestHelper; -using Platnosci.Controllers; using System.Web.Mvc; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { [TestFixture] Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs (revision 971) @@ -3,5 +3,5 @@ using NUnit.Framework; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { [TestFixture] Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 971) @@ -5,5 +5,5 @@ using adMoto.Payments.Core.Interfaces; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { public class FakeDataContext : IDataContext Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeTranslation.cs (revision 971) @@ -1,5 +1,5 @@ using adMoto.Payments.Core.Interfaces; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { public class FakeTranslation : ITranslateManager Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs (revision 971) @@ -5,5 +5,5 @@ using Moq; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { public class Function Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/ValidationMerchantClassTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/ValidationMerchantClassTests.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/ValidationMerchantClassTests.cs (revision 971) @@ -4,5 +4,5 @@ using NUnit.Framework; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { public class ValidationMerchantClassTests Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 970) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs (revision 971) @@ -2,10 +2,10 @@ using adMoto.Payments.Core.Data; using adMoto.Payments.Core.Interfaces; +using adMoto.Payments.Web.Controllers; +using adMoto.Payments.Web.Models; using NUnit.Framework; -using Platnosci.Controllers; -using Platnosci.Models; using System.Web.Mvc; -namespace Platnosci.Tests.Web +namespace adMoto.Payments.Test.Web { [TestFixture] Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs (revision 960) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs (revision 971) @@ -2,5 +2,5 @@ using WatiN.Core; -namespace Platnosci.Tests.Web.UI +namespace adMoto.Payments.Test.Web.UI { [TestFixture] Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs (revision 960) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs (revision 971) @@ -2,5 +2,5 @@ using WatiN.Core; -namespace Platnosci.Tests.Web.UI +namespace adMoto.Payments.Test.Web.UI { [TestFixture] Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs (revision 960) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs (revision 971) @@ -2,5 +2,5 @@ using WatiN.Core; -namespace Platnosci.Tests.Web.UI +namespace adMoto.Payments.Test.Web.UI { [TestFixture] Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (revision 970) +++ (revision ) @@ -1,72 +1,0 @@ -using System.Linq; -using adMoto.Payments.Core; -using adMoto.Payments.Core.Data; -using adMoto.Payments.Core.Interfaces; -using NUnit.Framework; -using Platnosci.Models; - -namespace Platnosci.Tests.Web -{ - [TestFixture] - public class FunkcjePlatnosciTests - { - private readonly Function _function = new Function(); - private readonly ITranslateManager _translateManager = new FakeTranslation(); - - [Test, Sequential] - [Category("Unit")] - public void GetCurrency_Returns_Correct_Currency( - [Values(null, "", "eur", "usd", "gbp", "GBP")] string input, - [Values(FunkcjePlatnosci.PLN, FunkcjePlatnosci.PLN, FunkcjePlatnosci.EUR, FunkcjePlatnosci.USD, FunkcjePlatnosci.GBP, FunkcjePlatnosci.GBP)] string output - ) - { - //Arrange - var funkcjePlantosi = new FunkcjePlatnosci(); - - //Act - var result = funkcjePlantosi.GetCurrency(input); - - //Assert - Assert.That(result, Is.EqualTo(output)); - } - - [Test] - [Category("Unit")] - public void CreateAndAddNewPayment_Creates_PlatnosciEcard() - { - //Arrange - var idFaktury = 123; - var repPayment = new Repository(new FakeDataContext()); - var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager); - var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2); - var payer = _function.CreatePayer(idFaktury, "test", "test"); - var waluta = new Waluta { Amount = 200, Currency = FunkcjePlatnosci.PLN }; - - //Act - funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId"); - var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault(); - - //Act - Assert.That(payment.AMOUNT, Is.EqualTo(200)); - } - - [Test, Sequential] - [Category("Unit")] - public void BruttoToString_Returns_Correct_Amount( - [Values(null, "", "pln", "PLN", "GBP", "gbp", "xx")] string input, - [Values("100 PLN ", "100 PLN ", "100 PLN ", "100 PLN ", "100 PLN (1 GBP)", "100 PLN (1 GBP)", "100 PLN (1 XX)")] string output - ) - { - //Arrange - var funkcjePlantosi = new FunkcjePlatnosci(); - - //Act - var result = funkcjePlantosi.BruttoToString(100, 1, input); - - //Act - System.Diagnostics.Debug.WriteLine(result); - Assert.That(result, Is.EqualTo(output)); - } - - } -}