Finalização de camada de view para os testes do adq.

govinda777 · Jul 23, 2017 · 9ca845a · 9ca845a
1 parent a575e33
commit 9ca845a
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 128 deletions.
diff --git a/ServiceReference/SyonOnline.ServiceReference.csproj b/ServiceReference/SyonOnline.ServiceReference.csproj
@@ -2,9 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp1.1</TargetFramework>
+	<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.3.0" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.3.0" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="4.3.0" />

diff --git a/View/packages.config b/View/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net40" developmentDependency="true" />
+  <package id="Microsoft.Net.Compilers" version="2.3.1" targetFramework="net40" developmentDependency="true" />
 </packages>
diff --git a/View/test/acceptance/adqTest.js b/View/test/acceptance/adqTest.js
@@ -6,38 +6,59 @@ var async = async;
 var soap = $.soap;
 
 var xmlString = ['<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tem="http://tempuri.org/" xmlns:red="http://schemas.datacontract.org/2004/07/Redecard.Komerci.External.WcfKomerci">',
-  '<soapenv:Header/>',
-  '<soapenv:Body>',
-  '<tem:GetAuthorizedCredit>',
-  '<tem:request>',
-  '</tem:request>',
-  '</tem:GetAuthorizedCredit>',
-  '</soapenv:Body>',
-  '</soapenv:Envelope>'];
+    '<soapenv:Header/>',
+    '<soapenv:Body>',
+    '<tem:GetAuthorizedCredit>',
+    '<tem:request>',
+    '</tem:request>',
+    '</tem:GetAuthorizedCredit>',
+    '</soapenv:Body>',
+    '</soapenv:Envelope>'];
 
 describe('Validação ADQ v1', function () {
 
-  async.each([1], function (itemNumber, callback) {
-    describe('Test Case ' + itemNumber, function () {
-      it("should be a number", function (done) {
-
-        $.ajax({
-          type: "GET", //GET or POST or PUT or DELETE verb
-          url: 'https://dotnetcore-govinda777.c9users.io/api/Values/Get', // Location of the service
-          crossDomain: true,
-          success: function (msg) {//On Successfull service call
-
-            assert.equal(itemNumber,itemNumber);
-            done();
-          },
-          error: function (msg) {// When Service call fails
+    var resultTest = [{}, {}];
+
+    $.ajax({
+        type: "GET", //GET or POST or PUT or DELETE verb
+        async: false,
+        url: 'http://localhost:50530/api/adquirencia/validateall', // Location of the service
+        crossDomain: true,
+        success: function (data) {//On Successfull service call
+            resultTest = data;
+        },
+        error: function (msg) {// When Service call fails
             debugger;
             alert('erro');
-          }
+        }
+    });
+
+    async.each(resultTest, function (item) {
+
+        describe('Test Case ' + item.isPass , function () {
+
+            it("isPass :" + item.isPass, function (done) {
+
+                assert.equal(item.isPass, true);
+                done();
+            });
+
+            it("message :" + item.message, function (done) {
+
+                assert.equal(item.message, "");
+                done();
+            });
+
+            it("totalTime :" + item.totalTime, function (done) {
+                var timeout = item.totalTime > 4;
+
+                assert.isOk(!timeout, timeout ? "TEMPO MAIOR DO QUE O ESPERADO" : "Dentro do esperado");
+                done();
+            });
         });
-      });
+        
     });
-    callback()
-  });
+
+
 
 });
diff --git a/WebApi/ScaffoldingReadMe.txt b/WebApi/ScaffoldingReadMe.txt
diff --git a/WebApi/SyonOnline.WebApi.csproj b/WebApi/SyonOnline.WebApi.csproj
@@ -19,21 +19,21 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.1" />
   </ItemGroup>

diff --git a/WebApi/SyonOnline.WebApi/Controllers/AdquirenciaController.cs b/WebApi/SyonOnline.WebApi/Controllers/AdquirenciaController.cs
@@ -6,6 +6,7 @@
 using SyonOnline.WebApi.SyonOnline.WebApi.Model;
 using SyonOnline.WebApi.SyonOnline.WebApi.Moq.Adquirencia;
 using SyonOnline.ServiceReference.Adquirencia;
+using System.Collections.Concurrent;
 
 namespace SyonOnline.WebApi.Controllers
 {
@@ -15,27 +16,39 @@ public class AdquirenciaController : Controller
 
         // GET api/values/password
         [HttpGet("{password}")]
-        public async Task<List<ValidationResult>> ValidateFull(string password)
+        public Task<List<ValidationResult>> ValidateFull(string password)
         {
             var moq = new AdquirenciaInfo();
+            var moqValues = moq.GetCollection();
             var service = new KomerciWcfClient();
+            var resultCollection = new ConcurrentBag<ValidationResult>();
             var result = new List<ValidationResult>();
 
-            Parallel.ForEach(moq.GetCollection(), async x => {
-                result.Add(await CallGetAuthorizedCreditAsync(service, x));
+            return Task.Run(() =>
+            {
+                Parallel.ForEach(moqValues, x => {
+                    var r = CallGetAuthorizedCreditAsync(service, x);
+                    result.Add(r);
+                });
+
+                return result;
             });
-
-            return result;
-
         }
 
-        private async Task<ValidationResult> CallGetAuthorizedCreditAsync(KomerciWcfClient service, AdquirenciaInfo item)
+        private ValidationResult CallGetAuthorizedCreditAsync(KomerciWcfClient service, AdquirenciaInfo item)
         {
-            var result = await service.GetAuthorizedCreditAsync(item.Request);
+            var validationResult = new ValidationResult();
+            var msg = string.Empty;
+            var wsResult = service.GetAuthorizedCreditAsync(item.Request);
+
+            wsResult.Wait();
+
+            validationResult.TimeFinish = DateTime.Now;
 
-            item.EqualsResult(result);
+            validationResult.IsPass = item.EqualsResult(wsResult.Result,out msg);
+            validationResult.Message = msg;
 
-            return new ValidationResult();
+            return validationResult;
         }
     }
 }
diff --git a/WebApi/SyonOnline.WebApi/Model/ValidationResult.cs b/WebApi/SyonOnline.WebApi/Model/ValidationResult.cs
@@ -7,5 +7,26 @@ namespace SyonOnline.WebApi.SyonOnline.WebApi.Model
 {
     public class ValidationResult
     {
+        private DateTime _timeFinish;
+        public ValidationResult()
+        {
+            TimeStart = DateTime.Now;
+        }
+
+        public DateTime TimeStart { get; }
+        public DateTime TimeFinish {
+            get
+            {
+                return _timeFinish;
+            }
+            set
+            {
+                _timeFinish = value;
+                TotalTime = (_timeFinish - TimeStart).TotalSeconds;
+            }
+        }
+        public double TotalTime { get; private set; }
+        public string Message { get; set; }
+        public bool IsPass { get; set; }
     }
 }
diff --git a/WebApi/SyonOnline.WebApi/Moq/Adquirencia/AdquirenciaInfo.cs b/WebApi/SyonOnline.WebApi/Moq/Adquirencia/AdquirenciaInfo.cs
@@ -13,7 +13,7 @@ public class AdquirenciaInfo
 
         public AdquirenciaInfo()
         {
-            _fileName = "mockAdquirencia.json";
+            _fileName = @"SyonOnline.WebApi\Moq\Adquirencia\mockAdquirencia.json";
         }
 
         public AdquirenciaInfo(string fileName)
@@ -31,17 +31,24 @@ public AdquirenciaInfo(GetAuthorizedCredit request, CreditAuthorizationResponse
         public CreditAuthorizationResponse Result;
 
         public List<AdquirenciaInfo> GetCollection()
-        {
+        {   
             var json = System.IO.File.ReadAllText(_fileName);
             return JsonConvert.DeserializeObject<AdquirenciaInfo[]>(json).ToList();
         }
 
-        public bool EqualsResult(object obj)
+        public bool EqualsResult(object obj, out string message)
         {
-            var resultWS = (CreditAuthorizationResponse)obj;
+            message = string.Empty;
 
+            var resultWS = (CreditAuthorizationResponse)obj;
+
             var testPass = this.Result.CodRet == resultWS.CodRet;
 
+            if(!testPass)
+            {
+                message = string.Format("CodRet | {0} == {1} , {2}", this.Result.CodRet, resultWS.CodRet, resultWS.Msgret);
+            }
+
             return testPass;
         }
     }

diff --git a/WebApi/SyonOnline.WebApi/Moq/Adquirencia/mockAdquirencia.json b/WebApi/SyonOnline.WebApi/Moq/Adquirencia/mockAdquirencia.json
@@ -904,7 +904,7 @@
     },
     "Result": {
       "Cet": null,
-      "CodRet": 72,
+      "CodRet": 722,
       "Data": null,
       "Hora": null,
       "Juros": null,

diff --git a/WebApi/SyonOnline.WebApi/Program.cs b/WebApi/SyonOnline.WebApi/Program.cs
@@ -28,7 +28,7 @@ public static void Main(string[] args)
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
-                .UseUrls("http://0.0.0.0:8080")
+                //.UseUrls("http://0.0.0.0:8012")
                 .Build();
 
             host.Run();

diff --git a/WebApi/WebApi.sln b/WebApi/WebApi.sln