From 456b8a2f26a533b236dbb4cbef65e6bfa315f896 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 1 Aug 2019 23:59:11 +0300
Subject: [PATCH] Update tests

---
 .build.yml          |  2 +-
 data/test.csv       | 43 ++++++++++++++++++++++---------------------
 tests/test_check.py |  8 +++++---
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/.build.yml b/.build.yml
index 378199a..a385ed8 100644
--- a/.build.yml
+++ b/.build.yml
@@ -13,7 +13,7 @@ tasks:
   - testcli: |
       cd csv-metadata-quality
       pipenv run pip install .
-      pipenv run csv-metadata-quality -i data/test.csv -o /tmp/test.csv -u
+      pipenv run csv-metadata-quality -i data/test.csv -o /tmp/test.csv -u --agrovoc-fields dc.subject,cg.coverage.country
 environment:
   PIPENV_NOSPIN: 'True'
   PIPENV_HIDE_EMOJIS: 'True'
diff --git a/data/test.csv b/data/test.csv
index 246a15f..ef7648f 100644
--- a/data/test.csv
+++ b/data/test.csv
@@ -1,22 +1,23 @@
-dc.contributor.author,birthdate,dc.identifier.issn,dc.identifier.isbn,dc.language.iso,dc.subject
- Leading space,2019-07-29,,,,
-Trailing space ,2019-07-29,,,,
-Excessive  space,2019-07-29,,,,
-Miscellaenous ||whitespace | issues ,2019-07-29,,,,
-Duplicate||Duplicate,2019-07-29,,,,
-Invalid ISSN,2019-07-29,2321-2302,,,
-Invalid ISBN,2019-07-29,,978-0-306-40615-6,,
-Multiple valid ISSNs,2019-07-29,0378-5955||0024-9319,,,
-Multiple valid ISBNs,2019-07-29,,99921-58-10-7||978-0-306-40615-7,,
-Invalid date,2019-07-260,,,,
-Multiple dates,2019-07-26||2019-01-10,,,,
-Invalid multi-value separator,2019-07-29,0378-5955|0024-9319,,,
-Unnecessary Unicode​,2019-07-29,,,,
-Suspicious character||foreˆt,2019-07-29,,,,
-Invalid ISO 639-2 language,2019-07-29,,,jp,
-Invalid ISO 639-3 language,2019-07-29,,,chi,
-Invalid language,2019-07-29,,,Span,
-Invalid AGROVOC subject,2019-07-29,,,,FOREST
+dc.contributor.author,birthdate,dc.identifier.issn,dc.identifier.isbn,dc.language.iso,dc.subject,cg.coverage.country
+ Leading space,2019-07-29,,,,,
+Trailing space ,2019-07-29,,,,,
+Excessive  space,2019-07-29,,,,,
+Miscellaenous ||whitespace | issues ,2019-07-29,,,,,
+Duplicate||Duplicate,2019-07-29,,,,,
+Invalid ISSN,2019-07-29,2321-2302,,,,
+Invalid ISBN,2019-07-29,,978-0-306-40615-6,,,
+Multiple valid ISSNs,2019-07-29,0378-5955||0024-9319,,,,
+Multiple valid ISBNs,2019-07-29,,99921-58-10-7||978-0-306-40615-7,,,
+Invalid date,2019-07-260,,,,,
+Multiple dates,2019-07-26||2019-01-10,,,,,
+Invalid multi-value separator,2019-07-29,0378-5955|0024-9319,,,,
+Unnecessary Unicode​,2019-07-29,,,,,
+Suspicious character||foreˆt,2019-07-29,,,,,
+Invalid ISO 639-2 language,2019-07-29,,,jp,,
+Invalid ISO 639-3 language,2019-07-29,,,chi,,
+Invalid language,2019-07-29,,,Span,,
+Invalid AGROVOC subject,2019-07-29,,,,FOREST,
 Newline (LF),2019-07-30,,,,"TANZA
-NIA"
-Missing date,,,,,
+NIA",
+Missing date,,,,,,
+Invalid country,2019-08-01,,,,,KENYAA
diff --git a/tests/test_check.py b/tests/test_check.py
index 4880ccd..dc00088 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -175,18 +175,20 @@ def test_check_invalid_agrovoc(capsys):
     '''Test invalid AGROVOC subject.'''
 
     value = 'FOREST'
+    field_name = 'dc.subject'
 
-    check.agrovoc(value)
+    check.agrovoc(value, field_name)
 
     captured = capsys.readouterr()
-    assert captured.out == f'Invalid AGROVOC subject: {value}\n'
+    assert captured.out == f'Invalid AGROVOC ({field_name}): {value}\n'
 
 
 def test_check_valid_agrovoc():
     '''Test valid AGROVOC subject.'''
 
     value = 'FORESTS'
+    field_name = 'dc.subject'
 
-    result = check.agrovoc(value)
+    result = check.agrovoc(value, field_name)
 
     assert result == value