Commit eede04c2 authored by julian.bauer's avatar julian.bauer
Browse files

Merge branch '1-restrukturiere-code' into 'master'

Resolve "Restrukturiere Code"

Closes #1

See merge request !2
parents 63fadc2c 5f93710b
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/
# Translations
*.mo
*.pot
# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal
# Flask stuff:
instance/
.webassets-cache
# Scrapy stuff:
.scrapy
# Sphinx documentation
docs/_build/
# PyBuilder
.pybuilder/
target/
# Jupyter Notebook
.ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/
# Celery stuff
celerybeat-schedule
celerybeat.pid
# SageMath parsed files
*.sage.py
# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
# Spyder project settings
.spyderproject
.spyproject
# Rope project settings
.ropeproject
# mkdocs documentation
/site
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
# Pyre type checker
.pyre/
# pytype static type analyzer
.pytype/
# Cython debug symbols
cython_debug/
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""Python Module called 'example'"""
import numbers
def add(*args):
if all(isinstance(x, numbers.Number) for x in args):
result = sum(args)
else:
result = "".join(map(str, args))
return result
...@@ -2,10 +2,14 @@ ...@@ -2,10 +2,14 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Main script""" """Main script"""
import example
one = 1.0 # browser one = 1.0 # browser
two = 2.0 # local two = 2.0 # local
three = 3.0 # local fix of conflict three = 3.0 # local fix of conflict
print(one + two + three) sum = example.add(one, two, three)
print(sum)
# Nutze einen der nachfolgenden Befehle um Tests auszuführen
`python -m pytest`
`pytest --verbose --pdb`
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""Testbeispiele"""
import os
import sys
import pytest
sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))),)
import example
class Test_add:
def test_mixed_numbers(self,):
'''Attention: Maybe you should use "is_close"'''
assert example.add(1, 2, 3.0) == 6.0
def test_strings(self, ):
assert example.add('a', '2', '3') == 'a23'
def test_mixed_strings_numbers(self, ):
assert example.add('a', 2, '3.', 4.) == 'a23.4.0'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment