Merge branch 'master' of github.com:aquality-automation/aquality-appium-mobile-dotnet

Author: Pavel Anihimovsky

Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Applications/AqualityServices.cs

@@ -58,7 +58,7 @@ public class AqualityServices : AqualityServices<IMobileApplication>
         /// <summary>
         /// Gets factory to create screens.
         /// </summary>
-        public static IScreenFactory ScreenFactory => Get<IScreenFactoryProvider>().ScreenFactory;
+        public static IScreenFactory ScreenFactory => Get<IScreenFactory>();
 
         /// <summary>
         /// Resolves required service from <see cref="ServiceProvider"/>

Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Applications/MobileStartup.cs

@@ -27,7 +27,7 @@ public override IServiceCollection ConfigureServices(IServiceCollection services
             services.AddTransient<CoreElementFactory, ElementFactory>();
             services.AddSingleton<IApplicationProfile, ApplicationProfile>();            
             services.AddSingleton<ILocalServiceSettings, LocalServiceSettings>();
-            services.AddSingleton<IScreenFactoryProvider, ScreenFactoryProvider>();
+            services.AddSingleton<IScreenFactory, ScreenFactory>();
             services.AddSingleton<ILocalizationManager>(serviceProvider => new LocalizationManager(serviceProvider.GetRequiredService<ILoggerConfiguration>(), serviceProvider.GetRequiredService<Logger>(), Assembly.GetExecutingAssembly()));
             services.AddTransient(serviceProvider => AqualityServices.ApplicationFactory);
             services.AddScoped(serviceProvider => applicationProvider(serviceProvider) as IMobileApplication);

Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Screens/IOSScreen.cs

@@ -2,15 +2,12 @@
 using Aquality.Appium.Mobile.Elements.Interfaces;
 using Aquality.Selenium.Core.Elements.Interfaces;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Appium;
-using System;
 using System.Drawing;
 using IElementFactory = Aquality.Appium.Mobile.Elements.Interfaces.IElementFactory;
 
 namespace Aquality.Appium.Mobile.Screens
 {
-    public abstract class Screen<T> : IScreen
-        where T : AppiumDriver<AppiumWebElement>
+    public abstract class Screen : IScreen
     {
         private readonly ILabel screenLabel;
 
@@ -21,23 +18,6 @@ protected Screen(By locator, string name)
             screenLabel = ElementFactory.GetLabel(locator, name);
         }
 
-        protected T Driver
-        {
-            get
-            {
-                var currentPlatform = AqualityServices.Application.PlatformName;
-                if (PlatformName != currentPlatform)
-                {
-                    throw new InvalidOperationException("Cannot perform this operation. " +
-                        $"Current platform {currentPlatform} don't match to target {PlatformName}");
-                }
-
-                return (T) AqualityServices.Application.Driver;
-            }
-        }
-
-        protected abstract PlatformName PlatformName { get; }
-
         public By Locator { get; }
 
         public string Name { get; }

Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Screens/Screen.cs

@@ -1,4 +1,5 @@
 using Aquality.Appium.Mobile.Applications;
+using Aquality.Appium.Mobile.Configurations;
 using System;
 using System.IO;
 using System.Linq;
@@ -7,12 +8,17 @@
 namespace Aquality.Appium.Mobile.Screens.ScreenFactory
 {
     /// <summary>
-    /// Abstract screen factory.
+    /// Screen factory.
     /// </summary>
-    /// <typeparam name="TPlatformScreen">Desired platform screen <see cref="IOSScreen"/> or <see cref="AndroidScreen"/></typeparam>
-    public abstract class ScreenFactory<TPlatformScreen> : IScreenFactory
-        where TPlatformScreen : class
+    public class ScreenFactory : IScreenFactory
     {
+        private readonly IApplicationProfile applicationProfile;
+
+        public ScreenFactory(IApplicationProfile applicationProfile)
+        {
+            this.applicationProfile = applicationProfile;
+        }
+
         /// <summary>
         /// Returns an implementation of a particular app screen.
         /// </summary>
@@ -25,8 +31,14 @@ public TAppScreen GetScreen<TAppScreen>()
             {
                 screenType = Assembly.Load(AqualityServices.ApplicationProfile.ScreensLocation)
                     .GetTypes()
-                    .Where(t => t.GetInterfaces().Contains(typeof(TAppScreen)))
-                    .SingleOrDefault(t => t.IsSubclassOf(typeof(TPlatformScreen)));
+                    .Where(t => t.IsSubclassOf(typeof(TAppScreen)))
+                    .Where(t => t.IsDefined(typeof(ScreenTypeAttribute), false))
+                    .SingleOrDefault(t => 
+                    {
+                        var attribute = (ScreenTypeAttribute) Attribute.GetCustomAttribute(t, typeof(ScreenTypeAttribute));
+                        return attribute.Platform == applicationProfile.PlatformName;
+                    });
+
             } 
             catch (FileNotFoundException ex)
             {

Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Screens/ScreenFactory/AndroidScreenFactory.cs

@@ -0,0 +1,22 @@
+using Aquality.Appium.Mobile.Applications;
+using System;
+
+namespace Aquality.Appium.Mobile.Screens.ScreenFactory
+{
+    /// <summary>
+    /// Attribute that identifies platform of screen. 
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class ScreenTypeAttribute : Attribute
+    {
+        public ScreenTypeAttribute(PlatformName platformName)
+        {
+            Platform = platformName;
+        }
+
+        /// <summary>
+        /// Name of platform that screen relates to.
+        /// </summary>
+        public PlatformName Platform { get; }
+    }
+}