SF.net SVN: matplotlib:[7684] trunk/matplotlib

[<as...@us...>]

Revision: 7684
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7684&view=rev
Author:   astraw
Date:     2009-09-07 20:02:22 +0000 (Mon, 07 Sep 2009)

Log Message:
-----------
test conversion: move old-style test to new-style test

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/tests/test_axes.py
    trunk/matplotlib/test/test_plots/TestAnnotation.py

Added Paths:
-----------
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png

Removed Paths:
-------------
    trunk/matplotlib/test/test_plots/baseline/TestAnnotation/offset_points.png

Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png (from rev 7683, trunk/matplotlib/test/test_plots/baseline/TestAnnotation/offset_points.png)
===================================================================
(Binary files differ)

Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py	2009-09-07 20:02:06 UTC (rev 7683)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py	2009-09-07 20:02:22 UTC (rev 7684)
@@ -41,3 +41,20 @@
     ax.set_xlabel( "x-label 005" )
     ax.autoscale_view()
     fig.savefig( 'formatter_ticker_005' )
+
+@image_comparison(baseline_images=['offset_points'])
+def test_basic_annotate():
+    # Setup some data
+    t = np.arange( 0.0, 5.0, 0.01 )
+    s = np.cos( 2.0*np.pi * t )
+
+    # Offset Points
+
+    fig = pylab.figure()
+    ax = fig.add_subplot( 111, autoscale_on=False, xlim=(-1,5), ylim=(-3,5) )
+    line, = ax.plot( t, s, lw=3, color='purple' )
+
+    ax.annotate( 'local max', xy=(3, 1), xycoords='data',
+                 xytext=(3, 3), textcoords='offset points' )
+
+    fig.savefig( 'offset_points' )

Modified: trunk/matplotlib/test/test_plots/TestAnnotation.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestAnnotation.py	2009-09-07 20:02:06 UTC (rev 7683)
+++ trunk/matplotlib/test/test_plots/TestAnnotation.py	2009-09-07 20:02:22 UTC (rev 7684)
@@ -42,27 +42,6 @@
       pass
 
    #--------------------------------------------------------------------
-   def testBasicAnnotate( self ):
-      """Basic Annotations"""
-
-      # Setup some data
-      t = npy.arange( 0.0, 5.0, 0.01 )
-      s = npy.cos( 2.0*npy.pi * t )
-
-      # Offset Points
-      fname = self.outFile( "offset_points.png" )
-
-      fig = figure()
-      ax = fig.add_subplot( 111, autoscale_on=False, xlim=(-1,5), ylim=(-3,5) )
-      line, = ax.plot( t, s, lw=3, color='purple' )
-
-      ax.annotate( 'local max', xy=(3, 1), xycoords='data',
-                  xytext=(3, 3), textcoords='offset points' )
-
-      fig.savefig( fname )
-      self.checkImage( fname )
-
-   #--------------------------------------------------------------------
    def testPolarAnnotations( self ):
       """Polar Plot Annotations"""
 

Deleted: trunk/matplotlib/test/test_plots/baseline/TestAnnotation/offset_points.png
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.