Update Aquality.Selenium.Core, support logging of element property ge…

…tters (#51) +semver: feature
aquality-automation · Jun 26, 2020 · 9e14623 · 9e14623
1 parent 61da6f4
commit 9e14623
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 28 deletions.
diff --git a/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Aquality.WinAppDriver.csproj b/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Aquality.WinAppDriver.csproj
@@ -46,7 +46,7 @@
 
   <ItemGroup>
     <PackageReference Include="Appium.WebDriver" Version="4.1.1" />
-    <PackageReference Include="Aquality.Selenium.Core" Version="1.1.1" />
+    <PackageReference Include="Aquality.Selenium.Core" Version="1.2.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Elements/Element.cs b/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Elements/Element.cs
@@ -55,6 +55,6 @@ protected Element(
 
         protected override ILocalizedLogger LocalizedLogger => AqualityServices.LocalizedLogger;
 
-        protected virtual ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();
+        protected override ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();
     }
 }
diff --git a/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/Localization/be.json b/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/Localization/be.json
@@ -1,12 +1,4 @@
 {
-  "loc.clicking": "Націскаем",
-  "loc.el.getattr": "Атрымліваем атрыбут '{0}'",
-  "loc.get.text": "Атрымліваем тэкст элемента",
-  "loc.text.sending.keys": "Націскаем клавішы '{0}'",
-  "loc.no.elements.found.in.state": "Не знайшлі элементаў па лакатару '{0}' у {1} стане",
-  "loc.no.elements.found.by.locator": "Не знайшлі элементаў па лакатару '{0}'",
-  "loc.elements.were.found.but.not.in.state": "Знайшлі элементы па лакатару '{0}', але яны не ў жаданым стане {1}",
-  "loc.elements.found.but.should.not": "Не павінна быць знойдзена элементаў па лакатару '{0}' у {1} стане",
   "loc.application.start": "Запускаем праграму '{0}'",
   "loc.application.ready": "Праграма гатова",
   "loc.application.quit": "Закрываем праграму",

diff --git a/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/Localization/en.json b/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/Localization/en.json
@@ -1,12 +1,4 @@
 {
-  "loc.clicking": "Clicking",
-  "loc.el.getattr": "Getting attribute '{0}'",
-  "loc.get.text": "Getting text from element",
-  "loc.text.sending.keys": "Sending keys '{0}'",
-  "loc.no.elements.found.in.state": "No elements with locator '{0}' were found in {1} state",
-  "loc.no.elements.found.by.locator": "No elements were found by locator '{0}'",
-  "loc.elements.were.found.but.not.in.state": "Elements were found by locator '{0}' but not in desired state {1}",
-  "loc.elements.found.but.should.not": "No elements should be found by locator '{0}' in {1} state",
   "loc.application.start": "Starting application '{0}'",
   "loc.application.ready": "Application is ready",
   "loc.application.quit": "Closing application",

diff --git a/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/Localization/ru.json b/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/Localization/ru.json
@@ -1,12 +1,4 @@
 {
-  "loc.clicking": "Нажимаем",
-  "loc.el.getattr": "Получение аттрибута '{0}'",
-  "loc.get.text": "Получение текста элемента",
-  "loc.text.sending.keys": "Нажатие клавиши '{0}'",
-  "loc.no.elements.found.in.state": "Не удалось найти элементов по локатору '{0}' в {1} состоянии",
-  "loc.no.elements.found.by.locator": "Не удалось найти элементов по локатору '{0}'",
-  "loc.elements.were.found.but.not.in.state": "Удалось найти элементы по локатору '{0}', но они не в желаемом состоянии {1}",
-  "loc.elements.found.but.should.not": "Не должно быть найдено элементов по локатору '{0}' в {1} состоянии",
   "loc.application.start": "Запускаем приложение '{0}'",
   "loc.application.ready": "Приложение готово",
   "loc.application.quit": "Закрываем приложение",

diff --git a/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/settings.json b/Aquality.WinAppDriver/src/Aquality.WinAppDriver/Resources/settings.json
@@ -21,7 +21,8 @@
     "pollingInterval": 300
   },
   "logger": {
-    "language": "en"
+    "language": "en",
+    "logPageSource": false
   },
   "elementCache": {
     "isEnabled": true

diff --git a/...lity.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Localization/LocalizationFilesTest.cs b/...lity.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Localization/LocalizationFilesTest.cs
@@ -107,6 +107,8 @@ private LocalizationManager GetLocalizationManager(string customLanguage)
         private class DynamicConfiguration : ILoggerConfiguration
         {
             public string Language { get; set; }
+
+            public bool LogPageSource => false;
         }
     }
 }
diff --git a/Aquality.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Resources/settings.json b/Aquality.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Resources/settings.json
@@ -21,7 +21,8 @@
     "pollingInterval": 300
   },
   "logger": {
-    "language": "be"
+    "language": "be",
+    "logPageSource": false
   },
   "elementCache": {
     "isEnabled": true

diff --git a/...y.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Unit/Configuration/ConfigurationTests.cs b/...y.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Unit/Configuration/ConfigurationTests.cs
@@ -47,6 +47,8 @@ public static void TearDown()
         private class CustomLoggerConfiguration : ILoggerConfiguration
         {
             public string Language { get; } = SpecialLoggerLanguage;
+
+            public bool LogPageSource => false;
         }
 
         private interface ICustomService