testing: convert some JPL units tests to simple nose tests

astraw · astraw · commit 6f035b8a635a · 2009-09-06T22:47:08.000Z
svn path=/trunk/matplotlib/; revision=7668
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -879,6 +879,7 @@ def tk_window_focus():
 default_test_modules = [
     'matplotlib.tests.test_basic',
     'matplotlib.tests.test_transforms',
+    'matplotlib.tests.test_axes',
     'matplotlib.tests.test_spines',
     ]
 
diff --git a/lib/matplotlib/testing/jpl_units/UnitDblConverter.py b/lib/matplotlib/testing/jpl_units/UnitDblConverter.py
@@ -66,7 +66,7 @@ def axisinfo( unit, axis ):
         label information.
       """
       # Delay-load due to circular dependencies.
-      import mplTest.units as U
+      import matplotlib.testing.jpl_units as U
 
       # Check to see if the value used for units is a string unit value
       # or an actual instance of a UnitDbl so that we can use the unit
@@ -105,7 +105,7 @@ def convert( value, unit, axis ):
       - Returns the value parameter converted to floats.
       """
       # Delay-load due to circular dependencies.
-      import mplTest.units as U
+      import matplotlib.testing.jpl_units as U
 
       isNotUnitDbl = True
 
diff --git a/lib/matplotlib/testing/jpl_units/__init__.py b/lib/matplotlib/testing/jpl_units/__init__.py
@@ -30,15 +30,15 @@
 """
 
 #=======================================================================
-from mplTest.units.Duration import Duration
-from mplTest.units.Epoch import Epoch
-from mplTest.units.UnitDbl import UnitDbl
+from Duration import Duration
+from Epoch import Epoch
+from UnitDbl import UnitDbl
 
-from mplTest.units.StrConverter import StrConverter
-from mplTest.units.EpochConverter import EpochConverter
-from mplTest.units.UnitDblConverter import UnitDblConverter
+from StrConverter import StrConverter
+from EpochConverter import EpochConverter
+from UnitDblConverter import UnitDblConverter
 
-from mplTest.units.UnitDblFormatter import UnitDblFormatter
+from UnitDblFormatter import UnitDblFormatter
 
 #=======================================================================
 
diff --git a/setup.py b/setup.py
@@ -51,6 +51,7 @@
     'matplotlib.backends',
     'matplotlib.projections',
     'matplotlib.testing',
+    'matplotlib.testing.jpl_units',
     'matplotlib.tests',
 #   'matplotlib.toolkits',
     'mpl_toolkits',
diff --git a/test/test_matplotlib/TestAxes.py b/test/test_matplotlib/TestAxes.py

Original file line number	Diff line number	Diff line change
`@@ -879,6 +879,7 @@ def tk_window_focus():`
`879`	`879`	`default_test_modules = [`
`880`	`880`	`'matplotlib.tests.test_basic',`
`881`	`881`	`'matplotlib.tests.test_transforms',`
	`882`	`+ 'matplotlib.tests.test_axes',`
`882`	`883`	`'matplotlib.tests.test_spines',`
`883`	`884`	`]`
`884`	`885`