Refined testcases for RussiaPaymentOrder

Author: codebude

QRCoderTests/PayloadGeneratorTests.cs

@@ -3058,53 +3058,65 @@ public void monero_generator_should_throw_no_address_exception()
 
         [Fact]
         [Category("PayloadGenerator/RussiaPaymentOrder")]
-        public void russiapayment_generator_can_generate_payload_minimal()
+        public void russiapayment_generator_can_generate_payload_mandatory_fields()
         {
             var account = "40702810138250123017";
             var bic = "044525225";
             var bankName = "=ОАО \"БАНК\"";
             var name = "ООО «Три кита»";
-            var generator = new PayloadGenerator.RussiaPaymentOrder(PayloadGenerator.RussiaPaymentOrder.CharacterSets.utf_8, name, account, bankName, bic);
+            var correspAcc = "30101810400000000225";
+            var generator = new PayloadGenerator.RussiaPaymentOrder(PayloadGenerator.RussiaPaymentOrder.CharacterSets.utf_8, name, account, bankName, bic, correspAcc);
 
             generator
                 .ToString()
-                .ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc=0");
+                .ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc={correspAcc}");
         }
 
         [Fact]
         [Category("PayloadGenerator/RussiaPaymentOrder")]
-        public void russiapayment_generator_can_generate_payload_mandatory_fields()
+        public void russiapayment_generator_can_generate_payload_some_additional_fields()
         {
             var account = "40702810138250123017";
             var bic = "044525225";
             var bankName = "=ОАО \"БАНК\"";
             var name = "ООО «Три кита»";
             var correspAcc = "30101810400000000225";
-            var generator = new PayloadGenerator.RussiaPaymentOrder(PayloadGenerator.RussiaPaymentOrder.CharacterSets.utf_8, name, account, bankName, bic, correspAcc);
+            var optionalFields = new PayloadGenerator.RussiaPaymentOrder.OptionalFields()
+            {
+                FirstName = "Raffael",
+                LastName = "Herrmann",
+                Sum = "125000"
+            };
+
+            var generator = new PayloadGenerator.RussiaPaymentOrder(PayloadGenerator.RussiaPaymentOrder.CharacterSets.utf_8, name, account, bankName, bic, correspAcc, optionalFields: optionalFields);
 
             generator
                 .ToString()
-                .ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc={correspAcc}");
+                .ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc=0|Sum={optionalFields.Sum}|LastName={optionalFields.LastName}|FirstName={optionalFields.FirstName}");
         }
 
         [Fact]
         [Category("PayloadGenerator/RussiaPaymentOrder")]
-        public void russiapayment_generator_can_generate_payload_some_additional_fields()
+        public void russiapayment_generator_can_generate_payload_all_additional_fields()
         {
             var account = "40702810138250123017";
             var bic = "044525225";
             var bankName = "=ОАО \"БАНК\"";
             var name = "ООО «Три кита»";
             var correspAcc = "30101810400000000225";
-            var firstName = "Raffael";
-            var lastName = "Herrmann";
-            var sum = 999.95d;
+            var optionalFields = new PayloadGenerator.RussiaPaymentOrder.OptionalFields()
+            { 
+                Sum = "50000",
+                Purpose = "Your loan",
+                PayeeINN = "9909373824",
+                PayerINN = "1832090230"
+            };
 
-            var generator = new PayloadGenerator.RussiaPaymentOrder(PayloadGenerator.RussiaPaymentOrder.CharacterSets.utf_8, name, account, bankName, bic, correspAcc, LastName: lastName, FirstName: firstName, Sum: sum);
+            var generator = new PayloadGenerator.RussiaPaymentOrder(PayloadGenerator.RussiaPaymentOrder.CharacterSets.utf_8, name, account, bankName, bic, correspAcc, optionalFields: optionalFields);
 
             generator
                 .ToString()
-                .ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc={correspAcc}|FirstName={firstName}|LastName={lastName}|Sum={sum}");
+                .ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc=0|Sum={optionalFields.Sum}|LastName={optionalFields.LastName}|FirstName={optionalFields.FirstName}");
         }
     }
 }