Zbiór zmian 971 dla trunk/eCard/eCardMVC/Platnosci.Tests

Data:

2009-12-23 11:59:36 (16 years ago)

Autor:

marek

Opis:

re #215

Lokalizacja:

trunk/eCard/eCardMVC/Platnosci.Tests

Pliki:

• TestRunner.cs (zmodyfikowane) (1 diff)
• Web/FakeDataContext.cs (zmodyfikowane) (1 diff)
• Web/FakeTranslation.cs (zmodyfikowane) (1 diff)
• Web/Function.cs (zmodyfikowane) (1 diff)
• Web/MerchantControllerTests.cs (zmodyfikowane) (1 diff)
• Web/PaymentUtilsTests.cs (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci.Tests/Web/FunkcjePlatnosciTests.cs) (4 diffs)
• Web/PlatnosciControllerTests.cs (zmodyfikowane) (3 diffs)
• Web/StatusTest.cs (zmodyfikowane) (1 diff)
• Web/TestMethods.cs (zmodyfikowane) (1 diff)
• Web/UI/AuthenticationTests.cs (zmodyfikowane) (1 diff)
• Web/UI/MerchantTests.cs (zmodyfikowane) (1 diff)
• Web/UI/ValidationTests.cs (zmodyfikowane) (1 diff)
• Web/ValidationMerchantClassTests.cs (zmodyfikowane) (1 diff)
• Web/eCardDataTests.cs (zmodyfikowane) (14 diffs)
• adMoto.Payments.Test.csproj (przeniesione) (przeniesione from trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj) (3 diffs)

trunk/eCard/eCardMVC/Platnosci.Tests/TestRunner.cs

@@ -1 @@
-namespace Platnosci.Tests
+namespace adMoto.Payments.Test
 {
     public class TestRunner

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

@@ -5 +5 @@
 using adMoto.Payments.Core.Interfaces;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class FakeDataContext : IDataContext

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

@@ -1 +1 @@
 using adMoto.Payments.Core.Interfaces;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class FakeTranslation : ITranslateManager

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

@@ -5 +5 @@
 using Moq;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class Function

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

@@ -2 +2 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Controllers;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Controllers;
-using Platnosci.Models;
 using System.Web.Mvc;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]

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

@@ -3 +3 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Models;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
-    public class FunkcjePlatnosciTests
+    public class PaymentUtilsTests
     {
         private readonly Function _function = new Function();
@@ -18 +18 @@
         public void GetCurrency_Returns_Correct_Currency(
             [Values(null, "", "eur", "usd", "gbp", "GBP")] string input,
-            [Values(FunkcjePlatnosci.PLN, FunkcjePlatnosci.PLN, FunkcjePlatnosci.EUR, FunkcjePlatnosci.USD, FunkcjePlatnosci.GBP, FunkcjePlatnosci.GBP)] string output
+            [Values(PaymentsUtils.PLN, PaymentsUtils.PLN, PaymentsUtils.EUR, PaymentsUtils.USD, PaymentsUtils.GBP, PaymentsUtils.GBP)] string output
             )
         {
             //Arrange
-            var funkcjePlantosi = new FunkcjePlatnosci();
+            var funkcjePlantosi = new PaymentsUtils();
 
             //Act
@@ -38 +38 @@
             var idFaktury = 123;
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var funkcjePlatnosci = new FunkcjePlatnosci(repPayment, _translateManager);
+            var paymentsUtils = new PaymentsUtils(repPayment, _translateManager);
             var invoice = _function.CreateInvoice(idFaktury, "nip", "abc/2009", 200, 2);
             var payer = _function.CreatePayer(idFaktury, "test", "test");
-            var waluta = new Waluta { Amount = 200, Currency = FunkcjePlatnosci.PLN };
+            var waluta = new Waluta { Amount = 200, Currency = PaymentsUtils.PLN };
 
             //Act
-            funkcjePlatnosci.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
+            paymentsUtils.CreateAndAddNewPyment(invoice, waluta, payer, "sessionId");
             var payment = repPayment.Find(p => p.IDFaktury == 123).SingleOrDefault();
 
@@ -59 +59 @@
         {
             //Arrange
-            var funkcjePlantosi = new FunkcjePlatnosci();
+            var funkcjePlantosi = new PaymentsUtils();
 
             //Act

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

@@ -4 +4 @@
 using adMoto.Payments.Core.Data;
 using adMoto.Payments.Core.Interfaces;
+using adMoto.Payments.Web.Controllers;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Controllers;
-using Platnosci.Models;
-
-namespace Platnosci.Tests.Web
+
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
@@ -201 +201 @@
             //Assert
             Assert.That(result.ViewName, Is.EqualTo("Paid"));
-            Assert.That(view.info, Is.EqualTo("zaplacono"));
+            Assert.That(view.Info, Is.EqualTo("zaplacono"));
         }
 
@@ -224 +224 @@
             var result = controller.Show("123", "pl") as ViewResult;                      
             var view = (InvoiceDetailsViewData)result.ViewData.Model;
-            System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.vPlatnosciEcard.Brutto);
-            System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.vPlatnosciEcard.Faktura_Numer);
+            System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.Invoice.Brutto);
+            System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.Invoice.Faktura_Numer);
             
             //Assert
-            Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(200));
-            Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo("numer"));            
+            Assert.That(view.Invoice.Brutto, Is.EqualTo(200));
+            Assert.That(view.Invoice.Faktura_Numer, Is.EqualTo("numer"));            
         }
 

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

@@ -4 +4 @@
 using NUnit.Framework;
 using MvcContrib.TestHelper;
