Index: trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs =================================================================== --- trunk/eCard/eCardMVC/adMoto.Payments.Test/Web/eCardDataTests.cs (revision 971) +++ trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs (revision 982) @@ -2,26 +2,29 @@ using adMoto.Payments.Core; using adMoto.Payments.Core.Data; +using adMoto.Payments.Test.Fakes; using adMoto.Payments.Web.Models; using NUnit.Framework; -namespace adMoto.Payments.Test.Web +namespace adMoto.Payments.Test.Utils { [TestFixture] +// ReSharper disable InconsistentNaming public class eCardDataTests +// ReSharper restore InconsistentNaming { - private readonly Function _function = new Function(); - - [Test] - [Category("Unit")] - public void SetHash_Returns_zlyHash_When_Passing_Invalid_Merchant() - { - //Arrange - var repPayment = new Repository(new FakeDataContext()); - var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); + private readonly TestDataHelper _testDataHelper = new TestDataHelper(); + + [Test] + [Category("Unit")] + public void SetHash_Returns_ZlyHash_When_Passing_Invalid_Merchant() + { + //Arrange + var repPayment = new Repository(new FakeDataContext()); + var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); repPayment.Insert(platnosc); var ecarddata = new MerchantHelper(repPayment); - var merchant = new Merchant(){ + var merchant = new Merchant{ Payment = platnosc, Id = "171485000", @@ -42,13 +45,13 @@ //Arrange var repPayment = new Repository(new FakeDataContext()); - var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); - - repPayment.Insert(platnosc); - - var ecarddata = new MerchantHelper(repPayment); - - var merchant = new Merchant() - { - Payment = new PlatnosciEcard(){ + var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); + + repPayment.Insert(platnosc); + + var ecarddata = new MerchantHelper(repPayment); + + var merchant = new Merchant + { + Payment = new PlatnosciEcard{ ORDERDESCRIPTION = "dd", IDFaktury = 21, @@ -71,5 +74,5 @@ //Arrange var repPayment = new Repository(new FakeDataContext()); - var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); + var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 229; platnosc.CURRENCY = PaymentsUtils.PLN; @@ -79,5 +82,5 @@ var ecarddata = new MerchantHelper(repPayment); - var merchant = new Merchant() + var merchant = new Merchant { Payment = platnosc, @@ -95,9 +98,9 @@ [Test] [Category("Unit")] - public void SetHash_Returns_BAD_HASH_When_Invoice_Amount_Is_Zero() - { - //Arrange - var repPayment = new Repository(new FakeDataContext()); - var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); + public void SetHash_Returns_Bad_Hash_When_Invoice_Amount_Is_Zero() + { + //Arrange + var repPayment = new Repository(new FakeDataContext()); + var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 0; platnosc.CURRENCY = PaymentsUtils.PLN; @@ -107,5 +110,5 @@ var ecarddata = new MerchantHelper(repPayment); - var merchant = new Merchant() + var merchant = new Merchant { Payment = platnosc, @@ -123,9 +126,9 @@ [Test] [Category("Unit")] - public void SetHash_Returns_BAD_HASH_When_Password_Is_Wrong() - { - //Arrange - var repPayment = new Repository(new FakeDataContext()); - var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); + public void SetHash_Returns_Bad_Hash_When_Password_Is_Wrong() + { + //Arrange + var repPayment = new Repository(new FakeDataContext()); + var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 229; platnosc.CURRENCY = PaymentsUtils.PLN; @@ -135,5 +138,5 @@ var ecarddata = new MerchantHelper(repPayment); - var merchant = new Merchant() + var merchant = new Merchant { Payment = platnosc, @@ -155,5 +158,5 @@ //Arrange var repPayment = new Repository(new FakeDataContext()); - var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1); + var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1); platnosc.AMOUNT = 11; platnosc.CURRENCY = PaymentsUtils.PLN; @@ -163,5 +166,5 @@ var ecarddata = new MerchantHelper(repPayment); - var merchant = new Merchant() + var merchant = new Merchant { Payment = platnosc, @@ -174,5 +177,4 @@ //Assert - System.Diagnostics.Debug.WriteLine(result.Length); Assert.That(result.Length, Is.GreaterThan(30)); } @@ -183,35 +185,33 @@ { //Arrange - var idFaktury = 12345; - var amountPL = 5000; - var amountEUR = 1300; + const int idFaktury = 12345; + const int amountInPln = 5000; + const int amountInEur = 1300; var repVPayment = new Repository(new FakeDataContext()); - var invoice = _function.CreateForeignInvoice(idFaktury, "nip1", "abc/2009", amountPL, 0, amountEUR, "EUR"); + var invoice = _testDataHelper.CreateForeignInvoice(idFaktury, "nip1", "abc/2009", amountInPln, 0, amountInEur, "EUR"); repVPayment.Insert(invoice); - var payer = _function.CreatePayer(idFaktury, "test", "test"); + var payer = _testDataHelper.CreatePayer(idFaktury, "test", "test"); var repPayment = new Repository(new FakeDataContext()); var eCardData = new MerchantHelper(repPayment); //Act - var result = eCardData.CreateMerchantData(invoice, payer, "pl", "ahaah"); + eCardData.CreateMerchantData(invoice, payer, "pl", "ahaah"); var payment = repPayment.FindOne(i => i.IDFaktury == idFaktury); //Assert - System.Diagnostics.Debug.WriteLine("Faktura jest w EUR."); - System.Diagnostics.Debug.WriteLine("PLN:" + amountPL + "," + " EUR:" + amountEUR); - Assert.That(payment.AMOUNT, Is.EqualTo(amountEUR * 100)); - } - - [Test] - [Category("Unit")] - public void Create_Merchant_Data_Returns_BAD_HASH_When_Invoice_Amount_Is_Zero() - { - //Arrange - var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); - var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 0, 2); - - var payer = _function.CreatePayer(123, "test", "test"); + Assert.That(payment.AMOUNT, Is.EqualTo(amountInEur * 100)); + } + + [Test] + [Category("Unit")] + public void Create_Merchant_Data_Returns_Bad_Hash_When_Invoice_Amount_Is_Zero() + { + //Arrange + var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); + var invoice = _testDataHelper.CreateInvoice(123, "nip", "abc/2009", 0, 2); + + var payer = _testDataHelper.CreatePayer(123, "test", "test"); //Act @@ -219,5 +219,4 @@ //Assert - System.Diagnostics.Debug.WriteLine("Error: " + result.Error + " is not valid."); Assert.That(result.Error, Is.EqualTo("hash")); //dla wartosci amount=0 eCard zwroci hash o wartoĊ›ci "zlyHash" } @@ -229,7 +228,7 @@ //Arrange var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); - var invoice = _function.CreateInvoice(123, "nip", "", 200, 2); - - var payer = _function.CreatePayer(123, "test", "test"); + var invoice = _testDataHelper.CreateInvoice(123, "nip", "", 200, 2); + + var payer = _testDataHelper.CreatePayer(123, "test", "test"); //Act @@ -247,7 +246,7 @@ //Arrange var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); - var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2); - - var payer = _function.CreatePayer(123, "", "test"); + var invoice = _testDataHelper.CreateInvoice(123, "nip", "abc/2009", 200, 2); + + var payer = _testDataHelper.CreatePayer(123, "", "test"); //Act @@ -265,7 +264,7 @@ //Arrange var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); - var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2); - - var payer = _function.CreatePayer(123, "test", ""); + var invoice = _testDataHelper.CreateInvoice(123, "nip", "abc/2009", 200, 2); + + var payer = _testDataHelper.CreatePayer(123, "test", ""); //Act @@ -283,7 +282,7 @@ //Arrange var ecarddata = new MerchantHelper(new Repository(new FakeDataContext())); - var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2); - - var payer = _function.CreatePayer(123, "test", "test"); + var invoice = _testDataHelper.CreateInvoice(123, "nip", "abc/2009", 200, 2); + + var payer = _testDataHelper.CreatePayer(123, "test", "test"); //Act @@ -297,9 +296,9 @@ [Test] [Category("Unit")] - public void Get_Url_Returns_Correct_eCard_Url() - { - //Arrange - var pl = new PlatnosciEcard() {ORDERDESCRIPTION = "abc/2009"}; - var m = new Merchant(){Payment = pl, Id = "ABCD" }; + public void Get_Url_Returns_Correct_Ecard_Url() + { + //Arrange + var pl = new PlatnosciEcard {ORDERDESCRIPTION = "abc/2009"}; + var m = new Merchant {Payment = pl, Id = "ABCD" }; var eCardData = new MerchantHelper(new Repository(new FakeDataContext()));