Add logging of Element property getters +semver: feature (#27)

mialeska · web-flow · commit 9992faf8c6de · 2020-06-30T12:36:53.000+03:00
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Aquality.Appium.Mobile.csproj b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Aquality.Appium.Mobile.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.Appium.Mobile/src/Aquality.Appium.Mobile/Elements/CheckableElement.cs b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Elements/CheckableElement.cs
@@ -14,7 +14,9 @@ public bool IsChecked
             get
             {
                 LogElementAction("loc.checkable.is.checked");
-                return GetState();
+                var state = GetState();
+                LogElementAction("loc.checkable.state", state);
+                return state;
             }
         }
 
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Elements/ComboBox.cs b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Elements/ComboBox.cs
@@ -15,18 +15,38 @@ protected internal ComboBox(By locator, string name, ElementState state) : base(
         {
         }
 
-        public string SelectedText => DoWithRetry(() => new SelectElement(GetElement()).SelectedOption.Text);
+        protected override string ElementType => LocalizationManager.GetLocalizedMessage("loc.combobox");
+
+        public string SelectedText
+        {
+            get
+            {
+                LogElementAction("loc.combobox.getting.selected.text");
+                var text = DoWithRetry(() => new SelectElement(GetElement()).SelectedOption.Text);
+                LogElementAction("loc.combobox.selected.text", text);
+                return text;
+            }
+        }
 
-        public string SelectedValue => DoWithRetry(() => new SelectElement(GetElement()).SelectedOption.GetAttribute(Attributes.Value));
+        public string SelectedValue
+        {
+            get
+            {
+                LogElementAction("loc.combobox.getting.selected.value");
+                var value = DoWithRetry(() => new SelectElement(GetElement()).SelectedOption.GetAttribute(Attributes.Value));
+                LogElementAction("loc.combobox.selected.value", value);
+                return value;
+            }
+        }
 
         public IList<string> Texts
         {
             get
             {
                 LogElementAction("loc.combobox.get.texts");
-                return DoWithRetry(
-                    () => new SelectElement(GetElement())
-                    .Options.Select(option => option.Text).ToList());
+                var values = DoWithRetry(() => new SelectElement(GetElement()).Options.Select(option => option.Text).ToList());
+                LogElementAction("loc.combobox.texts", string.Join(", ", values.Select(value => $"'{value}'")));
+                return values;
             }
         }
 
@@ -35,14 +55,12 @@ public IList<string> Values
             get
             {
                 LogElementAction("loc.combobox.get.values");
-                return DoWithRetry(
-                    () => new SelectElement(GetElement())
-                    .Options.Select(option => option.GetAttribute(Attributes.Value)).ToList());
+                var values = DoWithRetry(() => new SelectElement(GetElement()).Options.Select(option => option.GetAttribute(Attributes.Value)).ToList());
+                LogElementAction("loc.combobox.values", string.Join(", ", values.Select(value => $"'{value}'")));
+                return values;
             }
         }
 
