Zbiór zmian 960

Data:

2009-12-22 10:43:43 (16 years ago)

Autor:

marek

Opis:

re #215

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

• Platnosci.Tests/Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
• Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (zmodyfikowane) (4 diffs)
• Platnosci.Tests/Web/MerchantControllerTests.cs (zmodyfikowane) (2 diffs)
• Platnosci.Tests/Web/UI (dodane)
• Platnosci.Tests/Web/UI/AuthenticationTests.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIAccountTest.cs) (2 diffs)
• Platnosci.Tests/Web/UI/MerchantTests.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIPlatnosciTests.cs) (4 diffs)
• Platnosci.Tests/Web/UI/ValidationTests.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci.Tests/Web/UIFieldTest.cs) (3 diffs)
• Platnosci.Tests/Web/eCardDataTests.cs (zmodyfikowane) (6 diffs)
• Platnosci/Models/eCardData.cs (zmodyfikowane) (7 diffs)

trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj

@@ -93 +93 @@
     <Compile Include="Web\StatusTest.cs" />
     <Compile Include="Web\TestMethods.cs" />
-    <Compile Include="Web\UIAccountTest.cs" />
-    <Compile Include="Web\UIFieldTest.cs" />
-    <Compile Include="Web\UIPlatnosciTests.cs" />
+    <Compile Include="Web\UI\AuthenticationTests.cs" />
+    <Compile Include="Web\UI\ValidationTests.cs" />
+    <Compile Include="Web\UI\MerchantTests.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using NUnit.Framework;
 using Platnosci.Models;
@@ -19 +16 @@
         [Test, Sequential]
         [Category("Unit")]
-        public void GetCurrency_Returns_PLN_When_Passing_Null(
+        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
@@ -28 +25 @@
             Assert.That(result, Is.EqualTo(output));
         }
+
         [Test]
         [Category("Unit")]
-        public void TestMethodCreateAndAddNewPaymentOk()
+        public void CreateAndAddNewPayment_Creates_PlatnosciEcard()
         {
             var idFaktury = 123;
@@ -38 +36 @@
             var payer = _function.CreatePayer(idFaktury, "test", "test");
             var waluta = new Waluta { Amount = 200, Currency = FunkcjePlatnosci.PLN };
-            var result = funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
+            funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
 
             var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
-            Assert.That(payment.IDFaktury, Is.EqualTo(idFaktury));
+            Assert.That(payment.AMOUNT, Is.EqualTo(200));
         }
     }

trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs

@@ -17 +17 @@
         [Test]
         [Category("Unit")]
