added args and kwargs test.

2 files changed, 25 insertions, 8 deletions

diff --git a/test_evaluate_expression.py b/test_evaluate_expression.py
index 1be3b01..157ad96 100644
--- a/test_evaluate_expression.py
+++ b/test_evaluate_expression.py
@@ -4,19 +4,19 @@ import dialoguer
 
 class TestEvaluateExpression(unittest.TestCase):
 
-	@classmethod
-	def setUpClass(cls):
-		cls.src_fil_r = dialoguer.Dialogue('test_evaluate_expression.r')
+	# @classmethod
+	# def setUpClass(cls):
+	# 	cls.src_fil_r = dialoguer.Dialogue('test_evaluate_expression.r')
 
-	@classmethod
-	def tearDownClass(cls):
-		cls.src_fil_r.close()
+	# @classmethod
+	# def tearDownClass(cls):
+	# 	cls.src_fil_r.close()
 
 	def setUp(self):
-		pass
+		self.src_fil_r = dialoguer.Dialogue('test_evaluate_expression.r')
 
 	def tearDown(self):
-		pass
+		self.src_fil_r.close()
 
 	def test_built_in_method(self):
 		res_1 = self.src_fil_r.evaluate_expression('sum', 1, 2)
@@ -34,6 +34,16 @@ class TestEvaluateExpression(unittest.TestCase):
 		res_1 = self.src_fil_r.evaluate_expression('test_kwargs', **kwargs)
 		self.assertEqual(res_1, 6)
 
+	def test_args_and_kwargs(self):
+		args = [2, 3]
+		kwargs = {
+			'kwarg_1': 2,
+			'kwarg_2': 3
+		}
+		res_1 = self.src_fil_r.evaluate_expression('test_args_and_kwargs', *args, **kwargs)
+		res_ctrl = args[0] * args[1] * kwargs['kwarg_1'] * kwargs['kwarg_2']
+		self.assertEqual(res_ctrl, res_1)
+
 
 if __name__ == '__main__':
 	unittest.main()
diff --git a/test_evaluate_expression.r b/test_evaluate_expression.r
index 256abea..1f918cc 100644
--- a/test_evaluate_expression.r
+++ b/test_evaluate_expression.r
@@ -7,3 +7,10 @@ test_kwargs <- function(arg_1 = 1, arg_2 = 1) {
 	result <- arg_1 * arg_2
 	return(result)
 }
+
+test_args_and_kwargs <- function(arg_1, arg_2, kwarg_1 = 1., kwarg_2 = 3) {
+	result <- arg_1 * arg_2
+	result <- result * kwarg_1
+	result <- result * kwarg_2
+	return(result)
+}