diff --git a/bashmath.sh b/bashmath.sh new file mode 100644 index 0000000000000000000000000000000000000000..631b40b82d4c620eaeb73eead2b60cca04e84a1e --- /dev/null +++ b/bashmath.sh @@ -0,0 +1,10 @@ +A =6 +B= 3 + +ADD = $(( A + B)) + +DIVIDE = $($A / $B) + +echo "Addind $B to $A is " $ADD + +echo "$A divided by $A is "$DIVIDE diff --git a/scsmath.py b/pymath.py similarity index 100% rename from scsmath.py rename to pymath.py diff --git a/test.py b/test.py index 6f1c71396557a981fd560b96ffedad6359c0d53f..7ae69d815fa763b7695fcb23880e90cae2aeefe5 100644 --- a/test.py +++ b/test.py @@ -1,23 +1,14 @@ -from scsmath import * +from pymath import * import nose def test_add_integers(): assert add(5, 3) == 8 -def test_add_integers_zero(): - assert add(3, 0) == 3 - def test_add_floats(): assert add(1.5, 2.5) == 4 -def test_add_strings(): - nose.tools.assert_raises(AssertionError, add, 'paul', 'carol') - -def test_divide_integers_even(): +def test_divide_integers(): assert divide(2, 10) == 0.2 -def test_divide_integers_repetant(): - nose.tools.assert_almost_equal(divide(1, 3), 0.33333333, 7) - if __name__ == '__main__': nose.run() diff --git a/test.sh b/test.sh deleted file mode 100644 index 64505ef305344883529af7302a7f4756c69c8745..0000000000000000000000000000000000000000 --- a/test.sh +++ /dev/null @@ -1,7 +0,0 @@ -A = 5 -B= 6 - -C = $A + $B - -echo $C -