Index: trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Test/Web/PlatnosciControllerTests.cs (revision 971)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Test/Controllers/PlatnosciControllerTests.cs (revision 982)
@@ -4,9 +4,10 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Test.Fakes;
 using adMoto.Payments.Web.Controllers;
 using adMoto.Payments.Web.Models;
 using NUnit.Framework;
 
-namespace adMoto.Payments.Test.Web
+namespace adMoto.Payments.Test.Controllers
 {
     [TestFixture]
@@ -19,5 +20,5 @@
         private const string CODE_BAD = "payment_declined";        //transakcja odrzucona 
         private readonly DateTime _data = DateTime.Now;
-        private readonly Function _function = new Function();
+        private readonly TestDataHelper _testDataHelper = new TestDataHelper();
                
         //[Test]
@@ -27,5 +28,5 @@
         //    //Arrange
         //    var repository = new Repository<PlatnosciEcard>(new FakeDataContext());
-        //    var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); 
+        //    var platnosci = _testDataHelper.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345); 
         //    repository.Insert(platnosci);
         //    repository.SubmitChanges();
@@ -64,5 +65,5 @@
         //    //Arrange
         //    var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-        //    var platnosci = _function.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
+        //    var platnosci = _testDataHelper.CreateNewPayment(_orderNumber, false, DateTime.Now, 12345);
         //    repPayment.Insert(platnosci);
         //    repPayment.SubmitChanges();
@@ -99,5 +100,5 @@
             //Arrange
             IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            PlatnosciEcard platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1);
+            PlatnosciEcard platnosc = _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);
             repPayment.Insert(platnosc);
 
@@ -119,5 +120,5 @@
             //Arrange
             IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _function.CreateNewPayment(_orderNumber, false, _data, 1);
+            var platnosc = _testDataHelper.CreateNewPayment(_orderNumber, false, _data, 1);
             repPayment.Insert(platnosc);
 
@@ -139,9 +140,9 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            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 platnosc = _testDataHelper.CreateInvoice(123, "nip1", "", 0, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip2");
            
             //Act
@@ -160,9 +161,9 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var platnosc = _function.CreateInvoice(123, "nip2", "", 0, 0);
-            repVPayment.Insert(platnosc);
-
-            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
-            controller.ControllerContext = _function.CreateControllerContext("nip2");
+            var platnosc = _testDataHelper.CreateInvoice(123, "nip2", "", 0, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip2");
 
             //Act
@@ -183,15 +184,15 @@
             //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona 
             var repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var invoice = _function.CreateInvoice(123, "nip1", "aaa", 0, 0);
+            var invoice = _testDataHelper.CreateInvoice(123, "nip1", "aaa", 0, 0);
             repVPayment.Insert(invoice);
             repVPayment.SubmitChanges();
 
             var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
-            var confirm = _function.CreateConfirm(CODE_OK, 123456);
+            var confirm = _testDataHelper.CreateConfirm(CODE_OK, 123456);
             repConfirm.Insert(confirm);
             repConfirm.SubmitChanges();
 
             var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager);
-            controller.ControllerContext = _function.CreateControllerContext("nip1");
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
 
             //Act
@@ -210,14 +211,14 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var platnosc = _function.CreateInvoice(123, "nip1", "numer", 200, 0);
+            var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
             repVPayment.Insert(platnosc);
 
             var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
-            var confirm = _function.CreateConfirm(CODE_OK, 1);
+            var confirm = _testDataHelper.CreateConfirm(CODE_OK, 1);
             repConfirm.Insert(confirm);
             repConfirm.SubmitChanges();
 
             var controller = new PlatnoscController(repVPayment, null, repConfirm, _translateManager);
-            controller.ControllerContext = _function.CreateControllerContext("nip1");
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
 
             //Act
@@ -238,11 +239,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var 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 platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
             
-            Payer payer = _function.CreatePayer(123, "", "test");  //Brak imienia
+            Payer payer = _testDataHelper.CreatePayer(123, "", "test");  //Brak imienia
 
             //Act
@@ -259,11 +260,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var 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 = _function.CreatePayer(123, "test", "");  //Brak nazwiska
+            var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
+
+            Payer payer = _testDataHelper.CreatePayer(123, "test", "");  //Brak nazwiska
 
             //Act
@@ -280,11 +281,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var 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 platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
             var name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-            var payer = _function.CreatePayer(123, name, "test");
+            var payer = _testDataHelper.CreatePayer(123, name, "test");
 
             //Act
@@ -301,11 +302,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var 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 platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
             var surname = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-            var payer = _function.CreatePayer(123, "test", surname);
+            var payer = _testDataHelper.CreatePayer(123, "test", surname);
 
             //Act
@@ -322,11 +323,11 @@
             //Arrange
             IRepository<Invoice> repVPayment = new Repository<Invoice>(new FakeDataContext());
-            var 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");
+            var platnosc = _testDataHelper.CreateInvoice(123, "nip1", "numer", 200, 0);
+            repVPayment.Insert(platnosc);
+
+            var controller = new PlatnoscController(repVPayment, null, null, _translateManager);
+            controller.ControllerContext = _testDataHelper.CreateControllerContext("nip1");
+
+            var payer = _testDataHelper.CreatePayer(123, "test", "test");
   
             //Act
@@ -339,3 +340,2 @@
     }
 }
-