tests passing

Author: s0561440

.travis.yml

@@ -5,11 +5,12 @@ python:
 services:
   - docker
 
-before_script: pip install docker-compose
-
 install:
   - docker-compose build && docker-compose up -d
 
+before_script:
+  - pip install requests docker
+
 script:
   - pytest tests/
 

README.md

@@ -1,4 +1,7 @@
 # AccessPointFingerprintAPI
+
+[![Build Status](https://travis-ci.com/FalcoSuessgott/AccessPointFingerprintAPI.svg?branch=master)](https://travis-ci.com/FalcoSuessgott/AccessPointFingerprintAPI)
+
 This Project stores Access Points Fingerprints from mobile devices (e.g smartphone, esp8266, ..) and its geolocation.
 If requested, the API responds with the corresponding geolocation for a specific fingerprint.
 
@@ -38,7 +41,9 @@ It is adapted to the [BVGDetection](https://github.com/OpenHistoricalDataMap/BVG
 ```
 git clone https://github.com/FalcoSuessgott/AccessPointFingerprintAPI
 cd AccessPointFingerprintAPI
-docker-compuse up
+docker-compose build && docker-compuse up
+# running tests
+pytest tests/
 ```
 
 # Project Setup 

api/app.py

@@ -183,9 +183,9 @@ def get_fingerprint(fingerprint_id):
             'additionalInfo': fp['additionalInfo'],
             'fingerprint': fp['fingerprint']
         }]
-        return jsonify(status=200, data=data)
+        return jsonify(data=data), 200
     else:
-        return jsonify(status=404, message="No fingerprint were found with this ID.")
+        return jsonify(message="No fingerprint were found with this ID."), 404
 
 
 @application.route('/fingerprint', methods=["POST"])
@@ -198,9 +198,9 @@ def post_fingerprint():
         fp = request.get_json()
         validate(instance=fp, schema=FINGERPRINT_SCHEMA)
         db.fingerprint.insert_one(fp)
-        return jsonify(status=201, message='Fingerprint saved successfully!')
+        return jsonify(message='Fingerprint saved successfully!'), 201
     except Exception as e:
-        return Response('Exception while storing fingerprint: %s' % e, status=400)
+        return jsonify(message='Fingerprint could not be saved', error=str(e)), 400
 
 
 @application.route('/fingerprint/<string:fingerprint_id>', methods=["PUT"])
@@ -216,11 +216,11 @@ def put_fingerprint(fingerprint_id):
             request_fp = request.get_json()
             validate(instance=request_fp, schema=FINGERPRINT_SCHEMA)
             db.fingerprint.find_one_and_update({'id': fingerprint_id}, {'$set': request_fp})
-            return jsonify(status=200, message='Fingerprint updated successfully!')
+            return jsonify(message='Fingerprint updated successfully!'), 201
         except Exception as e:
-            return jsonify(status=400, message='Exception while updating fingerprint: %s' % e)
+            return jsonify(message='Fingerprint could not be updated', error=str(e)), 400
     else:
-        return jsonify(status=404, message="No fingerprint were found with this ID.")
+        return jsonify(message="No fingerprint were found with this ID."), 404
 
 
 @application.route('/fingerprint/<string:fingerprint_id>', methods=["DELETE"])
@@ -229,10 +229,13 @@ def delete_fingerprint(fingerprint_id):
     deletes a fingerprint
     """
 
-    if db.fingerprint.delete_one({'id': fingerprint_id}):
-        return jsonify(status=201, message='Fingerprint deletes successfully!')
+    fp = db.fingerprint.find_one({'id': fingerprint_id})
+
+    if fp:
+        db.fingerprint.delete_one({'id': fingerprint_id})
+        return jsonify(message='Fingerprint deletes successfully!'), 201
     else:
-        return jsonify(status=404, message="No fingerprint were found with this ID.")
+        return jsonify(message="No fingerprint were found with this ID."), 404
 
 
 @application.route('/localize', methods=["GET"])

mongo-init.js

@@ -0,0 +1,14 @@
+db.auth('test', 'test123');
+db = db.getSiblingDB('testdb');
+db.createUser(
+        {
+            user: "flask",
+            pwd: "flask123",
+            roles: [
+                {
+                    role: "readWrite",
+                    db: "testdb"
+                }
+            ]
+        }
+);

tests/test_fingerprint.py

@@ -1,41 +1,52 @@
 import requests
 import json
 import codecs
+import docker
 
-IP = "192.168.178.70"
+
+def get_ip_from_container(container_name, network):
+	"""
+	returns the ip of docker container
+	"""
+
+	client = docker.DockerClient()
+	container = client.containers.get(container_name)
+	return container.attrs['NetworkSettings']['Networks'][network]['IPAddress']
+
+
+API_IP = get_ip_from_container("api", "accesspointfingerprintapi_frontend")
 PORT = 5000
 ENDPOINT = "fingerprint"
-URI = "http://" +  IP + ":" + str(PORT) + "/" + ENDPOINT
+URI = "http://" + API_IP + ":" + str(PORT) + "/" + ENDPOINT
 HEADERS = {'Content-Type': 'application/json'}
 
 
 ###########
-#   GET   #
+#   POST  #
 ###########
 
 
-def test_get_fingerprint_should_return_200():
-	assert requests.get(URI + "/test").status_code == 200
+def test_post_fingerprint_should_return_201():
+	with codecs.open('tests/test_fp.json', 'r', 'utf-8-sig') as json_file:
+		data = json.load(json_file)
 
+	assert requests.post(URI, json=data, headers=HEADERS).status_code == 201
 
-def test_get_fingerprint_should_return_404():
-	assert requests.get(URI + "/invalid").status_code == 404
 
+def test_post_fingerprint_should_return_400():
+	assert requests.post(URI, json={'some': 'Data'}, headers=HEADERS).status_code == 400
 
 ###########
-#   POST  #
+#   GET   #
 ###########
 
 
-def test_post_fingerprint_should_return_201():
-	with codecs.open('test_fp.json', 'r', 'utf-8-sig') as json_file:
-		data = json.load(json_file)
-
-	assert requests.post(URI, data=json.dumps(data), headers=HEADERS).status_code == 201
+def test_get_fingerprint_should_return_200():
+	assert requests.get(URI + "/test_id").status_code == 200
 
 
-def test_post_fingerprint_should_return_400():
-	assert requests.post(URI, data=json.dumps({'some' : 'Data'}), headers=HEADERS).status_code == 400
+def test_get_fingerprint_should_return_404():
+	assert requests.get(URI + "/invalid").status_code == 404
 
 
 ###########
@@ -44,27 +55,28 @@ def test_post_fingerprint_should_return_400():
 
 
 def test_put_fingerprint_should_return_400():
-	assert requests.post(URI + "/test_id", data=json.dumps({'some' : 'Data'}), headers=HEADERS).status_code == 400
+	assert requests.put(URI + "/test_id", json={'some': 'Data'}, headers=HEADERS).status_code == 400
 
 
 def test_put_fingerprint_should_return_404():
-	assert requests.post(URI + "/invalid", data=json.dumps({'some' : 'Data'}), headers=HEADERS).status_code == 400
+	assert requests.put(URI + "/invalid", json={'some': 'Data'}, headers=HEADERS).status_code == 404
 
 
-def test_put_fingerprint_should_return_200():
-	with codecs.open('test_fp.json', 'r', 'utf-8-sig') as json_file:
+def test_put_fingerprint_should_return_201():
+	with codecs.open('tests/test_fp.json', 'r', 'utf-8-sig') as json_file:
 		data = json.load(json_file)
 
-	assert requests.post(URI + "/test_id", data=json.dumps(data), headers=HEADERS).status_code == 200
+	assert requests.put(URI + "/test_id", json=data, headers=HEADERS).status_code == 201
+
 
 #############
 #   DELETE  #
 #############
 
 
-def test_delete_fingerprint_should_return_200():
-	assert requests.post(URI + "/test_id", data=json.dumps({'some' : 'Data'}), headers=HEADERS).status_code == 200
+def test_delete_fingerprint_should_return_201():
+	assert requests.delete(URI + "/test_id").status_code == 201
 
 
 def test_delete_fingerprint_should_return_404():
-	assert requests.post(URI + "/test_id", data=json.dumps({'some' : 'Data'}), headers=HEADERS).status_code == 404
+	assert requests.delete(URI + "/invalid").status_code == 404