Resloved few review comments AB#143937

UKHO · Feb 29, 2024 · 916b8b9 · 916b8b9
1 parent 6e50ae8
commit 916b8b9
Showing 1 changed file with 15 additions and 31 deletions.
diff --git a/tests/UKHO.ERPFacade.API.FunctionalTests/Helpers/SAPXmlHelper.cs b/tests/UKHO.ERPFacade.API.FunctionalTests/Helpers/SAPXmlHelper.cs
@@ -614,39 +614,21 @@ private static bool VerifyCreateENCCell(string childCell, ZMAT_ACTIONITEMS item,
         private static bool VerifyDecryptedPermit(string childCell, ZMAT_ACTIONITEMS item, string permitState)
         {
             Console.WriteLine("Action#:" + ActionCounter + ".Childcell:" + childCell);
-            foreach (Product product in JsonPayload.Data.Products)
-            {
-                AttrNotMatched.Clear();
-                if (permitState.Contains("Same"))
-                {
 
-                    if (!item.ACTIVEKEY.Equals(Config.TestConfig.PermitWithSameKey.ACTIVEKEY))
-                        AttrNotMatched.Add(nameof(item.ACTIVEKEY));
-                    if (!item.NEXTKEY.Equals(Config.TestConfig.PermitWithSameKey.NEXTKEY))
-                        AttrNotMatched.Add(nameof(item.NEXTKEY));
-                }
-                else if (permitState.Contains("Different"))
-                {
-                    if (!item.ACTIVEKEY.Equals(Config.TestConfig.PermitWithDifferentKey.ACTIVEKEY))
-                        AttrNotMatched.Add(nameof(item.ACTIVEKEY));
-                    if (!item.NEXTKEY.Equals(Config.TestConfig.PermitWithDifferentKey.NEXTKEY))
-                        AttrNotMatched.Add(nameof(item.NEXTKEY));
-                }
-
-                if (AttrNotMatched.Count == 0)
-                {
-                    Console.WriteLine("CREATE ENC CELL Action's ACTIVEKEY and NEXTKEY Data is correct");
-                    return true;
-                }
-                else
-                {
-                    Console.WriteLine("CREATE ENC CELL Action's ACTIVEKEY and NEXTKEY Data is incorrect");
-                    Console.WriteLine("Not matching attributes are:");
-                    foreach (string attribute in AttrNotMatched)
-                    { Console.WriteLine(attribute); }
-                    return false;
-                }
+            if (permitState.Contains("Same"))
+            {
 
+                if (!item.ACTIVEKEY.Equals(Config.TestConfig.PermitWithSameKey.ACTIVEKEY))
+                    AttrNotMatched.Add(nameof(item.ACTIVEKEY));
+                if (!item.NEXTKEY.Equals(Config.TestConfig.PermitWithSameKey.NEXTKEY))
+                    AttrNotMatched.Add(nameof(item.NEXTKEY));
+            }
+            else if (permitState.Contains("Different"))
+            {
+                if (!item.ACTIVEKEY.Equals(Config.TestConfig.PermitWithDifferentKey.ACTIVEKEY))
+                    AttrNotMatched.Add(nameof(item.ACTIVEKEY));
+                if (!item.NEXTKEY.Equals(Config.TestConfig.PermitWithDifferentKey.NEXTKEY))
+                    AttrNotMatched.Add(nameof(item.NEXTKEY));
             }
             return true;
         }
@@ -1231,6 +1213,7 @@ public static string UpdatePermitField(string requestBody, string permitState)
                 var products = jsonObj["data"]["products"];
                 foreach (var product in products)
                 {
+                    Assert.That(Config.TestConfig.PermitWithSameKey.Permit != "","Permit String is empty");
                     product["permit"] = Config.TestConfig.PermitWithSameKey.Permit;
                 }
             }
@@ -1239,6 +1222,7 @@ public static string UpdatePermitField(string requestBody, string permitState)
                 var products = jsonObj["data"]["products"];
                 foreach (var product in products)
                 {
+                    Assert.That(Config.TestConfig.PermitWithDifferentKey.Permit!= "", "Permit String is empty");
                     product["permit"] = Config.TestConfig.PermitWithDifferentKey.Permit;
                 }
             }