-        protected override string ElementType => LocalizationManager.GetLocalizedMessage("loc.combobox");
-
         public void ClickAndSelectByText(string text)
         {
             Click();
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Elements/Element.cs b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Elements/Element.cs
@@ -35,7 +35,7 @@ protected Element(By locator, string name, ElementState state) : base(locator, n
 
         protected override ILocalizedLogger LocalizedLogger => AqualityServices.LocalizedLogger;
 
-        protected virtual ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();
+        protected override ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();
 
         public new AppiumWebElement GetElement(TimeSpan? timeout = null)
         {
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/Localization/be.json b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/Localization/be.json
@@ -1,15 +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.search.of.elements.failed": "Пошук элемента па лакатару '{0}' прайшоў няўдала",
-  "loc.element.not.in.state": "Элемент {0} не стаў {1} пасля таймаўта {2}",
-  "loc.get.page.source.failed": "Адбылася памылка ў час атрымання разметкі старонкі",
   "loc.application.quit": "Закрываем праграму",
   "loc.application.driver.remote": "Усталёўваем драйвер праграммы з выкарыстаннем сервера па адрасе '{0}'",
   "loc.platform.name.wrong": "Платформа '{0}' не падтрымліваецца.",
@@ -19,14 +8,19 @@
   "loc.button": "Кнопка",
   "loc.checkbox": "Чэкбокс",
   "loc.checkable.is.checked": "Атрымліваем стан",
+  "loc.checkable.state": "Стан: [{0}]",
   "loc.combobox": "Камбабокс",
+  "loc.combobox.getting.selected.text": "Атрымліваем выбраны тэкст",
+  "loc.combobox.getting.selected.value": "Атрымліваем выбранае значэнне",
+  "loc.combobox.selected.text": "Выбраны тэкст: [{0}]",
+  "loc.combobox.selected.value": "Выбранае значэнне: [{0}]",
   "loc.combobox.select.by.text": "Выбіраем значэнне з тэкстам '{0}'",
   "loc.combobox.select.by.value": "Выбіраем значэнне '{0}'",
   "loc.combobox.get.texts": "Атрымліваем спіс тэкстаў опцыяў",
   "loc.combobox.get.values": "Атрымліваем спіс значэнняў",
+  "loc.combobox.texts": "Спіс тэкстаў опцыяў: [{0}]",
+  "loc.combobox.values": "Спіс значэнняў: [{0}]",
   "loc.combobox.impossible.to.select.contain.value.or.text": "Немагчыма выбраць опцыю, якая змяшчае значэнне/тэкст '{0}' у камбабоксе '{1}'",
-  "loc.file.reading_exception": "Памылка пры чытанні файла: '{0}'",
-  "loc.focusing": "Факусуемся",
   "loc.label": "Надпіс",
   "loc.link": "Спасылка",
   "loc.radio": "Радыёкнопка",
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/Localization/en.json b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/Localization/en.json
@@ -1,15 +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.search.of.elements.failed": "Search of element by locator '{0}' failed",
-  "loc.element.not.in.state": "Element {0} has not become {1} after timeout {2}",
-  "loc.get.page.source.failed": "An exception occurred while tried to save the page source",
   "loc.application.quit": "Closing application",
   "loc.application.driver.remote": "Setting application driver using the server on '{0}'",
   "loc.platform.name.wrong": "Platform '{0}' is not supported.",
@@ -19,14 +8,19 @@
   "loc.button": "Button",
   "loc.checkbox": "CheckBox",
   "loc.checkable.is.checked": "Getting state",
+  "loc.checkable.state": "State: [{0}]",
   "loc.combobox": "ComboBox",
+  "loc.combobox.getting.selected.text": "Getting selected text",
+  "loc.combobox.getting.selected.value": "Getting selected value",
+  "loc.combobox.selected.text": "Selected text: [{0}]",
+  "loc.combobox.selected.value": "Selected value: [{0}]",
   "loc.combobox.select.by.text": "Selecting value by text '{0}'",
   "loc.combobox.select.by.value": "Selecting value '{0}'",
   "loc.combobox.get.texts": "Getting option texts array",
   "loc.combobox.get.values": "Getting values array",
+  "loc.combobox.texts": "Option texts: [{0}]",
+  "loc.combobox.values": "Option values: [{0}]",
   "loc.combobox.impossible.to.select.contain.value.or.text": "It is impossible to select option that contains value/text '{0}' from combobox '{1}'",
-  "loc.file.reading_exception": "Exception while reading file: '{0}'",
-  "loc.focusing": "Focusing",
   "loc.label": "Label",
   "loc.link": "Link",
   "loc.radio": "Radiobutton",
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/Localization/ru.json b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/Localization/ru.json
@@ -1,15 +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.search.of.elements.failed": "Поиск элемента по локатору '{0}' прошел неудачно",
-  "loc.element.not.in.state": "Элемент {0} не стал {1} после таймаута {2}",
-  "loc.get.page.source.failed": "Произошла ошибка во время получения разметки экрана",
   "loc.application.quit": "Закрытие приложения",
   "loc.application.driver.remote": "Установка драйвера для приложения с использованием сервера по адресу '{0}'",
   "loc.platform.name.wrong": "Платформа '{0}' не поддерживается.",
@@ -19,14 +8,19 @@
   "loc.button": "Кнопка",
   "loc.checkbox": "Чекбокс",
   "loc.checkable.is.checked": "Получение состояния",
+  "loc.checkable.state": "Состояние: [{0}]",
   "loc.combobox": "Комбобокс",
+  "loc.combobox.getting.selected.text": "Получаем выбранный текст",
+  "loc.combobox.getting.selected.value": "Получаем выбранное значение",
+  "loc.combobox.selected.text": "Выбранный текст: [{0}]",
+  "loc.combobox.selected.value": "Выбранное значение: [{0}]",
   "loc.combobox.select.by.text": "Выбор значения с текстом '{0}'",
   "loc.combobox.select.by.value": "Выбор значения '{0}'",
   "loc.combobox.get.texts": "Получение списка текстов опций",
   "loc.combobox.get.values": "Получение списка значений",
+  "loc.combobox.texts": "Список текстов опций: [{0}]",
+  "loc.combobox.values": "Список значений: [{0}]",
   "loc.combobox.impossible.to.select.contain.value.or.text": "Не удаётся выбрать значение которое содержит значение/текст '{0}' в выпадающем списке '{1}'",
-  "loc.file.reading_exception": "Исключение при чтении файла: '{0}'%n",
-  "loc.focusing": "Взятие элемента в фокус",
   "loc.label": "Надпись",
   "loc.link": "Ссылка",
   "loc.radio": "Радиокнопка",
diff --git a/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/settings.json b/Aquality.Appium.Mobile/src/Aquality.Appium.Mobile/Resources/settings.json
@@ -40,7 +40,8 @@
     "pollingInterval": 300
   },
   "logger": {
-    "language": "en"
+    "language": "en",
+    "logPageSource": true
   },
   "elementCache": {
     "isEnabled": true
diff --git a/Aquality.Appium.Mobile/tests/Aquality.Appium.Mobile.Tests/Resources/settings.androidwebsession.json b/Aquality.Appium.Mobile/tests/Aquality.Appium.Mobile.Tests/Resources/settings.androidwebsession.json
@@ -31,7 +31,8 @@
     "pollingInterval": 300
   },
   "logger": {
-    "language": "ru"
+    "language": "ru",
+    "logPageSource": true
   },
   "elementCache": {
     "isEnabled": true
diff --git a/Aquality.Appium.Mobile/tests/Aquality.Appium.Mobile.Tests/Resources/settings.json b/Aquality.Appium.Mobile/tests/Aquality.Appium.Mobile.Tests/Resources/settings.json
@@ -42,7 +42,8 @@
     "pollingInterval": 300
   },
   "logger": {
-    "language": "en"
+    "language": "en",
+    "logPageSource": true
   },
   "elementCache": {
     "isEnabled": true

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ public bool IsChecked`
`14`	`14`	`get`
`15`	`15`	`{`
`16`	`16`	`LogElementAction("loc.checkable.is.checked");`
`17`		`- return GetState();`
	`17`	`+ var state = GetState();`
	`18`	`+ LogElementAction("loc.checkable.state", state);`
	`19`	`+ return state;`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected Element(By locator, string name, ElementState state) : base(locator, n`
`35`	`35`
`36`	`36`	`protected override ILocalizedLogger LocalizedLogger => AqualityServices.LocalizedLogger;`
`37`	`37`
`38`		`- protected virtual ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();`
	`38`	`+ protected override ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();`
`39`	`39`
`40`	`40`	`public new AppiumWebElement GetElement(TimeSpan? timeout = null)`
`41`	`41`	`{`