Reorganize TestRPlot

Author: orbitfold

pandas/tests/test_rplot.py

@@ -223,44 +223,36 @@ def test_scale_overflow(self):
 			for index in range(len(self.data)):
 				self.scale2(self.data, index)
 
-class TestRPlot1(unittest.TestCase):
-	def setUp(self):
+class TestRPlot(unittest.TestCase):
+	def test_rplot1(self):
 		path = os.path.join(curpath(), 'data/tips.csv')
+		plt.figure()
 		self.data = read_csv(path, sep=',')
 		self.plot = rplot.RPlot(self.data, x='tip', y='total_bill')
 		self.plot + rplot.TrellisGrid(['sex', 'smoker'])
 		self.plot + rplot.GeomPoint(colour=rplot.ScaleRandomColour('day'), shape=rplot.ScaleShape('size'))
 		self.fig = plt.gcf()
 		self.plot.render(self.fig)
 
-	def test_subplots(self):
-		pass
-
-class TestRPlot2(unittest.TestCase):
-	def setUp(self):
+	def test_rplot2(self):
 		path = os.path.join(curpath(), 'data/tips.csv')
+		plt.figure()
 		self.data = read_csv(path, sep=',')
 		self.plot = rplot.RPlot(self.data, x='tip', y='total_bill')
 		self.plot + rplot.TrellisGrid(['.', 'smoker'])
 		self.plot + rplot.GeomPoint(colour=rplot.ScaleRandomColour('day'), shape=rplot.ScaleShape('size'))
 		self.fig = plt.gcf()
 		self.plot.render(self.fig)
 
-	def test_subplots(self):
-		pass
-
-class TestRPlot3(unittest.TestCase):
-	def setUp(self):
+	def test_rplot3(self):
 		path = os.path.join(curpath(), 'data/tips.csv')
+		plt.figure()
 		self.data = read_csv(path, sep=',')
 		self.plot = rplot.RPlot(self.data, x='tip', y='total_bill')
 		self.plot + rplot.TrellisGrid(['sex', '.'])
 		self.plot + rplot.GeomPoint(colour=rplot.ScaleRandomColour('day'), shape=rplot.ScaleShape('size'))
 		self.fig = plt.gcf()
 		self.plot.render(self.fig)
 
-	def test_subplots(self):
-		pass
-
 if __name__ == '__main__':
 	unittest.main()