Zbiór zmian 904 dla trunk

Data:

2009-11-27 10:01:34 (16 years ago)

Autor:

alina

Opis:

re #215 stworzenie fake'owej klasy do tlumaczen, wprowadzenie zmian w testach (zamiana parametru w konstruktorze kontrolera platnosci)

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci.Tests

Pliki:

• Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
• Web/FakeTranslate.cs (dodane)
• Web/PlatnosciControllerTests.cs (zmodyfikowane) (13 diffs)

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

@@ -80 +80 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Web\FakeDataContext.cs" />
+    <Compile Include="Web\FakeTranslate.cs" />
     <Compile Include="Web\Function.cs" />
     <Compile Include="Web\PlatnosciControllerTests.cs" />

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

@@ -21 +21 @@
     class PlatnosciControllerTests
     {
+        private ITranslate _t = new FakeTranslate();
         private string merchantNumber = "123";
         private int orderNumber = 9999;
@@ -26 +27 @@
         private string code_Bad = "payment_declined";        //transakcja odrzucona 
         private DateTime data = DateTime.Now;
-        
-        private int test = 1; //oznacza, ze nie ustawiamy tlumaczen poprzez funkcje ustawTlumaczenia()
-                              //w controllerze Platnosci, tylko poprzez funkcje setXXXXXXX()
-
         private Function _f = new Function();
                
@@ -40 +37 @@
            repository.Insert(platnosci);
            repository.SubmitChanges();
-
+                
            IRepository<PotwierdzeniaEcard> rep = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
            
            var builder = new TestControllerBuilder();
-           var controller = new PlatnoscController(null, repository, rep, test);
+           var controller = new PlatnoscController(null, repository, rep, _t);
            builder.InitializeController(controller);
            builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
@@ -73 +70 @@
           
             var builder = new TestControllerBuilder();
-            var controller = new PlatnoscController(null, repPayment, repConfirm, test);
+            var controller = new PlatnoscController(null, repPayment, repConfirm, _t);
             builder.InitializeController(controller);
             builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
@@ -99 +96 @@
             repPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(null, repPayment, null, test);
+            var controller = new PlatnoscController(null, repPayment, null, _t);
             controller.UpdateStatus(orderNumber, code_Ok);   
             
@@ -116 +113 @@
             repPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(null, repPayment, null, test);
+            var controller = new PlatnoscController(null, repPayment, null, _t);
             controller.UpdateStatus(orderNumber, code_Bad);   
 
@@ -132 +129 @@
             repVPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(repVPayment, null, null, test);
+            var controller = new PlatnoscController(repVPayment, null, null, _t);
             controller.ControllerContext = _f.createControllerContext("nip2");
-            controller.setWeryfikacja("Niepoprawny nip");            
            
             var result = controller.Show("123","pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
-            Assert.That(error.error, Is.EqualTo("Niepoprawny nip"));
+            Assert.That(error.error, Is.EqualTo("weryfikacja"));
             Assert.That(result.ViewName, Is.EqualTo("Error1"));
         }
@@ -150 +146 @@
             repVPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(repVPayment, null, null, test);
-            controller.setBrakDanych("Platnosc o takim id nie istnieje");
+            var controller = new PlatnoscController(repVPayment, null, null, _t);
+            //controller.setBrakDanych("Platnosc o takim id nie istnieje");
 
             var result = controller.Show("1234", "pl") as ViewResult;
             var error = (ErrorViewData)result.ViewData.Model;
 
-            Assert.That(error.error, Is.EqualTo("Platnosc o takim id nie istnieje"));
+            Assert.That(error.error, Is.EqualTo("brakdanych"));
             Assert.That(result.ViewName, Is.EqualTo("Error1"));
         }
@@ -174 +170 @@
             repConfirm.SubmitChanges();
 
-            var controller = new PlatnoscController(repVPayment, null, repConfirm, test);
-            controller.ControllerContext = _f.createControllerContext("nip1");
-            controller.setZaplacono("Platnosc zostala uregulowana");
+            var controller = new PlatnoscController(repVPayment, null, repConfirm, _t);
+            controller.ControllerContext = _f.createControllerContext("nip1");
+            //controller.setZaplacono("Platnosc zostala uregulowana");
 
             var result = controller.Show("123", "pl") as ViewResult;
@@ -182 +178 @@
 
             Assert.That(result.ViewName, Is.EqualTo("Paid"));
-            Assert.That(view.info, Is.EqualTo("Platnosc zostala uregulowana"));
+            Assert.That(view.info, Is.EqualTo("zaplacono"));
         }
         [Test]
@@ -197 +193 @@
             repConfirm.SubmitChanges();
 
-            var controller = new PlatnoscController(repVPayment, null, repConfirm, test);
+            var controller = new PlatnoscController(repVPayment, null, repConfirm, _t);
             controller.ControllerContext = _f.createControllerContext("nip1");
 
@@ -216 +212 @@
             repVPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(repVPayment, null, null, test);
+            var controller = new PlatnoscController(repVPayment, null, null, _t);
             controller.ControllerContext = _f.createControllerContext("nip1");
             
@@ -231 +227 @@
             repVPayment.Insert(platnosc);
 
-            var controller = new PlatnoscController(repVPayment, null, null, test);
+            var controller = new PlatnoscController(repVPayment, null, null, _t);
             controller.ControllerContext = _f.createControllerContext("nip1");