-using Platnosci.Controllers;
 using System.Web.Mvc;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]

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

@@ -3 +3 @@
 using NUnit.Framework;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/AuthenticationTests.cs

@@ -2 +2 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web.UI
+namespace adMoto.Payments.Test.Web.UI
 {
     [TestFixture]

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/MerchantTests.cs

@@ -2 +2 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web.UI
+namespace adMoto.Payments.Test.Web.UI
 {
     [TestFixture]

trunk/eCard/eCardMVC/Platnosci.Tests/Web/UI/ValidationTests.cs

@@ -2 +2 @@
 using WatiN.Core;
 
-namespace Platnosci.Tests.Web.UI
+namespace adMoto.Payments.Test.Web.UI
 {
     [TestFixture]

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

@@ -4 +4 @@
 using NUnit.Framework;
 
-namespace Platnosci.Tests.Web
+namespace adMoto.Payments.Test.Web
 {
     public class ValidationMerchantClassTests

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

@@ -2 +2 @@
 using adMoto.Payments.Core;
 using adMoto.Payments.Core.Data;
+using adMoto.Payments.Web.Models;
 using NUnit.Framework;
-using Platnosci.Models;
-
-namespace Platnosci.Tests.Web
+
+namespace adMoto.Payments.Test.Web
 {
     [TestFixture]
@@ -21 +21 @@
             repPayment.Insert(platnosc);
            
-            var ecarddata = new eCardData(repPayment);
+            var ecarddata = new MerchantHelper(repPayment);
            
             var merchant = new Merchant(){
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+                                             Payment = platnosc,
+                                             Id = "171485000",
+                                             Password = "ashSeth2",
+                                         };
 
             //Act
@@ -46 +46 @@
             repPayment.Insert(platnosc);
 
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = new PlatnosciEcard(){
-                    ORDERDESCRIPTION = "dd",
-                    IDFaktury = 21,
-                    Data = DateTime.Now
-                },
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = new PlatnosciEcard(){
+                                                                     ORDERDESCRIPTION = "dd",
+                                                                     IDFaktury = 21,
+                                                                     Data = DateTime.Now
+                                                                 },
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
            
             //Act
@@ -73 +73 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 229;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
 
             //Act
@@ -101 +101 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 0;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
 
             //Act
@@ -129 +129 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 229;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "TEST",
-                Password = "test",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "TEST",
+                                   Password = "test",
+                               };
 
             //Act
@@ -157 +157 @@
             var platnosc = _function.CreateNewPayment(123, true, DateTime.Now, 1);
             platnosc.AMOUNT = 11;
-            platnosc.CURRENCY = FunkcjePlatnosci.PLN;
-
-            repPayment.Insert(platnosc);
-
-            var ecarddata = new eCardData(repPayment);
-
-            var merchant = new Merchant()
-            {
-                Payment = platnosc,
-                Id = "171485000",
-                Password = "ashSeth2",
-            };
+            platnosc.CURRENCY = PaymentsUtils.PLN;
+
+            repPayment.Insert(platnosc);
+
+            var ecarddata = new MerchantHelper(repPayment);
+
+            var merchant = new Merchant()
+                               {
+                                   Payment = platnosc,
+                                   Id = "171485000",
+                                   Password = "ashSeth2",
+                               };
             
             //Act
@@ -193 +193 @@
             var payer = _function.CreatePayer(idFaktury, "test", "test");
             var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
-            var eCardData = new eCardData(repPayment);
+            var eCardData = new MerchantHelper(repPayment);
 
             //Act
@@ -210 +210 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 0, 2);
 
@@ -228 +228 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "", 200, 2);
 
@@ -246 +246 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2);
 
@@ -264 +264 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2);
 
@@ -282 +282 @@
         {
             //Arrange
-            var ecarddata = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var ecarddata = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             var invoice = _function.CreateInvoice(123, "nip", "abc/2009", 200, 2);
 
@@ -302 +302 @@
             var pl = new PlatnosciEcard() {ORDERDESCRIPTION = "abc/2009"};
             var m = new Merchant(){Payment = pl, Id = "ABCD" };
-            var eCardData = new eCardData(new Repository<PlatnosciEcard>(new FakeDataContext()));
+            var eCardData = new MerchantHelper(new Repository<PlatnosciEcard>(new FakeDataContext()));
             
             //Act

trunk/eCard/eCardMVC/Platnosci.Tests/adMoto.Payments.Test.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Platnosci.Tests</RootNamespace>
-    <AssemblyName>Platnosci.Tests</AssemblyName>
+    <RootNamespace>adMoto.Payments.Test</RootNamespace>
+    <AssemblyName>adMoto.Payments.Test</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -85 +85 @@
     <Compile Include="TestRunner.cs" />
     <Compile Include="Web\eCardDataTests.cs" />
-    <Compile Include="Web\FunkcjePlatnosciTests.cs" />
+    <Compile Include="Web\PaymentUtilsTests.cs" />
     <Compile Include="Web\MerchantControllerTests.cs" />
     <Compile Include="Web\FakeDataContext.cs" />
@@ -103 +103 @@
       <Name>adMoto.Payments.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Platnosci\Platnosci.Web.csproj">
+    <ProjectReference Include="..\Platnosci\adMoto.Payments.Web.csproj">
       <Project>{19B73EC2-0D53-4F8C-91E1-A08FCC0174E5}</Project>
-      <Name>Platnosci.Web</Name>
+      <Name>adMoto.Payments.Web</Name>
     </ProjectReference>
   </ItemGroup>