Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Vladishev <aleksander.vladishev@zabbix.com>2017-12-13 00:26:53 +0300
committerAlexander Vladishev <aleksander.vladishev@zabbix.com>2017-12-13 00:26:53 +0300
commit04dbde81faa65213a874e2a2e924272cfbcc19f4 (patch)
tree4df0e781711296f30727cf677ac5280b54f2301c
parentab3f3f25edd808e4176d018599dfc35349034bbc (diff)
.......... [ZBXNEXT-4127] removed tests for nonexistent pages
-rw-r--r--frontends/php/tests/selenium/SeleniumTests.php2
-rw-r--r--frontends/php/tests/selenium/testPagePopup.php95
2 files changed, 0 insertions, 97 deletions
diff --git a/frontends/php/tests/selenium/SeleniumTests.php b/frontends/php/tests/selenium/SeleniumTests.php
index 83a68440e35..2f9bf8740ea 100644
--- a/frontends/php/tests/selenium/SeleniumTests.php
+++ b/frontends/php/tests/selenium/SeleniumTests.php
@@ -47,7 +47,6 @@ require_once dirname(__FILE__).'/testPageTriggers.php';
require_once dirname(__FILE__).'/testPageTriggerPrototypes.php';
require_once dirname(__FILE__).'/testPageMaintenance.php';
require_once dirname(__FILE__).'/testPageMaps.php';
-require_once dirname(__FILE__).'/testPagePopup.php';
/*
require_once dirname(__FILE__).'/testPageQueueDetails.php';
require_once dirname(__FILE__).'/testPageQueueOverview.php';
@@ -142,7 +141,6 @@ class SeleniumTests {
$suite->addTestSuite('testPageMaintenance');
$suite->addTestSuite('testPageMaps');
$suite->addTestSuite('testPageOverview');
- $suite->addTestSuite('testPagePopup');
/*
$suite->addTestSuite('testPageQueueDetails');
$suite->addTestSuite('testPageQueueOverview');
diff --git a/frontends/php/tests/selenium/testPagePopup.php b/frontends/php/tests/selenium/testPagePopup.php
deleted file mode 100644
index 51d23f59bb2..00000000000
--- a/frontends/php/tests/selenium/testPagePopup.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2017 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-**/
-
-require_once dirname(__FILE__).'/../include/class.cwebtest.php';
-
-class testPagePopup extends CWebTest {
- private $urlPopupProxies =
- 'zabbix.php?action=popup.generic&srctbl=proxies&srcfld1=hostid&srcfld2=host&dstfrm=form&dstfld1=fld1&dstfld2=fld2';
- private $urlPopupApplications =
- 'zabbix.php?action=popup.generic&srctbl=applications&srcfld1=name&dstfrm=form&dstfld1=fld1';
-
- public function testPagePopupProxies_CheckLayout() {
- $this->authenticate();
- $this->zbxTestOpen($this->urlPopupProxies);
- $this->zbxTestCheckTitle('Proxies');
- $this->zbxTestCheckHeader('Proxies');
- $this->zbxTestTextPresent(['Name']);
-
- $result = DBselect(
- 'SELECT host'.
- ' FROM hosts'.
- ' WHERE status IN ('.HOST_STATUS_PROXY_ACTIVE.','.HOST_STATUS_PROXY_PASSIVE.')'
- );
- while ($row = DBfetch($result)) {
- $this->zbxTestTextPresent($row['host']);
- }
- }
-
- public function testPagePopupApplications_CheckLayout() {
- $this->authenticate();
- $this->zbxTestOpen($this->urlPopupApplications);
- $this->zbxTestCheckTitle('Applications');
- $this->zbxTestCheckHeader('Applications');
- $this->zbxTestTextPresent(['Group', 'Host']);
- $this->zbxTestTextPresent('Name');
- $this->zbxTestAssertElementPresentId('groupid');
- $this->zbxTestAssertElementPresentId('hostid');
- $this->zbxTestDropdownSelect('groupid', 'Templates');
- $this->zbxTestDropdownSelectWait('hostid', 'Template OS Linux');
-
- $ddGroups = $this->zbxTestGetDropDownElements('groupid');
- $dbGroups = [];
-
- // checking order of dropdown entries
-
- $result = DBselect(
- 'SELECT g.groupid,g.name'.
- ' FROM groups g'.
- ' WHERE g.groupid IN ('.
- 'SELECT hg.groupid'.
- ' FROM hosts_groups hg,hosts h'.
- ' WHERE hg.hostid=h.hostid'.
- ' AND h.status IN ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.','.HOST_STATUS_TEMPLATE.')'.
- ')'
- );
-
- while ($row = DBfetch($result)) {
- $dbGroups[] = $row;
- }
-
- order_result($dbGroups, 'name');
- $dbGroups = array_values($dbGroups);
-
- $countDdGroups = count($ddGroups);
- $countDbGroups = count($dbGroups);
-
- $this->assertEquals($countDdGroups, $countDbGroups);
-
- for ($i = 0; $i < $countDbGroups; $i++) {
- $this->assertEquals($dbGroups[$i]['groupid'], $ddGroups[$i]['id']);
- $this->assertEquals($dbGroups[$i]['name'], $ddGroups[$i]['content']);
- }
-
- // checking window content
-
- // TODO checkind windows content and hosts dropdown
- }
-}