TT#82263 fix admin tests in trunk

edited admin tests to check the right column + remove one unnecessary test

Change-Id: Id2f8a93103e954d729a1125d6f3580d37345e747

t/selenium/controller_admin.t

@@ -65,7 +65,7 @@ $d->fill_element('//*[@id="administrator_table_filter"]/label/input', 'xpath', $
 diag("Check Administrator details");
 ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[contains(text(), "' . $adminname . '")]'), 'Name is correct');
 ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[contains(text(), "' . $resellername . '")]'), 'Reseller is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[7][contains(text(), "0")]'), 'Read-Only value is correct');
+ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[8][contains(text(), "0")]'), 'Read-Only value is correct');
 
 diag("Edit Administrator details. Enable read-only setting");
 $adminname = ("admin" . int(rand(100000)) . "test");
@@ -136,8 +136,8 @@ diag("Check Administrator details");
 is($d->get_text_safe('//*[@id="content"]//div[contains(@class, "alert")]'), 'Administrator successfully updated',  'Correct Alert was shown');
 ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[contains(text(), "' . $adminname . '")]'), 'Name is correct');
 ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[contains(text(), "' . $resellername . '")]'), 'Reseller is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[6][contains(text(), "0")]'), 'Active value is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[7][contains(text(), "1")]'), 'Read-Only value is correct');
+ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[7][contains(text(), "0")]'), 'Active value is correct');
+ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[8][contains(text(), "1")]'), 'Read-Only value is correct');
 
 diag("Do deactivated Administrator login");
 $d->get("$uri/logout");
@@ -173,10 +173,9 @@ diag("Check Administrator details");
 is($d->get_text_safe('//*[@id="content"]//div[contains(@class, "alert")]'), 'Administrator successfully updated',  'Correct Alert was shown');
 ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[contains(text(), "' . $adminname . '")]'), 'Name is correct');
 ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[contains(text(), "' . $resellername . '")]'), 'Reseller is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[4][contains(text(), "1")]'), 'Master value is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[6][contains(text(), "1")]'), 'Active value is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[7][contains(text(), "0")]'), 'Read-Only value is correct');
-ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[11][contains(text(), "1")]'), 'Lawful intercept value is correct');
+ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[5][contains(text(), "1")]'), 'Master value is correct');
+ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[7][contains(text(), "1")]'), 'Active value is correct');
+ok($d->find_element_by_xpath('//*[@id="administrator_table"]//tr[1]/td[8][contains(text(), "0")]'), 'Read-Only value is correct');
 
 diag("Log in new Administrator");
 $c->login_ok($adminname, $adminpwd);