From 32112a4591dff7f830a28fa2dc1b029bf1538235 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sat, 9 Oct 2021 15:22:58 +0200
Subject: [PATCH] Feat: test random import

---
 mapytex/__init__.py                         |  2 +-
 mapytex/calculus/__init__.py                | 16 +++++++++++-----
 mapytex/calculus/random/__init__.py         | 19 +++++++++++++++++++
 test/calculus/api/random/__init__.py        |  0
 test/calculus/api/random/test_random.py     |  6 ------
 test/calculus/core/test_render.py           |  2 +-
 test/calculus/{api => random}/__init__.py   |  0
 test/calculus/random/test_list_generator.py |  4 ++++
 8 files changed, 36 insertions(+), 13 deletions(-)
 delete mode 100644 test/calculus/api/random/__init__.py
 delete mode 100644 test/calculus/api/random/test_random.py
 rename test/calculus/{api => random}/__init__.py (100%)
 create mode 100644 test/calculus/random/test_list_generator.py

diff --git a/mapytex/__init__.py b/mapytex/__init__.py
index 8fcd4cd..d06bbd0 100644
--- a/mapytex/__init__.py
+++ b/mapytex/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-from .calculus import Expression, Integer, Decimal, render, Polynomial, Fraction#, random_list,
+from .calculus import Expression, render, random
 
 # Expression.set_render('tex')
 
diff --git a/mapytex/calculus/__init__.py b/mapytex/calculus/__init__.py
index 73d409f..9d2a7f6 100644
--- a/mapytex/calculus/__init__.py
+++ b/mapytex/calculus/__init__.py
@@ -12,7 +12,6 @@ Make calculus as a student
 
 Expression is the classe wich handle all calculus. It can randomly generate or import calculus, simplify them and explain them as a student would do.
 
->>> from mapytex.calculus import Expression
 >>> render.set_render("txt")
 >>> e = Expression.from_str("2x + 6 - 3x")
 >>> print(e)
@@ -27,16 +26,23 @@ Expression is the classe wich handle all calculus. It can randomly generate or i
 (2 - 3) * x + 6
 - x + 6
 
+Create random Expression
+========================
+
+>>> e = random.expression("{a} / {b} + {c} / {d}")
+>>> print(e) # doctest: +SKIP 
+- 3 / - 10 + 3 / 5
 
 """
 
-from .API import Expression, Integer, Decimal, render, Polynomial, Fraction
-#from .core import random_list
-from decimal import getcontext
+from .API import render, Expression
+#from decimal import getcontext
+from . import random
+
 #getcontext().prec = 2
 
 
-__all__ = ["Expression"]
+__all__ = ["render",  "Expression", "random"]
 
 
 # -----------------------------
diff --git a/mapytex/calculus/random/__init__.py b/mapytex/calculus/random/__init__.py
index e69de29..a65c721 100644
--- a/mapytex/calculus/random/__init__.py
+++ b/mapytex/calculus/random/__init__.py
@@ -0,0 +1,19 @@
+from .list import list_generator as list
+from .expression import expression_generator as expression
+
+__all__ = ["list", "expression"]
+
+"""
+Generate random stuffs
+======================
+
+list_generator
+==============
+
+Generate random lists
+
+expression_generator
+====================
+
+Generate random Expression
+"""
diff --git a/test/calculus/api/random/__init__.py b/test/calculus/api/random/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/test/calculus/api/random/test_random.py b/test/calculus/api/random/test_random.py
deleted file mode 100644
index 7e8b156..0000000
--- a/test/calculus/api/random/test_random.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import pytest
-import mapytex
-
-def test_random_function():
-    assert 1 == 1
-    #mapytex.random("{a}")
diff --git a/test/calculus/core/test_render.py b/test/calculus/core/test_render.py
index e0a5f35..9555152 100644
--- a/test/calculus/core/test_render.py
+++ b/test/calculus/core/test_render.py
@@ -17,7 +17,7 @@ def test_changing_render():
 
 def test_changing_rending():
     e = mapytex.Expression.from_str("2*3")
-    f = mapytex.Fraction("2/3")
+    f = mapytex.Expression.from_str("2/3")
     assert str(e) == "2 * 3"
     assert str(f) == "2 / 3"
     mapytex.render.set_render("tex")
diff --git a/test/calculus/api/__init__.py b/test/calculus/random/__init__.py
similarity index 100%
rename from test/calculus/api/__init__.py
rename to test/calculus/random/__init__.py
diff --git a/test/calculus/random/test_list_generator.py b/test/calculus/random/test_list_generator.py
new file mode 100644
index 0000000..8b7bf0d
--- /dev/null
+++ b/test/calculus/random/test_list_generator.py
@@ -0,0 +1,4 @@
+import mapytex
+
+def test_generate_list():
+    mapytex.random.list(["a", "b", "c"])