-        public void IncorrectUserIdentity_ReturnErrorView()
-        {
+        public void Merchant_Action_Returns_Error_When_Passing_Incorrect_User_Identity()
+        {
+            //Arrange
             IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
             vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "", 0, 0);
@@ -28 +29 @@
             controller.ControllerContext = _function.CreateControllerContext("nip2");
 
+            //Act
             var result = controller.Merchant(payer, "pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
+            //Assert
             Assert.That(error.Error, Is.EqualTo("weryfikacja"));
             Assert.That(result.ViewName, Is.EqualTo("Error1"));
         }
+
         [Test]
         [Category("Unit")]

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs

@@ -2 +2 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web
+namespace Platnosci.Tests.Web.UI
 {
     [TestFixture]
-    public class UIAccountTest
+    public class AuthenticationTests
     {
         [Test]
         [Category("UI")]
-        public void CheckErrorLogin()
+        public void Can_Not_Login_When_Using_InValid_Login_Information()
         {
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");
@@ -23 +23 @@
         [Test]
         [Category("UI")]
-        public void CheckLoginCorrect()
+        public void Can_Login_When_Using_Correct_Login_Information()
         {
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs

@@ -2 +2 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web
+namespace Platnosci.Tests.Web.UI
 {
     [TestFixture]
-    public class UIPlatnosciTests
+    public class MerchantTests
     {
         [Test]
         [Category("UI")]
-        public void CheckCorrectPay()
+        public void Redirects_To_Ecard_When_All_Details_Are_Correct()
         {
             const string test = "test";
@@ -21 +21 @@
             ie.Button(Find.ById("place")).Click();
             Assert.IsTrue(ie.ContainsText("Imię i nazwisko:" + test + " " + test));
+            Assert.IsTrue(ie.Url.Contains("https://pay.ecard.pl/"));
             ie.ForceClose();
             ie.Close();
@@ -28 +29 @@
         [Test]
         [Category("UI")]
-        public void CheckErrorPay()
+        public void Returns_ZlyHash_When_Invoice_Amount_Is_Zero()
         {
-            const string test = "test";
-            var ie = new IE("http://localhost:3646/pl/Account/LogOn");
-            ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
-            ie.TextField(Find.ByName("nip")).TypeText("854956281");
-            ie.Button(Find.ById("loguj")).Click();
+            // wartosc faktury 1/SLJ/2009 jest 0 (zero)
+            // wowczas eCard powinien zwrocic zlyHash - stala informujaca, ze cos jest nie tak...
 
-            ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test);
-            ie.TextField(Find.ByName("Payer.LastName")).TypeText("");
-            ie.Button(Find.ById("place")).Click();
-            Assert.IsTrue(ie.ContainsText("Proszę podać"));
-            ie.ForceClose();
-            ie.Close();
-            ie.Dispose();
-        }
-        [Test]
-        [Category("UI")]
-        public void AmountIsZeroReturnZlyHash()
-        {
             const string test = "test";
             var ie = new IE("http://localhost:3646/pl/Account/LogOn");
@@ -61 +47 @@
             ie.Close();
             ie.Dispose();
-            
         }
     }

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs

@@ -2 +2 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web
+namespace Platnosci.Tests.Web.UI
 {
     [TestFixture]
-    public class UIFieldTest
+    public class ValidationTests
     {
         [Test]
         [Category("UI")]
-        public void FirstnameIsTooLong()
+        public void Validates_When_Firstname_Is_Too_Long()
         {
             const string test = "test";
@@ -24 +24 @@
             ie.Close();
             ie.Dispose();
-        } 
+        }
+
         [Test]
         [Category("UI")]
-        public void SurnameIsTooLong()
+        public void Validates_When_Surname_Is_Too_Long()
         {
             const string test = "test";
@@ -42 +43 @@
             ie.Close();
             ie.Dispose();
-        } 
+        }
+
+        [Test]
+        [Category("UI")]
+        public void Validates_When_LastName_Is_Empty()
+        {
+            const string test = "test";
+            var ie = new IE("http://localhost:3646/pl/Account/LogOn");
+            ie.TextField(Find.ByName("numerFaktury")).TypeText("27/ASZ/2009");
+            ie.TextField(Find.ByName("nip")).TypeText("854956281");
+            ie.Button(Find.ById("loguj")).Click();
+
+            ie.TextField(Find.ByName("Payer.FirstName")).TypeText(test);
+            ie.TextField(Find.ByName("Payer.LastName")).TypeText("");
+            ie.Button(Find.ById("place")).Click();
+            Assert.IsTrue(ie.ContainsText("Proszę podać"));
+            ie.ForceClose();
+            ie.Close();
+            ie.Dispose();
+        }
     }
 }

trunk/eCard/eCardMVC/Platnosci.Tests/Web/eCardDataTests.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using NUnit.Framework;
 using Platnosci.Models;
-using Platnosci.Core;
-using Platnosci.Core.Interface;
 using Platnosci.Core.Linq;
 
@@ -15 +10 @@
     { 
         private readonly Function _function = new Function();
+
         [Test]
         [Category("Unit")]
-        public void Set_Hash_Return_zlyHash(){
+        public void SetHash_Returns_zlyHash_When_Passing_Invalid_Merchant()
+        {
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
@@ -32 +29 @@
             Assert.That(result, Is.EqualTo(Merchant.BAD_HASH));
         }
+        
         [Test]
         [Category("Unit")]
-        public void Set_Hash_Return_Payment_Is_Null()
+        public void SetHash_Returns_PaymentErrorInfo_When_Passing_Invalid_Payment()
         {
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
@@ -58 +56 @@
         [Test]
         [Category("Unit")]
-        public void Set_Hash_Return_Correct_Hash()
+        public void SetHash_Returns_Correct_Hash_When_Passing_Valid_Data()
         {
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
@@ -78 +76 @@
             Assert.That(result.Length, Is.EqualTo(48) );
         }
+
         [Test]
         [Category("Unit")]
-        public void Set_Hash_Amount_Zero_Return_zlyHash()
+        public void SetHash_Returns_BAD_HASH_When_Invoice_Amount_Is_Zero()
         {
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
@@ -100 +99 @@
             Assert.That(result, Is.EqualTo(Merchant.BAD_HASH));
         }
+
         [Test]
         [Category("Unit")]
-        public void Set_Hash_Bad_Password_Return_zlyHash()
+        public void SetHash_Returns_BAD_HASH_When_Password_Is_Wrong()
         {
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());

trunk/eCard/eCardMVC/Platnosci/Models/eCardData.cs

@@ -1 +1 @@
 using System;
-using System.Web;
 using System.Net;
 using System.IO;
 using System.Linq;
-using System.Web.Mvc;
 using System.Configuration;
 using Platnosci.Core.Linq;
@@ -16 +14 @@
         private readonly FunkcjePlatnosci _funkcjePlatnosci;
         private IRepository<PlatnosciEcard> _repPayment;
-        
+
         public eCardData(IRepository<PlatnosciEcard> repPayment)
         {
@@ -25 +23 @@
         public String GetUrl(Merchant merchant)
         {
-            if (merchant == null) 
-                throw new ArgumentNullException("parametr merchant is null in GetUrl method");
-            
+            if (merchant == null)
+                throw new ArgumentNullException("merchant");
+
             var dane = ConfigurationManager.AppSettings["eCard.Url"] + "?ORDERDESCRIPTION=" + merchant.Payment.ORDERDESCRIPTION;
             dane += "&AMOUNT=" + merchant.Payment.AMOUNT + "&CURRENCY=" + merchant.Payment.CURRENCY;
@@ -42 +40 @@
         {
             var merchant = new Merchant();
-           
+
             var waluta = _funkcjePlatnosci.SetAmount(invoice);
             var newPayment = _funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, sessionId);
 
             merchant.SystemKsiegowy = invoice.SystemKsiegowyId.ToString();
-            if (ConfigurationManager.AppSettings["wersja"] == "TEST")
-                merchant.SystemKsiegowy = "2";
+
+#if DEBUG
+            //TODO: find better method to set SystemKsiegowy when testing or developing
+            merchant.SystemKsiegowy = "2";
+#endif
 
             merchant.Payment = newPayment;
@@ -59 +60 @@
             var linkFail = ConfigurationManager.AppSettings["Strona"];
             linkFail += "/" + lang + ConfigurationManager.AppSettings["LinkFail"];
-            linkFail += "/" + newPayment.IDFaktury + "?o=" + orderek; 
+            linkFail += "/" + newPayment.IDFaktury + "?o=" + orderek;
 
             var linkOk = ConfigurationManager.AppSettings["Strona"];
@@ -68 +69 @@
             merchant.LinkFail = linkFail;
 
-            if (merchant != null) merchant.IsValid();
+            merchant.IsValid();
 
             return merchant;
@@ -88 +89 @@
         {
             if (merchant == null)
-                throw new ArgumentNullException("parametr merchant is null in SetHash method");
+                throw new ArgumentNullException("merchant");
 
             var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();
 
-            if (platnosc == null)            
+            if (platnosc == null)
                 merchant.Hash = HASH_ERROR_INFO;
             else