diff --git a/test/__init__.py b/pymath/calculus/test/__init__.py similarity index 100% rename from test/__init__.py rename to pymath/calculus/test/__init__.py diff --git a/test/mass_test.py b/pymath/calculus/test/mass_test.py similarity index 100% rename from test/mass_test.py rename to pymath/calculus/test/mass_test.py diff --git a/test/test_arithmetic.py b/pymath/calculus/test/test_arithmetic.py similarity index 93% rename from test/test_arithmetic.py rename to pymath/calculus/test/test_arithmetic.py index 3805958..67f559b 100644 --- a/test/test_arithmetic.py +++ b/pymath/calculus/test/test_arithmetic.py @@ -2,9 +2,7 @@ # encoding: utf-8 -from pymath import arithmetic - - +from pymath.calculus import arithmetic def test_gcd_commu(): assert arithmetic.gcd(3, 15) == arithmetic.gcd(15,3) diff --git a/test/test_expression.py b/pymath/calculus/test/test_expression.py similarity index 90% rename from test/test_expression.py rename to pymath/calculus/test/test_expression.py index 003e986..84b2a1f 100644 --- a/test/test_expression.py +++ b/pymath/calculus/test/test_expression.py @@ -4,10 +4,10 @@ """ Testing Expression """ -from pymath.expression import Expression -from pymath.fraction import Fraction -from pymath.generic import first_elem -from pymath.render import txt, tex +from pymath.calculus.expression import Expression +from pymath.calculus.fraction import Fraction +from pymath.calculus.generic import first_elem +from pymath.calculus.render import txt, tex def test_init_from_str(): diff --git a/test/test_fraction.py b/pymath/calculus/test/test_fraction.py similarity index 96% rename from test/test_fraction.py rename to pymath/calculus/test/test_fraction.py index b631d9e..89c87e0 100644 --- a/test/test_fraction.py +++ b/pymath/calculus/test/test_fraction.py @@ -3,10 +3,10 @@ import unittest -from pymath.fraction import Fraction +from pymath.calculus.fraction import Fraction class TestFraction(unittest.TestCase): - """Testing functions from pymath.Fraction""" + """Testing functions from pymath.calculus.Fraction""" def setUp(self): self.listFrom = [Fraction(1,3), 1] diff --git a/test/test_generic.py b/pymath/calculus/test/test_generic.py similarity index 96% rename from test/test_generic.py rename to pymath/calculus/test/test_generic.py index 7f9c5b2..16465fc 100644 --- a/test/test_generic.py +++ b/pymath/calculus/test/test_generic.py @@ -7,7 +7,7 @@ import unittest from pymath import generic class TestGeneric(unittest.TestCase): - """Testing functions from pymath.generic""" + """Testing functions from pymath.calculus.generic""" def test_flatten_list1(self): l = [1, [2,3], [[4,5], 6], 7] diff --git a/test/test_operator.py b/pymath/calculus/test/test_operator.py similarity index 98% rename from test/test_operator.py rename to pymath/calculus/test/test_operator.py index 007ed70..2689122 100644 --- a/test/test_operator.py +++ b/pymath/calculus/test/test_operator.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 -from pymath.operator import op +from pymath.calculus.operator import op # Test de op.add diff --git a/test/test_polynom.py b/pymath/calculus/test/test_polynom.py similarity index 95% rename from test/test_polynom.py rename to pymath/calculus/test/test_polynom.py index 79743a7..6c23fb3 100644 --- a/test/test_polynom.py +++ b/pymath/calculus/test/test_polynom.py @@ -4,14 +4,14 @@ import unittest -from pymath.polynom import Polynom -from pymath.fraction import Fraction -from pymath.expression import Expression -from pymath.render import txt +from pymath.calculus.polynom import Polynom +from pymath.calculus.fraction import Fraction +from pymath.calculus.expression import Expression +from pymath.calculus.render import txt class TestPolynom(unittest.TestCase): - """Testing functions from pymath.polynom""" + """Testing functions from pymath.calculus.polynom""" def setup(self): Expression.set_render(txt) diff --git a/test/test_polynomDeg2.py b/pymath/calculus/test/test_polynomDeg2.py similarity index 72% rename from test/test_polynomDeg2.py rename to pymath/calculus/test/test_polynomDeg2.py index e32a79a..d867c1f 100644 --- a/test/test_polynomDeg2.py +++ b/pymath/calculus/test/test_polynomDeg2.py @@ -4,12 +4,12 @@ import unittest -from pymath.polynomDeg2 import Polynom_deg2 +from pymath.calculus.polynomDeg2 import Polynom_deg2 class TestPolynomDeg2(unittest.TestCase): - """Testing functions from pymath.polynomDeg2""" + """Testing functions from pymath.calculus.polynomDeg2""" pass diff --git a/test/test_random_expression.py b/pymath/calculus/test/test_random_expression.py similarity index 95% rename from test/test_random_expression.py rename to pymath/calculus/test/test_random_expression.py index 8dc11e1..5c6daa6 100644 --- a/test/test_random_expression.py +++ b/pymath/calculus/test/test_random_expression.py @@ -4,11 +4,11 @@ import unittest -from pymath.random_expression import RdExpression +from pymath.calculus.random_expression import RdExpression class TestRandomExpression(unittest.TestCase): - """Testing functions from pymath.random_expression""" + """Testing functions from pymath.calculus.random_expression""" def test_only_form(self): form = "{a} + 2" diff --git a/test/test_render.py b/pymath/calculus/test/test_render.py similarity index 96% rename from test/test_render.py rename to pymath/calculus/test/test_render.py index 8e16752..8c38309 100644 --- a/test/test_render.py +++ b/pymath/calculus/test/test_render.py @@ -4,11 +4,11 @@ import unittest -from pymath.render import tex, txt,p2i -from pymath.fraction import Fraction -from pymath.polynom import Polynom -from pymath.operator import op -from pymath.expression import Expression +from pymath.calculus.render import tex, txt,p2i +from pymath.calculus.fraction import Fraction +from pymath.calculus.polynom import Polynom +from pymath.calculus.operator import op +from pymath.calculus.expression import Expression from itertools import permutations @@ -28,7 +28,7 @@ def mass_poly_test(operation, rg= 5): class TestTexRender(unittest.TestCase): - """Testing functions from pymath.renders.tex""" + """Testing functions from pymath.calculus.renders.tex""" def test_type_render_int(self): self.assertEqual(tex([2]), "2") @@ -204,7 +204,7 @@ class TestTexRender(unittest.TestCase): class TesttxtRender(unittest.TestCase): - """Testing functions from pymath.renders.txt""" + """Testing functions from pymath.calculus.renders.txt""" def test_type_render_int(self): self.assertEqual(txt([2]), "2") diff --git a/test/test_str2tokens.py b/pymath/calculus/test/test_str2tokens.py similarity index 92% rename from test/test_str2tokens.py rename to pymath/calculus/test/test_str2tokens.py index 8e89e09..03eeb27 100644 --- a/test/test_str2tokens.py +++ b/pymath/calculus/test/test_str2tokens.py @@ -4,11 +4,11 @@ import unittest -from pymath.str2tokens import str2tokens, str2in_tokens, in2post_fix -from pymath.polynom import Polynom +from pymath.calculus.str2tokens import str2tokens, str2in_tokens, in2post_fix +from pymath.calculus.polynom import Polynom class TestStr2tokens(unittest.TestCase): - """Testing functions from pymath.str2tokens""" + """Testing functions from pymath.calculus.str2tokens""" def test_str2intokens(self): ans = str2in_tokens("2+3*4")