Zbiór zmian 966 dla trunk

Data:

2009-12-22 14:03:36 (16 years ago)

Autor:

alina

Opis:

re #215 poprawka funkcji BruttoToString?()

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

• Platnosci.Tests/Web/FunkcjePlatnosciTests.cs (zmodyfikowane) (1 diff)
• Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (1 diff)
• Platnosci/Models/FunkcjePlatnosci.cs (zmodyfikowane) (1 diff)

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

@@ -50 +50 @@
             Assert.That(payment.AMOUNT, Is.EqualTo(200));
         }
+
+        [Test, Sequential]
+        [Category("Unit")]
+        public void BruttoToString_Returns_Correct_Amount(
+            [Values(null, "", "pln", "PLN", "GBP", "gbp", "xx")] string input,
+            [Values("100 PLN ", "100 PLN ", "100 PLN ", "100 PLN ", "100 PLN (1 GBP)", "100 PLN (1 GBP)", "100 PLN (1 XX)")] string output
+            )
+        {
+            //Arrange
+            var funkcjePlantosi = new FunkcjePlatnosci();
+
+            //Act
+            var result = funkcjePlantosi.BruttoToString(100, 1, input);
+
+            //Act
+            System.Diagnostics.Debug.WriteLine(result);
+            Assert.That(result, Is.EqualTo(output));
+        }
+        
     }
 }

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

@@ -129 +129 @@
         public ActionResult Status()
         { 
+
             var potwierdzenie = new PotwierdzeniaEcard();
             var content = new ContentResult();

trunk/eCard/eCardMVC/Platnosci/Models/FunkcjePlatnosci.cs

@@ -42 +42 @@
         {
             var brutto = String.Format("{0:0.00}", kwota.ToString().Replace(",", ".")) + " PLN ";
+
+            if (!String.IsNullOrEmpty(miano))
+                if (waluta > 0 && miano.ToUpper() != "PLN")
+                    brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
             
-            if (waluta > 0 && (miano != "" || miano.ToUpper() != "PLN"))
-                brutto += "(" + (waluta.ToString()).Replace(",", ".") + " " + miano.ToUpper() + ")";
-
             return brutto;
         }