Zbiór zmian 959

Data:

2009-12-22 08:54:00 (16 years ago)

Autor:

alina

Opis:

re #215 testy do funkcji pobierajacej hash z eCard

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

• Platnosci.Tests/Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
• Platnosci.Tests/Web/eCardDataTests.cs (dodane)
• Platnosci/App_GlobalResources/tlumaczenia.designer.cs (zmodyfikowane) (1 diff)
• Platnosci/App_GlobalResources/tlumaczenia.resx (zmodyfikowane) (1 diff)
• Platnosci/Controllers/MerchantController.cs (zmodyfikowane) (1 diff)
• Platnosci/Models/eCardData.cs (zmodyfikowane) (3 diffs)

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

@@ -84 +84 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestRunner.cs" />
+    <Compile Include="Web\eCardDataTests.cs" />
     <Compile Include="Web\FunkcjePlatnosciTests.cs" />
     <Compile Include="Web\MerchantControllerTests.cs" />

trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs

@@ -161 +161 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;Invoice number&apos; is required..
+        ///   Looks up a localized string similar to Invoice number is required..
         /// </summary>
         internal static string err_faktura {

trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx

@@ -216 +216 @@
   </data>
   <data name="err_faktura" xml:space="preserve">
-    <value>'Invoice number' is required.</value>
+    <value>Invoice number is required.</value>
   </data>
   <data name="err_logowanie" xml:space="preserve">

trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

@@ -53 +53 @@
                 return View("Error1", _funkcjePlatnosci.InitErrorViewData(_translateManager.Translate("tlumaczenia", "error_hash"), payer.Id_faktury));
             
-            var adres = _eCardData.GetUrl(merchant);
+            var adres = _eCardData.GetUrl(merchant); 
             Response.Redirect(adres);           
             return new EmptyResult();          

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

@@ -52 +52 @@
             merchant.Payment = newPayment;
             GetMerchantInfo(merchant);
-            SetHash(merchant);
+            merchant.Hash = SetHash(merchant);
 
             //przeslanie w linku ordernumber potrzebnego do wyswietlenia potwierdzenia
@@ -85 +85 @@
             }
         }
-        private void SetHash(Merchant merchant)
+        public string SetHash(Merchant merchant)
         {
+            if (merchant == null)
+                throw new ArgumentNullException("parametr merchant is null in SetHash method");
+
             var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == merchant.Payment.ORDERDESCRIPTION && i.IDFaktury == merchant.Payment.IDFaktury && i.Data == merchant.Payment.Data).SingleOrDefault();
 
-            if (platnosc == null || merchant == null)
-            {
+            if (platnosc == null)            
                 merchant.Hash = HASH_ERROR_INFO;
-            }
             else
             {
@@ -117 +118 @@
                 merchant.Hash = strResponse;
             }
+            return merchant.Hash;
         }
     }