Merge pull request #19 from telia-oss/add-tests

Added docs and tests. Tests running on travis.

Author: paalvibe

.coveragerc

@@ -0,0 +1,3 @@
+[run]
+omit =
+     birgitta/recipetest/localtest/script_prepend.py

.travis.yml

@@ -1,8 +1,37 @@
 dist: xenial
+group: edge
 language: python
 python: 3.6.6
+env:
+  # Hack to get JAVA_HOME and PATH correct even if `language` above is not Java
+  - PATH=$(echo "$PATH" | sed -e 's/:\/usr\/local\/lib\/jvm\/openjdk11\/bin//')
+  - JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+cache:
+  directories:
+    - $HOME/.ivy2
+    - $HOME/spark
+    - $HOME/.cache/pip
+    - $HOME/.pip-cache
+    - $HOME/.sbt/launchers
+jdk:
+  - openjdk8 # oracle is no longer supported by travis, only openjdk
+sudo: false
+addons:
+  apt:
+    packages:
+      - axel
 install:
+  # Download spark 2.3.3
+  # - jdk_switcher use oraclejdk8 # cmd not found
+  - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 # Hack to get JAVA_HOME and PATH correct even if `language` above is not Java
+  - "[ -f spark ] || mkdir spark && cd spark && axel http://archive.apache.org/dist/spark/spark-2.3.3/spark-2.3.3-bin-hadoop2.7.tgz && cd .."
+  - "tar -xf ./spark/spark-2.3.3-bin-hadoop2.7.tgz"
+  - "export SPARK_HOME=`pwd`/spark-2.3.3-bin-hadoop2.7"
+  - echo "spark.yarn.jars=$SPARK_HOME/jars/*.jar" > $SPARK_HOME/conf/spark-defaults.conf
+  # Install Python deps.
   - pip install -r requirements_dev.txt
   - pip install -e .
 script:
-  - make test
+  - make test
+after_success:
+  - coveralls

Makefile

@@ -1,13 +1,18 @@
-COV_MIN = 100 # Gradually increase this as we add more tests
+COV_MIN = 85 # Gradually increase this as we add more tests
 TAG = latest
 
 SRC_DIR = $(shell pwd)
 DIST_DIR = $(SRC_DIR)/dist
 BIRGITTA_TESTS = $(SRC_DIR)/tests
+PROJECT_TESTS = $(SRC_DIR)/examples/organizations/newsltd
 
-package: clean
+package: clean json_fixtures
 	python setup.py sdist bdist_wheel
 
+clean_json_fixtures:
+	rm -rf "$(SRC_DIR)/examples/organizations/newsltd/projects/chronicle/tests/fixtures/generated_json/*"
+	rm -rf "$(SRC_DIR)/examples/organizations/newsltd/projects/tribune/tests/fixtures/generated_json/*"
+
 clean:
 	cd $(SRC_DIR)
 	find . -name '__pycache__' -exec rm -rf {} +
@@ -19,9 +24,14 @@ clean:
 	rm -rf htmlcov/
 	rm -rf spark-warehouse/
 	rm -rf .pytest_cache/
-	rm -rf .coverage*
+	rm -rf .coverage
+	rm -rf .coverage.*/
 	rm -rf tmp/*
 
+
+json_fixtures: clean_json_fixtures
+	python3 "$(SRC_DIR)/make_json_fixtures.py"
+
 configure:
 	pip install -r requirements.txt
 	pip install -r requirements_dev.txt
@@ -38,10 +48,11 @@ test:
 	# been in progress in another thread when fork() was called.
 	OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES \
 	pytest \
+		$(PROJECT_TESTS) $(BIRGITTA_TESTS) \
 		--cov=birgitta \
+		--cov=examples/organizations \
 		--cov-report html \
 		--cov-report term-missing \
 		--cov-fail-under $(COV_MIN) \
-		$(BIRGITTA_TESTS)
 
 .PHONY: build clean configure lint test