better organized tests

chriddyp · chriddyp · commit 9f838ac36ee3 · 2014-11-07T11:43:04.000+01:00
diff --git a/plotly/tests/test_core/test_file/test_file.py b/plotly/tests/test_core/test_file/test_file.py
@@ -7,6 +7,7 @@
 """
 
 from nose.tools import raises
+from nose import with_setup
 
 import random
 import string
@@ -16,6 +17,7 @@
 import plotly.tools as tls
 from plotly.exceptions import PlotlyRequestError
 
+
 def _random_filename():
     random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
     unique_filename = 'Valid Folder'+''.join(random_chars)
@@ -26,20 +28,20 @@ def init():
     py.sign_in('PythonTest', '9v9f20pext')
 
 
+@with_setup(init)
 def test_create_folder():
-    init()
     py.file_ops.mkdirs(_random_filename())
 
 
+@with_setup(init)
 def test_create_nested_folders():
-    init()
     first_folder = _random_filename()
     nested_folder = '{}/{}'.format(first_folder, _random_filename())
     py.file_ops.mkdirs(nested_folder)
 
 
+@with_setup(init)
 def test_duplicate_folders():
-    init()
     first_folder = _random_filename()
     py.file_ops.mkdirs(first_folder)
     try:
diff --git a/plotly/tests/test_core/test_grid/test_grid.py b/plotly/tests/test_core/test_grid/test_grid.py
@@ -7,6 +7,7 @@
 """
 
 from nose.tools import raises
+from nose import with_setup
 
 import random
 import string
@@ -19,27 +20,27 @@
 from plotly.exceptions import InputError, PlotlyRequestError
 
 
-def _random_filename():
+def random_filename():
     random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
     unique_filename = 'Valid Grid '+''.join(random_chars)
     return unique_filename
 
 
-def _get_grid():
-    c1 = Column('first column', [1, 2, 3, 4])
-    c2 = Column('second column', ['a', 'b', 'c', 'd'])
+def get_grid():
+    c1 = Column([1, 2, 3, 4], 'first column')
+    c2 = Column(['a', 'b', 'c', 'd'], 'second column')
     g = Grid([c1, c2])
     return g
 
 
-def _init():
+def init():
     py.sign_in('PythonTest', '9v9f20pext')
 
 
 def upload_and_return_grid():
-    _init()
-    g = _get_grid()
-    unique_filename = _random_filename()
+    init()
+    g = get_grid()
+    unique_filename = random_filename()
 
     py.grid_ops.upload(g, unique_filename, auto_open=False)
     return g
@@ -50,26 +51,26 @@ def test_grid_upload():
     upload_and_return_grid()
 
 
+@with_setup(init)
 def test_grid_upload_in_new_folder():
-    _init()
-    g = _get_grid()
-    path = 'new folder: {}/grid in folder {}'.format(_random_filename(), _random_filename())
+    g = get_grid()
+    path = 'new folder: {}/grid in folder {}'.format(random_filename(), random_filename())
     py.grid_ops.upload(g, path, auto_open=False)
 
 
+@with_setup(init)
 def test_grid_upload_in_existing_folder():
-    _init()
-    g = _get_grid()
-    folder = _random_filename()
-    filename = _random_filename()
+    g = get_grid()
+    folder = random_filename()
+    filename = random_filename()
     py.file_ops.mkdirs(folder)
     path = 'existing folder: {}/grid in folder {}'.format(folder, filename)
     py.grid_ops.upload(g, path, auto_open=False)
 
 
 def test_column_append():
     g = upload_and_return_grid()
-    new_col = Column('new col', [1, 5, 3])
+    new_col = Column([1, 5, 3], 'new col')
 
     py.grid_ops.append_columns([new_col], grid=g)
 
@@ -88,6 +89,7 @@ def test_plot_from_grid():
     return url, g
 
 
+@with_setup(init)
 def test_get_figure_from_references():
     url, g = test_plot_from_grid()
     fig = py.get_figure(url)
@@ -157,24 +159,24 @@ def test_unequal_length_rows():
 # Test duplicate columns
 @raises(InputError)
 def test_duplicate_columns():
-    c1 = Column('first column', [1, 2, 3, 4])
-    c2 = Column('first column', ['a', 'b', 'c', 'd'])
+    c1 = Column([1, 2, 3, 4], 'first column')
+    c2 = Column(['a', 'b', 'c', 'd'], 'first column')
     Grid([c1, c2])
 
 
 # Test delete
+@with_setup(init)
 def test_delete_grid():
-    _init()
-    g = _get_grid()
-    fn = _random_filename()
+    g = get_grid()
+    fn = random_filename()
     py.grid_ops.upload(g, fn, auto_open=False)
     py.grid_ops.delete(g)
     py.grid_ops.upload(g, fn, auto_open=False)
 
 
 ## Plotly failures
 def test_duplicate_filenames():
-    c1 = Column('first column', [1, 2, 3, 4])
+    c1 = Column([1, 2, 3, 4], 'first column')
     g = Grid([c1])
 
     random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
@@ -183,6 +185,4 @@ def test_duplicate_filenames():
     try:
         py.grid_ops.upload(g, unique_filename, auto_open=False)
     except PlotlyRequestError as e:
-        if e.status_code != 409:
-            raise e
-
+        assert(e.status_code == 409)
diff --git a/plotly/tests/test_core/test_meta/test_meta.py b/plotly/tests/test_core/test_meta/test_meta.py
@@ -7,6 +7,7 @@
 """
 
 from nose.tools import raises
+from nose import with_setup
 
 import random
 import string
@@ -22,17 +23,17 @@ def init():
     py.sign_in('PythonTest', '9v9f20pext')
 
 
-_grid = grid = Grid([Column('first column', [1, 2, 3, 4])])
+_grid = grid = Grid([Column([1, 2, 3, 4], 'first column')])
 _meta = {"settings":{"scope1":{"model":"Unicorn Finder","voltage":4}}}
 
 def _random_filename():
     random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
     unique_filename = 'Valid Grid with Meta '+''.join(random_chars)
     return unique_filename
 
-def test_upload_meta():
-    init()
 
+@with_setup(init)
+def test_upload_meta():
     unique_filename = _random_filename()
     grid_url = py.grid_ops.upload(_grid, unique_filename, auto_open=False)
 
@@ -42,10 +43,9 @@ def test_upload_meta():
         grid_url=grid_url)
 
 
+@with_setup(init)
 def test_upload_meta_with_grid():
-    init()
-
-    c1 = Column('first column', [1, 2, 3, 4])
+    c1 = Column([1, 2, 3, 4], 'first column')
     grid = Grid([c1])
 
     unique_filename = _random_filename()
