diff --git a/eos/mathUtils.py b/eos/mathUtils.py index 5de12c60f..845bb4844 100644 --- a/eos/mathUtils.py +++ b/eos/mathUtils.py @@ -17,15 +17,9 @@ # along with eos. If not, see . # =============================================================================== -import decimal +from math import floor def floorFloat(value): - """Round float down to integer""" - # We have to convert float to str to keep compatibility with - # decimal module in python 2.6 - value = str(value) - # Do the conversions for proper rounding down, avoiding float - # representation errors - result = int(decimal.Decimal(value).to_integral_value(rounding=decimal.ROUND_DOWN)) + result = int(floor(value)) return result diff --git a/tests/test_modules/eos/test_mathUtils.py b/tests/test_modules/eos/test_mathUtils.py new file mode 100644 index 000000000..c5cf2b0bb --- /dev/null +++ b/tests/test_modules/eos/test_mathUtils.py @@ -0,0 +1,12 @@ +from eos.mathUtils import floorFloat + + +def test_floorFloat(): + assert type(floorFloat(1)) is not float + assert type(floorFloat(1)) is int + assert type(floorFloat(1.1)) is not float + assert type(floorFloat(1.1)) is int + assert floorFloat(1.1) == 1 + assert floorFloat(1.9) == 1 + assert floorFloat(1.5) == 1 + assert floorFloat(-1.5) == -2 diff --git a/tests/test_modules/gui/test_aboutData.py b/tests/test_modules/gui/test_aboutData.py new file mode 100644 index 000000000..8e7e862d6 --- /dev/null +++ b/tests/test_modules/gui/test_aboutData.py @@ -0,0 +1,9 @@ +from gui.aboutData import versionString, licenses, developers, credits, description + + +def test_aboutData(): + assert versionString.__len__() > 0 + assert licenses.__len__() > 0 + assert developers.__len__() > 0 + assert credits.__len__() > 0 + assert description.__len__() > 0 diff --git a/tests/test_modules/service/test_attribute.py b/tests/test_modules/service/test_attribute.py new file mode 100644 index 000000000..1ab44f2a8 --- /dev/null +++ b/tests/test_modules/service/test_attribute.py @@ -0,0 +1,42 @@ +from service.attribute import Attribute + + +def test_attribute(): + """ + We don't really have much to test here, to throw a generic attribute at it and validate we get the expected results + + :return: + """ + sAttr = Attribute.getInstance() + info = sAttr.getAttributeInfo("maxRange") + + assert info.attributeID == 54 + assert type(info.attributeID) is int + assert info.attributeName == 'maxRange' + assert type(info.attributeName) is unicode + assert info.defaultValue == 0.0 + assert type(info.defaultValue) is float + assert info.description == 'Distance below which range does not affect the to-hit equation.' + assert type(info.description) is unicode + assert info.displayName == 'Optimal Range' + assert type(info.displayName) is unicode + assert info.highIsGood is True + assert type(info.highIsGood) is bool + assert info.iconID == 1391 + assert type(info.iconID) is int + assert info.name == 'maxRange' + assert type(info.name) is unicode + assert info.published is True + assert type(info.published) is bool + assert info.unitID == 1 + assert type(info.unitID) is int + assert info.unit.ID == 1 + assert type(info.unit.ID) is int + assert info.unit.displayName == 'm' + assert type(info.unit.displayName) is unicode + assert info.unit.name == 'Length' + assert type(info.unit.name) is unicode + assert info.unit.unitID == 1 + assert type(info.unit.unitID) is int + assert info.unit.unitName == 'Length' + assert type(info.unit.unitName) is unicode diff --git a/tests/test_package.py b/tests/test_package.py index 2788e4509..5f97967d7 100644 --- a/tests/test_package.py +++ b/tests/test_package.py @@ -2,10 +2,10 @@ import os import sys -import importlib +# import importlib # noinspection PyPackageRequirements -import pytest +# import pytest script_dir = os.path.dirname(os.path.abspath(__file__))