Commit0828170

authored

Merge pull request#16887 from anntzer/simpler-event-mock

Shorter event mocking in tests.

2 parents920266f +299f335 commit0828170Copy full SHA for 0828170

File tree

-20

lines changed

-20

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`importio`
`5`	`5`	`fromitertoolsimportproduct`
`6`	`6`	`importplatform`
	`7`	`+fromtypesimportSimpleNamespace`
`7`	`8`	`try:`
`8`	`9`	`fromcontextlibimportnullcontext`
`9`	`10`	`exceptImportError:`
`@@ -925,17 +926,12 @@ def test_hexbin_empty():`
`925`	`926`
`926`	`927`	`deftest_hexbin_pickable():`
`927`	`928`	`# From #1973: Test that picking a hexbin collection works`
`928`		`-classFauxMouseEvent:`
`929`		`-def__init__(self,x,y):`
`930`		`-self.x=x`
`931`		`-self.y=y`
`932`		`-`
`933`	`929`	`fig,ax=plt.subplots()`
`934`	`930`	`data= (np.arange(200)/200).reshape((2,100))`
`935`	`931`	`x,y=data`
`936`	`932`	`hb=ax.hexbin(x,y,extent=[.1,.3,.6,.7],picker=-1)`
`937`		`-`
`938`		`-asserthb.contains(FauxMouseEvent(400,300))[0]`
	`933`	`+mouse_event=SimpleNamespace(x=400,y=300)`
	`934`	`+asserthb.contains(mouse_event)[0]`
`939`	`935`
`940`	`936`
`941`	`937`	`@image_comparison(['hexbin_log.png'],style='mpl20')`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`		`-"""`
`2`		`-Tests specific to the collections module.`
`3`		`-"""`
`4`	`1`	`importio`
`5`	`2`	`importplatform`
	`3`	`+fromtypesimportSimpleNamespace`
`6`	`4`
`7`	`5`	`importnumpyasnp`
`8`	`6`	`fromnumpy.testingimportassert_array_equal,assert_array_almost_equal`
`@@ -430,8 +428,7 @@ def get_transform(self):`
`430`	`428`	`fig,ax=plt.subplots()`
`431`	`429`
`432`	`430`	`xy= [(0,0)]`
`433`		-# Unit square has a half-diagonal of `1 / sqrt(2)`, so `pi * r**2`
`434`		`-# equals...`
	`431`	+# Unit square has a half-diagonal of `1/sqrt(2)`, so `pi * r**2` equals...
`435`	`432`	`circle_areas= [np.pi/2]`
`436`	`433`	`squares=SquareCollection(sizes=circle_areas,offsets=xy,`
`437`	`434`	`transOffset=ax.transData)`
`@@ -443,14 +440,8 @@ def test_picking():`
`443`	`440`	`fig,ax=plt.subplots()`
`444`	`441`	`col=ax.scatter([0], [0], [1000],picker=True)`
`445`	`442`	`fig.savefig(io.BytesIO(),dpi=fig.dpi)`
`446`		`-`
`447`		`-classMouseEvent:`
`448`		`-pass`
`449`		`-event=MouseEvent()`
`450`		`-event.x=325`
`451`		`-event.y=240`
`452`		`-`
`453`		`-found,indices=col.contains(event)`
	`443`	`+mouse_event=SimpleNamespace(x=325,y=240)`
	`444`	`+found,indices=col.contains(mouse_event)`
`454`	`445`	`assertfound`
`455`	`446`	`assert_array_equal(indices['ind'], [0])`
`456`	`447`

Comments

(0)