Zbiór zmian 931 dla trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs

Data:

2009-12-07 11:50:15 (16 years ago)

Autor:

marek

Opis:

re #215 - drobny refactoring

Pliki:

• trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (zmodyfikowane) (15 diffs)

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Web.Mvc;
 
@@ -11 +9 @@
 using Platnosci.Core.Interface;
 using Platnosci.Core.Linq;
-using WatiN.Core;
-using System.Threading;
 using Platnosci.Models;
-using Moq;
 
 namespace Platnosci.Tests.Web
@@ -21 +16 @@
     class PlatnosciControllerTests
     {
-        private ITranslateManager _t = new FakeTranslation();
-        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 Function _f = new Function();
+        private readonly ITranslateManager _translateManager = new FakeTranslation();
+        private readonly string _merchantNumber = "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]
@@ -34 +29 @@
         {          
            var repository = new Repository<PlatnosciEcard>(new FakeDataContext());
-           var platnosci = _f.CreateNewPayment(orderNumber, false, DateTime.Now, 12345); 
+           var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); 
            repository.Insert(platnosci);
            repository.SubmitChanges();
@@ -41 +36 @@
            
            var builder = new TestControllerBuilder();
-           var controller = new PlatnoscController(null, repository, rep, _t);
+           var controller = new PlatnoscController(null, repository, rep, _translateManager);
            builder.InitializeController(controller);
-           builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
+           builder.Form.Add("MERCHANTNUMBER", _merchantNumber);
            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();
+           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(merchantNumber));
-           PlatnosciEcard payment_after_update = repository.FindOne(orderNumber);
-           System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status);
-           Assert.That(payment_after_update.Status, Is.EqualTo(true));            
+           var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == _orderNumber).SingleOrDefault();
+           Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(_merchantNumber));
+           var paymentAfterUpdate = repository.FindOne(_orderNumber);
+           System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + paymentAfterUpdate.Status);
+           Assert.That(paymentAfterUpdate.Status, Is.EqualTo(true));            
         }
         [Test]
@@ -64 +59 @@
         {
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosci = _f.CreateNewPayment(orderNumber, false, DateTime.Now, 12345);
+            var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
             repPayment.Insert(platnosci);
             repPayment.SubmitChanges();
@@ -70 +65 @@
           
             var builder = new TestControllerBuilder();
-            var controller = new PlatnoscController(null, repPayment, repConfirm, _t);
+            var controller = new PlatnoscController(null, repPayment, repConfirm, _translateManager);
             builder.InitializeController(controller);
-            builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
+            builder.Form.Add("MERCHANTNUMBER", _merchantNumber);
             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();           
-           
-            var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault();
-            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(_merchantNumber));
             
-            PlatnosciEcard payment_after_update = repPayment.FindOne(orderNumber);
-            System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status);
-            Assert.That(payment_after_update.Status, Is.EqualTo(false));
+            var paymentAfterUpdate = repPayment.FindOne(_orderNumber);
+            System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + paymentAfterUpdate.Status);
+            Assert.That(paymentAfterUpdate.Status, Is.EqualTo(false));
         }
         
@@ -93 +88 @@
         {
             IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            PlatnosciEcard platnosc = _f.CreateNewPayment(orderNumber, false, data, 1);
+            PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1);
             repPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(null, repPayment, null, _t);
-            controller.UpdateStatus(orderNumber, code_Ok);   
-            
-            PlatnosciEcard payment_after_update = new PlatnosciEcard();
-            payment_after_update = repPayment.FindOne(orderNumber);
-            System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status);
-            Assert.That(payment_after_update.Status, Is.EqualTo(true));
+            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]
@@ -110 +104 @@
             IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
 
-            PlatnosciEcard platnosc = _f.CreateNewPayment(orderNumber, false, data, 1);
+            PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1);
             repPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(null, repPayment, null, _t);
-            controller.UpdateStatus(orderNumber, code_Bad);   
-
-            PlatnosciEcard payment_after_update = new PlatnosciEcard();
-            payment_after_update = repPayment.FindOne(i => i.ORDERNUMBER == orderNumber);
-            System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status);
-            Assert.That(payment_after_update.Status, Is.EqualTo(false));
+            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]
@@ -126 +119 @@
         {
             IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
-            vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "", 0, 0);
-            repVPayment.Insert(platnosc);
-
-            var controller = new PlatnoscController(repVPayment, null, null, _t);
-            controller.ControllerContext = _f.CreateControllerContext("nip2");
+            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;
@@ -143 +136 @@
         {
             IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
-            vPlatnosciEcard platnosc = _f.CreateInvoice(123, "", "", 0, 0);
-            repVPayment.Insert(platnosc);
-
-            var controller = new PlatnoscController(repVPayment, null, null, _t);
+            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");
 
@@ -161 +154 @@
             //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona 
             var repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
-            var invoice = _f.CreateInvoice(123, "nip1", "aaa", 0, 0);
+            var invoice = _function.CreateInvoice(123, "nip1", "aaa", 0, 0);
             repVPayment.Insert(invoice);
             repVPayment.SubmitChanges();
 
             var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
-            var confirm = _f.CreateConfirm(code_Ok, 123456);
+            var confirm = _function.CreateConfirm(CODE_OK, 123456);
             repConfirm.Insert(confirm);
             repConfirm.SubmitChanges();
 
-            var controller = new PlatnoscController(repVPayment, null, repConfirm, _t);
-            controller.ControllerContext = _f.CreateControllerContext("nip1");
+            var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager);
+            controller.ControllerContext = _function.CreateControllerContext("nip1");
             //controller.setZaplacono("Platnosc zostala uregulowana");
 
@@ -185 +178 @@
         {
             IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
-            vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0);
+            vPlatnosciEcard platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0);
             repVPayment.Insert(platnosc);
 
             var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
-            var confirm = _f.CreateConfirm(code_Ok, 1);
+            var confirm = _function.CreateConfirm(CODE_OK, 1);
             repConfirm.Insert(confirm);
             repConfirm.SubmitChanges();
 
-            var controller = new PlatnoscController(repVPayment, null, repConfirm, _t);
-            controller.ControllerContext = _f.CreateControllerContext("nip1");
+            var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager);
+            controller.ControllerContext = _function.CreateControllerContext("nip1");
 
             var result = controller.Show("123", "pl") as ViewResult;
@@ -209 +202 @@
         {
             IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
-            vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0);
-            repVPayment.Insert(platnosc);
-
-            var controller = new PlatnoscController(repVPayment, null, null, _t);
-            controller.ControllerContext = _f.CreateControllerContext("nip1");
+            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");
             
-            Payer payer = _f.CreatePayer(123, "", "test");  //Brak imienia
+            Payer payer = _function.CreatePayer(123, "", "test");  //Brak imienia
             controller.Show(payer, "pl");
             Assert.That(controller.ModelState.IsValid, Is.False);
@@ -224 +217 @@
         {
             IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
-            vPlatnosciEcard platnosc = _f.CreateInvoice(123, "nip1", "numer", 200, 0);
-            repVPayment.Insert(platnosc);
-
-            var controller = new PlatnoscController(repVPayment, null, null, _t);
-            controller.ControllerContext = _f.CreateControllerContext("nip1");
-
-            Payer payer = _f.CreatePayer(123, "test", "test");  
-            var result = controller.Show(payer, "pl") as ViewResult;
+            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);