Add renko values test and close figs in tests

Author: coffincw

tests/test_addplot.py

@@ -32,8 +32,9 @@ def test_addplot01(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,volume=True,savefig=tname)
-   
+    fig_axis = mpf.plot(df,volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -53,7 +54,8 @@ def test_addplot02(bolldata):
     rname = os.path.join(refd,fname)
 
     apdict = mpf.make_addplot(df['LowerB'])
-    mpf.plot(df,volume=True,addplot=apdict,savefig=tname)
+    fig_axis = mpf.plot(df,volume=True,addplot=apdict,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
 
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
@@ -108,7 +110,8 @@ def test_addplot03(bolldata):
              mpf.make_addplot((df['PercentB']),panel='lower',color='g')
            ]
 
-    mpf.plot(df,addplot=apds,figscale=1.3,volume=True,savefig=tname)
+    fig_axis = mpf.plot(df,addplot=apds,figscale=1.3,volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
 
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
@@ -139,8 +142,9 @@ def test_addplot04(bolldata):
              mpf.make_addplot((df['PercentB']),panel='lower',color='g',linestyle='dotted')
            ]
 
-    mpf.plot(df,addplot=apds,figscale=1.5,volume=True,
-             style='starsandstripes',savefig=tname)
+    fig_axis = mpf.plot(df,addplot=apds,figscale=1.5,volume=True,
+             style='starsandstripes',savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
 
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')

tests/test_pnf.py

@@ -32,8 +32,9 @@ def test_pnf01(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='pnf', volume=True,savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='pnf',volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -54,8 +55,9 @@ def test_pnf02(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='pnf', pointnfig_params=dict(box_size=4), volume=True, savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='pnf',pointnfig_params=dict(box_size=4),volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -76,8 +78,9 @@ def test_pnf03(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='pnf', pointnfig_params=dict(box_size='atr', atr_length=2), volume=True, savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='pnf',pointnfig_params=dict(box_size='atr',atr_length=2),volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -97,8 +100,9 @@ def test_pnf04(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='pnf', pointnfig_params=dict(box_size='atr', atr_length='total'), mav=(4,6,8), volume=True, savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='pnf',pointnfig_params=dict(box_size='atr',atr_length='total'),mav=(4,6,8),volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 

tests/test_renko.py

@@ -32,7 +32,8 @@ def test_renko01(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='renko', volume=True,savefig=tname)
+    fig_axis = mpf.plot(df,type='renko',volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
 
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
@@ -54,8 +55,9 @@ def test_renko02(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='renko', renko_params=dict(brick_size=4), volume=True, savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='renko',renko_params=dict(brick_size=4),volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -76,8 +78,9 @@ def test_renko03(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='renko', renko_params=dict(brick_size='atr', atr_length=2), volume=True, savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='renko',renko_params=dict(brick_size='atr',atr_length=2),volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -97,8 +100,9 @@ def test_renko04(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='renko', renko_params=dict(brick_size='atr', atr_length='total'), mav=(8,20,30), volume=True, savefig=tname)
-   
+    fig_axis = mpf.plot(df,type='renko',renko_params=dict(brick_size='atr',atr_length='total'),mav=(8,20,30),volume=True,savefig=tname,returnfig=True)
+    plt.close(fig_axis[0])
+
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')
 
@@ -108,4 +112,14 @@ def test_renko04(bolldata):
     result = compare_images(rname,tname,tol=IMGCOMP_TOLERANCE)
     if result is not None:
        print('result=',result)
-    assert result is None
+    assert result is None
+
+def test_renkovalues(bolldata):
+
+    df = bolldata
+
+    rcv = {}
+    fig_axis = mpf.plot(df,type='renko',return_calculated_values=rcv,returnfig=True)
+    plt.close(fig_axis[0])
+
+    assert rcv['renko_bricks'][-1] == 133.919998