aboutsummaryrefslogtreecommitdiff
path: root/webtests
diff options
context:
space:
mode:
authorZachary Sloan2013-08-16 16:20:38 -0500
committerZachary Sloan2013-08-16 16:20:38 -0500
commitac4ba08c41de06f7aa91696b3643df3ff66aea46 (patch)
tree8984b82f5d1ad43a3382975ea650fc771ba17a99 /webtests
parente327f27b1957ee6693986e9e9d4ff77550b16f07 (diff)
downloadgenenetwork2-ac4ba08c41de06f7aa91696b3643df3ff66aea46.tar.gz
Removed and imported the Test class from browser_test.py in each
test file
Diffstat (limited to 'webtests')
-rw-r--r--webtests/correlation_matrix_test.py58
-rw-r--r--webtests/correlation_test.py58
-rw-r--r--webtests/marker_regression_test.py65
3 files changed, 5 insertions, 176 deletions
diff --git a/webtests/correlation_matrix_test.py b/webtests/correlation_matrix_test.py
index 21051fd7..4047de84 100644
--- a/webtests/correlation_matrix_test.py
+++ b/webtests/correlation_matrix_test.py
@@ -55,64 +55,8 @@ text: 0.608\n71
from __future__ import print_function, division, absolute_import
-from time import sleep
-
-import selenium
-from selenium import webdriver
-from selenium.common.exceptions import NoSuchElementException, ElementNotVisibleException
-from selenium.webdriver.common.keys import Keys
-
from browser_test import Test
-#
-#class Test(object):
-# def __init__(self):
-# self.browser = webdriver.Chrome('/home/gn2/gn2/webtests/chromedriver')
-#
-# def get(self, url):
-# self.browser.get(url)
-# sleep(5)
-# self.title()
-#
-# def click(self, xpath_selector):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# #text = el.text.strip() or el.get_attribute("value").strip()
-# el.click()
-# #print("clicked:", text)
-# sleep(2)
-#
-# def click_option(self, xpath_selector, option_text):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# for option in el.find_elements_by_tag_name('option'):
-# if option.text == option_text:
-# option.click() # select() in earlier versions of webdriver
-# break
-# sleep(2)
-#
-# def enter_text(self, xpath_selector, text):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# sleep(10)
-# el.send_keys(text)
-# sleep(5)
-# # Just in case things get mangled by JavaScript, etc. we print the text for testing
-# self.get_text(xpath_selector)
-#
-# def get_text(self, xpath_selector):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# text = el.text.strip() or el.get_attribute("value").strip()
-# print("text:", text)
-#
-# def switch_window(self):
-# self.browser.switch_to_window(self.browser.window_handles[-1])
-# sleep(2)
-# self.title()
-# sleep(2)
-#
-#
-# def title(self):
-# print("title:", self.browser.title)
-#
-#
-#
+
if __name__ == '__main__':
import doctest
doctest.testmod()
diff --git a/webtests/correlation_test.py b/webtests/correlation_test.py
index aaf3f7df..ebdeaa52 100644
--- a/webtests/correlation_test.py
+++ b/webtests/correlation_test.py
@@ -47,63 +47,7 @@ text: 1.000
from __future__ import print_function, division, absolute_import
-from time import sleep
-
-
-import selenium
-from selenium import webdriver
-from selenium.common.exceptions import NoSuchElementException, ElementNotVisibleException
-from selenium.webdriver.common.keys import Keys
-
-
-class Test(object):
- def __init__(self):
- self.browser = webdriver.Chrome('/home/gn2/gn2/webtests/chromedriver')
-
- def get(self, url):
- self.browser.get(url)
- sleep(5)
- self.title()
-
- def click(self, xpath_selector):
- el = self.browser.find_element_by_xpath(xpath_selector)
- text = el.text.strip() or el.get_attribute("value").strip()
- el.click()
- print("clicked:", text)
- sleep(2)
-
- def click_option(self, xpath_selector, option_text):
- el = self.browser.find_element_by_xpath(xpath_selector)
- for option in el.find_elements_by_tag_name('option'):
- if option.text == option_text:
- option.click() # select() in earlier versions of webdriver
- break
- sleep(2)
-
- def enter_text(self, xpath_selector, text):
- el = self.browser.find_element_by_xpath(xpath_selector)
- sleep(10)
- el.send_keys(text)
- sleep(5)
- # Just in case things get mangled by JavaScript, etc. we print the text for testing
- self.get_text(xpath_selector)
-
- def get_text(self, xpath_selector):
- el = self.browser.find_element_by_xpath(xpath_selector)
- text = el.text.strip() or el.get_attribute("value").strip()
- print("text:", text)
-
- def switch_window(self):
- self.browser.switch_to_window(self.browser.window_handles[-1])
- sleep(2)
- self.title()
- sleep(2)
-
-
- def title(self):
- print("title:", self.browser.title)
-
-
+from browser_test import Test
if __name__ == '__main__':
import doctest
diff --git a/webtests/marker_regression_test.py b/webtests/marker_regression_test.py
index 3baf1e95..8932ec95 100644
--- a/webtests/marker_regression_test.py
+++ b/webtests/marker_regression_test.py
@@ -29,11 +29,11 @@ Click on Mapping Tools
clicked: Mapping Tools
Click on Marker Regression tab
->>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p[8]/table/tbody/tr/td/div/ul/li[2]/a''')
+>>> test.click('''//*[@id="mapping_tabs"]/ul/li[2]/a''')
clicked: Marker Regression
Click on Compute
->>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p[8]/table/tbody/tr/td/div/div[2]/span/table/tbody/tr/td/input''')
+>>> test.click('''//*[@id="mappingtabs-2"]/span/table/tbody/tr[1]/td/input''')
clicked: Compute
Another new window
@@ -44,7 +44,7 @@ Sleep a bunch because this can take a while
>>> sleep(60)
Ensure that the LRS of the top record is the exepcted value
->>> test.get_text('''/html/body/table/tbody/tr[3]/td/table/tbody/tr[4]/td/table/tbody/tr/td/div/table/tbody/tr[2]/td[2]''')
+>>> test.get_text('''//*[@id="1"]/td[2]''')
text: 11.511
"""
@@ -53,65 +53,6 @@ from __future__ import print_function, division, absolute_import
from browser_test import Test
-#
-#from time import sleep
-#
-#
-#import selenium
-#from selenium import webdriver
-#from selenium.common.exceptions import NoSuchElementException, ElementNotVisibleException
-#from selenium.webdriver.common.keys import Keys
-#
-#
-#class Test(object):
-# def __init__(self):
-# self.browser = webdriver.Chrome('/home/gn2/gn2/webtests/chromedriver')
-#
-# def get(self, url):
-# self.browser.get(url)
-# sleep(5)
-# self.title()
-#
-# def click(self, xpath_selector):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# text = el.text.strip() or el.get_attribute("value").strip()
-# el.click()
-# print("clicked:", text)
-# sleep(2)
-#
-# def click_option(self, xpath_selector, option_text):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# for option in el.find_elements_by_tag_name('option'):
-# if option.text == option_text:
-# option.click() # select() in earlier versions of webdriver
-# break
-# sleep(2)
-#
-# def enter_text(self, xpath_selector, text):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# sleep(10)
-# el.send_keys(text)
-# sleep(5)
-# # Just in case things get mangled by JavaScript, etc. we print the text for testing
-# self.get_text(xpath_selector)
-#
-# def get_text(self, xpath_selector):
-# el = self.browser.find_element_by_xpath(xpath_selector)
-# text = el.text.strip() or el.get_attribute("value").strip()
-# print("text:", text)
-#
-# def switch_window(self):
-# self.browser.switch_to_window(self.browser.window_handles[-1])
-# sleep(2)
-# self.title()
-# sleep(2)
-#
-#
-# def title(self):
-# print("title:", self.browser.title)
-
-
-
if __name__ == '__main__':
import doctest
doctest.testmod()