Tidy up Docker

Author: 4OH4

Docker/Dockerfile

@@ -5,13 +5,6 @@ USER root
 
 WORKDIR "/"
 
-# load in the Conda environment.yml file
-# ADD ./environment.yml /
-
-# update the environnment
-# RUN conda env update -f environment.yml
-
-
 # load in the Pip requirements.txt file (assumes context is parent folder...)
 ADD ./requirements.txt /
 

Docker/README.md

@@ -1,12 +1,11 @@
 # pytesting - Docker
-4oh4 - Dec 2019
 
 Use this Docker configuration to quickly run the demo code. It creates a Python environment with the required dependencies in a Docker container, with shell access.
 
 ## Usage
 
 From the `pytesting/Docker` folder, use the following commads at the command line:
 
-`docker-compose -d up`
-`docker-compose run inertial_nav`
-`python run_tests.py`
+    docker-compose -d up
+    docker-compose run pytesting
+    python run_tests.py

Docker/docker-compose.yml

@@ -15,11 +15,5 @@ services:
     command:
       /bin/bash
 
-    # ports:
-    #   - "8888:8888"
-
-    #command: 
-    #  jupyter lab --no-browser --ip=0.0.0.0 --allow-root --NotebookApp.token='local_dev'
-
     volumes:
       - ../:/working

Docker/environment.yml

@@ -12,6 +12,8 @@
 
 """
 
+import os
+
 from truth.truth import AssertThat
 
 # Module under test
@@ -39,18 +41,28 @@ def test_init(mocker):
 
 def test_loadData(mocker):
     """ 
-    Test parseLine with good data (all fields present)
+    Test application loading data from text file
 
-    Expected result: dict returne with data
+    Expected result: app loads data into DB via DAO
     """
 
     # given: setup test framework
     mock_dao = mocker.patch('src.main.DAO')
     mock_worker = mocker.patch('src.main.Worker')
-    mock_worker.readData.return_value = None
+    dummy_data_filepath = 'data/dummy_datafile.txt'
+    mock_data = {'job_title': 'Mechanic',
+                'company_name': 'Red123',
+                'salary': 98765,
+                'date': '14/06/2019'}
+    mock_worker.readData.return_value = mock_data
     app = Application()
 
-    # when:
+    # when:    
+    app.loadData(dummy_data_filepath)
 
     # then:
-    AssertThat(mock_worker.readData).WasCalled().Once()
+    AssertThat(mock_worker.readData).WasCalled().Once().With(dummy_data_filepath)
+    AssertThat(mock_dao.insert_job).WasCalled().Once().With(mock_data['job_title'],
+                    mock_data['company_name'],
+                    mock_data['salary'],
+                    mock_data['date'],)