Index: trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs
===================================================================
--- trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs (revision 983)
+++ trunk/eCard/eCardMVC/adMoto.Payments.Test/Utils/eCardDataTests.cs (revision 984)
@@ -21,15 +21,15 @@
             //Arrange
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new MerchantHelper(repPayment);
-
-            var merchant = new Merchant
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+            repPayment.Insert(payment);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant
+                               {
+                                  Payment = payment,
+                                  Id = "171485000",
+                                  Password = "ashSeth2",
+                               };
 
             //Act
@@ -46,7 +46,7 @@
             //Arrange
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-
-            repPayment.Insert(platnosc);
+            var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+
+            repPayment.Insert(payment);
 
             var ecarddata = new MerchantHelper(repPayment);
@@ -55,9 +55,9 @@
                                {
                                    Payment = new PlatnosciEcard
-                                   {
-                                       ORDERDESCRIPTION = "dd",
-                                       IDFaktury = 21,
-                                       Data = DateTime.Now
-                                   },
+                                                 {
+                                                    ORDERDESCRIPTION = "dd",
+                                                    IDFaktury = 21,
+                                                    Data = DateTime.Now
+                                                 },
                                    Id = "171485000",
                                    Password = "ashSeth2",
@@ -76,15 +76,15 @@
             //Arrange
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-            platnosc.AMOUNT = 229;
-            platnosc.CURRENCY = PaymentsUtils.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new MerchantHelper(repPayment);
-
-            var merchant = new Merchant
-                               {
-                                   Payment = platnosc,
+            var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+            payment.AMOUNT = 229;
+            payment.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(payment);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant
+                               {
+                                   Payment = payment,
                                    Id = "171485000",
                                    Password = "ashSeth2",
@@ -104,15 +104,15 @@
             //Arrange
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-            platnosc.AMOUNT = 0;
-            platnosc.CURRENCY = PaymentsUtils.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new MerchantHelper(repPayment);
-
-            var merchant = new Merchant
-                               {
-                                   Payment = platnosc,
+            var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+            payment.AMOUNT = 0;
+            payment.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(payment);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant
+                               {
+                                   Payment = payment,
                                    Id = "171485000",
                                    Password = "ashSeth2",
@@ -132,15 +132,15 @@
             //Arrange
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-            platnosc.AMOUNT = 229;
-            platnosc.CURRENCY = PaymentsUtils.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new MerchantHelper(repPayment);
-
-            var merchant = new Merchant
-                               {
-                                   Payment = platnosc,
+            var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+            payment.AMOUNT = 229;
+            payment.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(payment);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant
+                               {
+                                   Payment = payment,
                                    Id = "TEST",
                                    Password = "test",
@@ -160,15 +160,15 @@
             //Arrange
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var platnosc = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
-            platnosc.AMOUNT = 11;
-            platnosc.CURRENCY = PaymentsUtils.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new MerchantHelper(repPayment);
-
-            var merchant = new Merchant
-                               {
-                                   Payment = platnosc,
+            var payment = _testDataHelper.CreateNewPayment(123, true, DateTime.Now, 1);
+            payment.AMOUNT = 11;
+            payment.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(payment);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant
+                               {
+                                   Payment = payment,
                                    Id = "171485000",
                                    Password = "ashSeth2",
@@ -301,13 +301,13 @@
         {
             //Arrange
-            var pl = new PlatnosciEcard { ORDERDESCRIPTION = "abc/2009" };
-            var m = new Merchant { Payment = pl, Id = "ABCD" };
+            var payment = new PlatnosciEcard { ORDERDESCRIPTION = "abc/2009" };
+            var merchant = new Merchant { Payment = payment, Id = "ABCD" };
             var eCardData = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
 
             //Act
-            var result = eCardData.GetUrl(m);
-
-            //Assert
-            System.Diagnostics.Debug.WriteLine("eCard url:" + result + " " + m);
+            var result = eCardData.GetUrl(merchant);
+
+            //Assert
+            System.Diagnostics.Debug.WriteLine("eCard url:" + result + " " + merchant);
             Assert.That(result, Is.Not.EqualTo(""));
         }