diff options
| -rw-r--r-- | webtests/browser_run.py (renamed from webtests/browser_test.py) | 11 | ||||
| -rw-r--r-- | webtests/correlation_matrix_test.py | 26 | ||||
| -rw-r--r-- | webtests/correlation_test.py | 11 | ||||
| -rw-r--r-- | webtests/marker_regression_test.py | 9 | ||||
| -rw-r--r-- | webtests/test_runner.py | 27 |
5 files changed, 59 insertions, 25 deletions
diff --git a/webtests/browser_test.py b/webtests/browser_run.py index 50e4d128..b2058cf8 100644 --- a/webtests/browser_test.py +++ b/webtests/browser_run.py @@ -1,4 +1,8 @@ -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function + +__all__ = ('sleep', 'testmod', 'test') + +from doctest import testmod from time import sleep @@ -60,6 +64,5 @@ class Test(object): print("title:", self.browser.title) -#if __name__ == '__main__': -# import doctest -# doctest.testmod()
\ No newline at end of file + +test = Test()
\ No newline at end of file diff --git a/webtests/correlation_matrix_test.py b/webtests/correlation_matrix_test.py index 4047de84..8529c265 100644 --- a/webtests/correlation_matrix_test.py +++ b/webtests/correlation_matrix_test.py @@ -2,7 +2,6 @@ Test Correlation matrix ->>> test = Test() >>> test.get("http://genenetwork.org/") title: GeneNetwork @@ -15,17 +14,29 @@ text: grin2b Search >>> test.click('//*[@id="btsearch"]') +clicked: Search -Select the first 4 records +Add 1430675_at >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p/table/tbody/tr[3]/td/div/table/tbody/tr[2]/td/input''') +clicked: HC_M2_0606_P::1430675_at + +Add 1442370_at >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p/table/tbody/tr[3]/td/div/table/tbody/tr[3]/td/input''') +clicked: HC_M2_0606_P::1442370_at + +Add 1457003_at >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p/table/tbody/tr[3]/td/div/table/tbody/tr[4]/td/input''') +clicked: HC_M2_0606_P::1457003_at + +Add 1422223_at >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p/table/tbody/tr[3]/td/div/table/tbody/tr[5]/td/input''') +clicked: HC_M2_0606_P::1422223_at >>> sleep(5) Add to collection page >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/p/table/tbody/tr[1]/td/table/tbody/tr[1]/td[4]/a''') +clicked: Notext >>> sleep(5) @@ -35,10 +46,11 @@ title: BXD Trait Collection Select all records >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/table/tbody/tr/td/table/tbody/tr/td/table/tbody/tr/td/a/img''') - +clicked: Notext Click Matrix >>> test.click('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/table/tbody/tr/td/table/tbody/tr[2]/td/table/tbody/tr/td[2]/a/img''') +clicked: Notext Another new window >>> test.switch_window() @@ -53,10 +65,8 @@ text: 0.608\n71 """ -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function -from browser_test import Test +from browser_run import * -if __name__ == '__main__': - import doctest - doctest.testmod() +testmod() diff --git a/webtests/correlation_test.py b/webtests/correlation_test.py index ebdeaa52..aad3a69f 100644 --- a/webtests/correlation_test.py +++ b/webtests/correlation_test.py @@ -1,7 +1,6 @@ """ Test calculate correlations ->>> test = Test() >>> test.get("http://genenetwork.org") title: GeneNetwork @@ -37,7 +36,7 @@ Another new window title: Correlation Sleep a bunch because this can take a while ->>> sleep(60) +>>> sleep(25) Ensure the Sample rho is the exepcted 1.000 because it should be the same record >>> test.get_text('''/html/body/table/tbody/tr[3]/td/table/tbody/tr/td/form/table/tbody/tr[2]/td/div/table/tbody/tr[2]/td[9]/a''') @@ -45,10 +44,8 @@ text: 1.000 """ -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function -from browser_test import Test +from browser_run import * -if __name__ == '__main__': - import doctest - doctest.testmod() +testmod() diff --git a/webtests/marker_regression_test.py b/webtests/marker_regression_test.py index 8932ec95..c4f76f53 100644 --- a/webtests/marker_regression_test.py +++ b/webtests/marker_regression_test.py @@ -1,7 +1,6 @@ """ Test calculate correlations ->>> test = Test() >>> test.get("http://genenetwork.org") title: GeneNetwork @@ -49,10 +48,8 @@ text: 11.511 """ -from __future__ import print_function, division, absolute_import +from __future__ import absolute_import, division, print_function -from browser_test import Test +from browser_run import * -if __name__ == '__main__': - import doctest - doctest.testmod() +testmod() diff --git a/webtests/test_runner.py b/webtests/test_runner.py new file mode 100644 index 00000000..d2d6339d --- /dev/null +++ b/webtests/test_runner.py @@ -0,0 +1,27 @@ +from __future__ import absolute_import, division, print_function + +import unittest +import doctest +import glob + +#tests = ("correlation_test", +# "correlation_matrix_test", +# "marker_regression_test") + + +def main(): + tests = glob.glob("*_test.py") + + suite = unittest.TestSuite() + + for testname in tests: + test = testname.rsplit(".", 1)[0] + print("Test is:", test) + mod = __import__(test) + suite.addTest(doctest.DocTestSuite(mod)) + + runner = unittest.TextTestRunner() + runner.run(suite) + +if __name__ == '__main__': + main()
\ No newline at end of file |