Merge pull request #4 from itaibh/master

updated visual grid tutorial.

Author: rajaraodv

ApplitoolsTutorial/ApplitoolsTutorial.csproj

@@ -1,14 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
-    <OutputType>Exe</OutputType>
-    <StartupObject>ApplitoolsTutorial.Program</StartupObject>
+    <OutputType>Library</OutputType>
+    <StartupObject></StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eyes.Selenium" Version="2.22.27" />
+    <PackageReference Include="Eyes.Selenium" Version="2.22.31" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

ApplitoolsTutorial/Program.cs ApplitoolsTutorial/VisualGridDemo.csApplitoolsTutorial/Program.cs renamed to ApplitoolsTutorial/VisualGridDemo.cs

@@ -1,6 +1,7 @@
 using Applitools;
 using Applitools.Selenium;
 using Applitools.VisualGrid;
+using NUnit.Framework;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using Configuration = Applitools.Selenium.Configuration;
@@ -9,15 +10,12 @@
 namespace ApplitoolsTutorial
 {
 
-    class Program
+    [TestFixture]
+    public class VisualGridDemo
     {
-        public static void Main()
-        {
-            Program program = new Program();
-            program.Run();
-        }
 
-        private void Run()
+        [Test]
+        public void VGTest()
         {
             // Create a new webdriver
             IWebDriver webDriver = new ChromeDriver();
@@ -34,12 +32,11 @@ private void Run()
             // Create Eyes object with the runner, meaning it'll be a Visual Grid eyes.
             Eyes eyes = new Eyes(runner);
 
-            // Create configuration object
-            Configuration conf = new Configuration();
+            // Get current Eyes configuration object
+            Configuration conf = eyes.GetConfiguration();
 
 
-
-            //conf.SetApiKey("APPLITOOLS_API_KEY");    // Set the Applitools API KEY here or as an environment variable "APPLITOOLS_API_KEY"
+            //conf.SetApiKey("APPLITOOLS_API_KEY");  // Set the Applitools API KEY here or as an environment variable "APPLITOOLS_API_KEY"
             conf.SetTestName("C# VisualGrid demo")   // Set test name
                 .SetAppName("Demo app");             // Set app name
 
@@ -49,6 +46,7 @@ private void Run()
             conf.AddBrowser(1200, 800, BrowserType.IE_10);
             conf.AddBrowser(1600, 1200, BrowserType.IE_11);
             conf.AddBrowser(1024, 768, BrowserType.EDGE);
+            conf.AddBrowser(800, 600, BrowserType.SAFARI);
 
             // Add iPhone 4 device emulation in Portrait mode
             conf.AddDeviceEmulation(DeviceName.iPhone_4, ScreenOrientation.Portrait);
@@ -57,24 +55,30 @@ private void Run()
             // Set the configuration object to eyes
             eyes.SetConfiguration(conf);
 
-            // Call Open on eyes to initialize a test session
-            eyes.Open(webDriver);
-
-            // check the login page
-            eyes.Check(Target.Window().Fully().WithName("Login page"));
-            webDriver.FindElement(By.Id("log-in")).Click();
+            try
+            {
+                // Call Open on eyes to initialize a test session
+                eyes.Open(webDriver);
 
-            // Check the app page
-            eyes.Check(Target.Window().Fully().WithName("App page"));
+                // check the login page
+                eyes.Check(Target.Window().Fully().WithName("Login page"));
+                webDriver.FindElement(By.Id("log-in")).Click();
 
-            // Close the browser
-            webDriver.Quit();
+                // Check the app page
+                eyes.Check(Target.Window().Fully().WithName("App page"));
 
-            eyes.CloseAsync();
+                // Call Close on eyes to let the server know it should display the results
+                eyes.CloseAsync();
+            }
+            finally
+            {
+                // Close the browser
+                webDriver.Quit();
+            }
 
-            //Wait and collect all test results
+            // Wait and collect all test results
             TestResultsSummary allTestResults = runner.GetAllTestResults();
-            System.Console.WriteLine(allTestResults);
+            TestContext.Progress.WriteLine(allTestResults);
         }
 
     }